Changeset 109463 in webkit

Timestamp:

Mar 1, 2012 4:25:40 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Remove last ENABLED(INDEXED_DATABASE) ifdef from WebCore proper
​https://bugs.webkit.org/show_bug.cgi?id=80061

Reviewed by Dimitri Glazkov.

This patch removes the last ENABLED(INDEXED_DATABASE) ifdef from
WebCore proper by moving the backend factory out of PageGroup and into
a supplement for PageGroup. After this patch, we're ready to move the
IDB code into Modules.

• Modules/indexeddb/DOMWindowIndexedDatabase.cpp:

(WebCore::DOMWindowIndexedDatabase::webkitIndexedDB):

• WebCore.gypi:
• inspector/InspectorIndexedDBAgent.cpp:

(WebCore::assertIDBFactory):

• page/PageGroup.cpp:

(WebCore):

• page/PageGroup.h:

(PageGroup):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/DOMWindowIndexedDatabase.cpp (modified) (3 diffs)
• Modules/indexeddb/DOMWindowIndexedDatabase.h (modified) (1 diff)
• Modules/indexeddb/PageGroupIndexedDatabase.cpp (added)
• Modules/indexeddb/PageGroupIndexedDatabase.h (added)
• WebCore.gypi (modified) (1 diff)
• inspector/InspectorIndexedDBAgent.cpp (modified) (2 diffs)
• page/PageGroup.cpp (modified) (1 diff)
• page/PageGroup.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Adam Barth  <abarth@webkit.org>
+
+        Remove last ENABLED(INDEXED_DATABASE) ifdef from WebCore proper
+        https://bugs.webkit.org/show_bug.cgi?id=80061
+
+        Reviewed by Dimitri Glazkov.
+
+        This patch removes the last ENABLED(INDEXED_DATABASE) ifdef from
+        WebCore proper by moving the backend factory out of PageGroup and into
+        a supplement for PageGroup.  After this patch, we're ready to move the
+        IDB code into Modules.
+
+        * Modules/indexeddb/DOMWindowIndexedDatabase.cpp:
+        (WebCore::DOMWindowIndexedDatabase::webkitIndexedDB):
+        * WebCore.gypi:
+        * inspector/InspectorIndexedDBAgent.cpp:
+        (WebCore::assertIDBFactory):
+        * page/PageGroup.cpp:
+        (WebCore):
+        * page/PageGroup.h:
+        (PageGroup):
+
 2012-03-01  Dale Curtis  <dalecurtis@chromium.org>
 

trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp

@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33 +33 @@
 #include "IDBFactory.h"
 #include "Page.h"
-#include "PageGroup.h"
+#include "PageGroupIndexedDatabase.h"
 #include "SecurityOrigin.h"
 
@@ -84 +84 @@
 
     if (!m_idbFactory && m_window->isCurrentlyDisplayedInFrame())
-        m_idbFactory = IDBFactory::create(page->group().idbFactory());
+        m_idbFactory = IDBFactory::create(PageGroupIndexedDatabase::from(page->group())->factoryBackend());
     return m_idbFactory.get();
 }

trunk/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.h

@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

trunk/Source/WebCore/WebCore.gypi

@@ -1297 +1297 @@
             'Modules/indexeddb/DOMWindowIndexedDatabase.cpp',
             'Modules/indexeddb/DOMWindowIndexedDatabase.h',
+            'Modules/indexeddb/PageGroupIndexedDatabase.cpp',
+            'Modules/indexeddb/PageGroupIndexedDatabase.h',
             'Modules/intents/Intent.cpp',
             'Modules/intents/Intent.h',

trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

@@ -59 +59 @@
 #include "Page.h"
 #include "PageGroup.h"
+#include "PageGroupIndexedDatabase.h"
 #include "SecurityOrigin.h"
 
@@ -634 +635 @@
 {
     Page* page = document ? document->page() : 0;
-    IDBFactoryBackendInterface* idbFactory = page ? page->group().idbFactory() : 0;
+    IDBFactoryBackendInterface* idbFactory = page ? PageGroupIndexedDatabase::from(page->group())->factoryBackend() : 0;
 
     if (!idbFactory)

trunk/Source/WebCore/page/PageGroup.cpp

@@ -262 +262 @@
 }
 
-#if ENABLE(INDEXED_DATABASE)
-IDBFactoryBackendInterface* PageGroup::idbFactory()
-{
-    // Do not add page setting based access control here since this object is shared by all pages in
-    // the group and having per-page controls is misleading.
-    if (!m_factoryBackend)
-        m_factoryBackend = IDBFactoryBackendInterface::create();
-    return m_factoryBackend.get();
-}
-#endif
-
 void PageGroup::addUserScriptToWorld(DOMWrapperWorld* world, const String& source, const KURL& url,
                                      PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,

trunk/Source/WebCore/page/PageGroup.h

@@ -30 +30 @@
 #include <wtf/Noncopyable.h>
 #include "LinkHash.h"
+#include "Supplementable.h"
 #include "UserScript.h"
 #include "UserStyleSheet.h"
@@ -43 +44 @@
     class StorageNamespace;
 
-    class PageGroup {
+    class PageGroup : public Supplementable<PageGroup> {
         WTF_MAKE_NONCOPYABLE(PageGroup); WTF_MAKE_FAST_ALLOCATED;
     public:
@@ -82 +83 @@
         bool hasLocalStorage() { return m_localStorage; }
 
-#if ENABLE(INDEXED_DATABASE)
-        IDBFactoryBackendInterface* idbFactory();
-        bool hasIDBFactory() { return m_factoryBackend; }
-#endif
-
         void addUserScriptToWorld(DOMWrapperWorld*, const String& source, const KURL&,
                                   PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist,
@@ -123 +119 @@
         unsigned m_identifier;
         RefPtr<StorageNamespace> m_localStorage;
-#if ENABLE(INDEXED_DATABASE)
-        RefPtr<IDBFactoryBackendInterface> m_factoryBackend;
-#endif
 
         OwnPtr<UserScriptMap> m_userScripts;