Changeset 105569 in webkit

Timestamp:

Jan 20, 2012 10:06:50 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Switch indexeddb to use supplemental IDL for DOMWindow
​https://bugs.webkit.org/show_bug.cgi?id=76723

Patch by Mark Pilgrim <​pilgrim@chromium.org> on 2012-01-20
Reviewed by Adam Barth.

No new tests required, all existing tests pass.

• Modules/indexeddb: Added.
• Modules/indexeddb/DOMWindowIndexedDatabase.cpp: Added. webkitIndexedDB() method previously in DOMWindow.cpp

(WebCore::DOMWindowIndexedDatabase::DOMWindowIndexedDatabase):
(WebCore::DOMWindowIndexedDatabase::~DOMWindowIndexedDatabase):
(WebCore::DOMWindowIndexedDatabase::webkitIndexedDB):

• Modules/indexeddb/DOMWindowIndexedDatabase.h: Added.
• Modules/indexeddb/DOMWindowIndexedDatabase.idl: Added. attributes previously in DOMWindow.idl
• WebCore.gyp/WebCore.gyp: add Modules/indexeddb/ directory
• WebCore.gypi: add Modules/indexeddb/*
• page/DOMWindow.cpp: remove webkitIndexedDB() method, add accessor methods for m_idbFactory

(WebCore::DOMWindow::getIDBFactory):
(WebCore::DOMWindow::setIDBFactory):

• page/DOMWindow.h:
• page/DOMWindow.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb (added)
• Modules/indexeddb/DOMWindowIndexedDatabase.cpp (added)
• Modules/indexeddb/DOMWindowIndexedDatabase.h (added)
• Modules/indexeddb/DOMWindowIndexedDatabase.idl (added)
• WebCore.gyp/WebCore.gyp (modified) (1 diff)
• WebCore.gypi (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (1 diff)
• page/DOMWindow.h (modified) (2 diffs)
• page/DOMWindow.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-20  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Switch indexeddb to use supplemental IDL for DOMWindow
+        https://bugs.webkit.org/show_bug.cgi?id=76723
+
+        Reviewed by Adam Barth.
+
+        No new tests required, all existing tests pass.
+
+        * Modules/indexeddb: Added.
+        * Modules/indexeddb/DOMWindowIndexedDatabase.cpp: Added. webkitIndexedDB() method previously in DOMWindow.cpp
+        (WebCore::DOMWindowIndexedDatabase::DOMWindowIndexedDatabase):
+        (WebCore::DOMWindowIndexedDatabase::~DOMWindowIndexedDatabase):
+        (WebCore::DOMWindowIndexedDatabase::webkitIndexedDB):
+        * Modules/indexeddb/DOMWindowIndexedDatabase.h: Added.
+        * Modules/indexeddb/DOMWindowIndexedDatabase.idl: Added. attributes previously in DOMWindow.idl
+        * WebCore.gyp/WebCore.gyp: add Modules/indexeddb/ directory
+        * WebCore.gypi: add Modules/indexeddb/*
+        * page/DOMWindow.cpp: remove webkitIndexedDB() method, add accessor methods for m_idbFactory
+        (WebCore::DOMWindow::getIDBFactory):
+        (WebCore::DOMWindow::setIDBFactory):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+
 2012-01-20  David Levin  <levin@chromium.org>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -54 +54 @@
       '../Modules/gamepad',
       '../Modules/intents',
+      '../Modules/indexeddb',
       '../accessibility',
       '../accessibility/chromium',

trunk/Source/WebCore/WebCore.gypi

@@ -1149 +1149 @@
             'Modules/gamepad/GamepadList.idl',
             'Modules/gamepad/NavigatorGamepad.idl',
+            'Modules/indexeddb/DOMWindowIndexedDatabase.idl',
             'Modules/intents/DOMWindowIntents.idl',
             'Modules/intents/Intent.idl',
@@ -1702 +1703 @@
             'Modules/gamepad/NavigatorGamepad.cpp',
             'Modules/gamepad/NavigatorGamepad.h',
+            'Modules/indexeddb/DOMWindowIndexedDatabase.cpp',
+            'Modules/indexeddb/DOMWindowIndexedDatabase.h',
             'Modules/intents/Intent.cpp',
             'Modules/intents/Intent.h',

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -751 +751 @@
 
 #if ENABLE(INDEXED_DATABASE)
-IDBFactory* DOMWindow::webkitIndexedDB() const
-{
-    Document* document = this->document();
-    if (!document)
-        return 0;
-
-    Page* page = document->page();
-    if (!page)
-        return 0;
-
-    if (!document->securityOrigin()->canAccessDatabase())
-        return 0;
-
-    if (!m_idbFactory && isCurrentlyDisplayedInFrame())
-        m_idbFactory = IDBFactory::create(page->group().idbFactory());
-    return m_idbFactory.get();
+void DOMWindow::setIDBFactory(PassRefPtr<IDBFactory> idbFactory)
+{
+    m_idbFactory = idbFactory;
 }
 #endif

trunk/Source/WebCore/page/DOMWindow.h

@@ -373 +373 @@
 #endif
 
-#if ENABLE(INDEXED_DATABASE)
-        IDBFactory* webkitIndexedDB() const;
-#endif
-
 #if ENABLE(NOTIFICATIONS)
         NotificationCenter* webkitNotifications() const;
@@ -416 +412 @@
         // by the document that is currently active in m_frame.
         bool isCurrentlyDisplayedInFrame() const;
+
+#if ENABLE(INDEXED_DATABASE)
+        IDBFactory* idbFactory() { return m_idbFactory.get(); }
+        void setIDBFactory(PassRefPtr<IDBFactory>);
+#endif
 
     private:

trunk/Source/WebCore/page/DOMWindow.idl

@@ -172 +172 @@
 #if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
         readonly attribute [EnabledAtRuntime] NotificationCenter webkitNotifications;
-#endif
-#if defined(ENABLE_INDEXED_DATABASE) && ENABLE_INDEXED_DATABASE
-        readonly attribute IDBFactory webkitIndexedDB;
-
-        attribute IDBCursorConstructor webkitIDBCursor;
-        attribute IDBDatabaseConstructor webkitIDBDatabase;
-        attribute IDBDatabaseErrorConstructor webkitIDBDatabaseError;
-        attribute IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
-        attribute IDBFactoryConstructor webkitIDBFactory;
-        attribute IDBIndexConstructor webkitIDBIndex;
-        attribute IDBKeyRangeConstructor webkitIDBKeyRange;
-        attribute IDBObjectStoreConstructor webkitIDBObjectStore;
-        attribute IDBRequestConstructor webkitIDBRequest;
-        attribute IDBTransactionConstructor webkitIDBTransaction;
 #endif
 #if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM