Attachment 262700 Details for Bug 149928 – Patch v1

[patch] Patch v1

patch (text/plain), 4.68 KB, created by Brady Eidson on 2015-10-08 10:28:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brady Eidson

Created: 2015-10-08 10:28:29 PDT

Size: 4.68 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5db6628..6da32fe 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2015-10-08  Brady Eidson  <beidson@apple.com>
>+
>+        Update Inspector to only work with Legacy IDB (for now).
>+        https://bugs.webkit.org/show_bug.cgi?id=149928.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Modules/indexeddb/IDBAny.h:
>+        (WebCore::IDBAny::isLegacy):
>+        
>+        * Modules/indexeddb/legacy/LegacyAny.h:
>+        * inspector/InspectorIndexedDBAgent.cpp:
>+
> 2015-10-08  Antti Koivisto  <antti@apple.com>
> 
>         CrashTracer: [USER] com.apple.WebKit.WebContent at â¦Core::SelectorChecker::checkScrollbarPseudoClass const + 217
>diff --git a/Source/WebCore/Modules/indexeddb/IDBAny.h b/Source/WebCore/Modules/indexeddb/IDBAny.h
>index 138de47..5b8bdb9 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBAny.h
>+++ b/Source/WebCore/Modules/indexeddb/IDBAny.h
>@@ -68,6 +68,10 @@ public:
>         KeyPath,
>     };
> 
>+    // FIXME: This is a temporary hack to allow casts in WebInspector code while Modern IDB and Legacy IDB live side-by-side.
>+    // It should be removed when the legacy implementation is removed as part of https://bugs.webkit.org/show_bug.cgi?id=149117
>+    virtual bool isLegacy() const { return false; }
>+
>     virtual Type type() const = 0;
>     virtual RefPtr<DOMStringList> domStringList() = 0;
>     virtual RefPtr<IDBCursor> idbCursor() = 0;
>diff --git a/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h b/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h
>index c43ae97..43dc15d 100644
>--- a/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h
>+++ b/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h
>@@ -84,6 +84,10 @@ public:
>     }
>     ~LegacyAny();
> 
>+    // FIXME: This is a temporary hack to allow casts in WebInspector code while Modern IDB and Legacy IDB live side-by-side.
>+    // It should be removed when the legacy implementation is removed as part of https://bugs.webkit.org/show_bug.cgi?id=149117
>+    virtual bool isLegacy() const override final { return true; }
>+
>     virtual Type type() const override final { return m_type; }
>     // Use type() to figure out which one of these you're allowed to call.
>     virtual RefPtr<DOMStringList> domStringList() override final;
>diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
>index 6909f4b..99d628d 100644
>--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
>+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
>@@ -61,6 +61,7 @@
> #include "IDBTransaction.h"
> #include "InspectorPageAgent.h"
> #include "InstrumentingAgents.h"
>+#include "LegacyDatabase.h"
> #include "SecurityOrigin.h"
> #include <inspector/InjectedScript.h>
> #include <inspector/InjectedScriptManager.h>
>@@ -149,7 +150,7 @@ public:
>         : m_context(context) { }
>     virtual ~ExecutableWithDatabase() { };
>     void start(IDBFactory*, SecurityOrigin*, const String& databaseName);
>-    virtual void execute(RefPtr<IDBDatabase>&&) = 0;
>+    virtual void execute(RefPtr<LegacyDatabase>&&) = 0;
>     virtual RequestCallback& requestCallback() = 0;
>     ScriptExecutionContext* context() { return m_context; };
> private:
>@@ -188,8 +189,12 @@ public:
>             m_executableWithDatabase->requestCallback().sendFailure("Unexpected result type.");
>             return;
>         }
>+        if (!requestResult->isLegacy()) {
>+            m_executableWithDatabase->requestCallback().sendFailure("Only Legacy IDB is supported right now.");
>+            return;
>+        }
> 
>-        RefPtr<IDBDatabase> idbDatabase = requestResult->idbDatabase();
>+        RefPtr<LegacyDatabase> idbDatabase = adoptRef(static_cast<LegacyDatabase*>(requestResult->idbDatabase().leakRef()));
>         m_executableWithDatabase->execute(WTF::move(idbDatabase));
>         IDBPendingTransactionMonitor::deactivateNewTransactions();
>         idbDatabase->close();
>@@ -283,7 +288,7 @@ public:
> 
>     virtual ~DatabaseLoader() { }
> 
>-    virtual void execute(RefPtr<IDBDatabase>&& database) override
>+    virtual void execute(RefPtr<LegacyDatabase>&& database) override
>     {
>         if (!requestCallback().isActive())
>             return;
>@@ -512,7 +517,7 @@ public:
> 
>     virtual ~DataLoader() { }
> 
>-    virtual void execute(RefPtr<IDBDatabase>&& database) override
>+    virtual void execute(RefPtr<LegacyDatabase>&& database) override
>     {
>         if (!requestCallback().isActive())
>             return;
>@@ -728,7 +733,7 @@ public:
>     {
>     }
> 
>-    virtual void execute(RefPtr<IDBDatabase>&& database) override
>+    virtual void execute(RefPtr<LegacyDatabase>&& database) override
>     {
>         if (!requestCallback().isActive())
>             return;

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 149928: 262700