Changeset 109370 in webkit

Timestamp:

Mar 1, 2012, 11:01:14 AM (15 years ago)

Author:

abarth@webkit.org

Message:

Unreviewed, rolling out r109336.
​http://trac.webkit.org/changeset/109336
​https://bugs.webkit.org/show_bug.cgi?id=80013

It's causing some crashes

• Modules/indexeddb/DOMWindowIndexedDatabase.cpp:

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

• Modules/indexeddb/DOMWindowIndexedDatabase.h:

(DOMWindowIndexedDatabase):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::clear):
(WebCore):
(WebCore::DOMWindow::setIDBFactory):

• page/DOMWindow.h:

(DOMWindow):
(WebCore::DOMWindow::idbFactory):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/DOMWindowIndexedDatabase.cpp (modified) (3 diffs)
• Modules/indexeddb/DOMWindowIndexedDatabase.h (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/DOMWindow.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed, rolling out r109336.
+        http://trac.webkit.org/changeset/109336
+        https://bugs.webkit.org/show_bug.cgi?id=80013
+
+        It's causing some crashes
+
+        * Modules/indexeddb/DOMWindowIndexedDatabase.cpp:
+        (WebCore::DOMWindowIndexedDatabase::DOMWindowIndexedDatabase):
+        (WebCore::DOMWindowIndexedDatabase::webkitIndexedDB):
+        * Modules/indexeddb/DOMWindowIndexedDatabase.h:
+        (DOMWindowIndexedDatabase):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::~DOMWindow):
+        (WebCore::DOMWindow::clear):
+        (WebCore):
+        (WebCore::DOMWindow::setIDBFactory):
+        * page/DOMWindow.h:
+        (DOMWindow):
+        (WebCore::DOMWindow::idbFactory):
+
 2012-03-01  Tom Sepez  <tsepez@chromium.org>
 

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

@@ -38 +38 @@
 namespace WebCore {
 
-DOMWindowIndexedDatabase::DOMWindowIndexedDatabase(DOMWindow* window)
-    : DOMWindowProperty(window->frame())
-    , m_window(window)
+DOMWindowIndexedDatabase::DOMWindowIndexedDatabase()
 {
 }
@@ -48 +46 @@
 }
 
-DOMWindowIndexedDatabase* DOMWindowIndexedDatabase::from(DOMWindow* window)
-{
-    DEFINE_STATIC_LOCAL(AtomicString, name, ("DOMWindowIndexedDatabase"));
-    DOMWindowIndexedDatabase* supplement = static_cast<DOMWindowIndexedDatabase*>(Supplement<DOMWindow>::from(window, name));
-    if (!supplement) {
-        supplement = new DOMWindowIndexedDatabase(window);
-        provideTo(window, name, adoptPtr(supplement));
-    }
-    return supplement;
-}
-
-void DOMWindowIndexedDatabase::disconnectFrame()
-{
-    m_idbFactory = 0;
-}
-
 IDBFactory* DOMWindowIndexedDatabase::webkitIndexedDB(DOMWindow* window)
 {
-    return from(window)->webkitIndexedDB();
-}
-
-IDBFactory* DOMWindowIndexedDatabase::webkitIndexedDB()
-{
-    Document* document = m_window->document();
+    Document* document = window->document();
     if (!document)
         return 0;
@@ -82 +59 @@
         return 0;
 
-    if (!m_idbFactory && m_window->isCurrentlyDisplayedInFrame())
-        m_idbFactory = IDBFactory::create(page->group().idbFactory());
-    return m_idbFactory.get();
+    if (!window->idbFactory() && window->isCurrentlyDisplayedInFrame())
+        window->setIDBFactory(IDBFactory::create(page->group().idbFactory()));
+    return window->idbFactory();
 }
 

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

@@ -29 +29 @@
 #if ENABLE(INDEXED_DATABASE)
 
-#include "DOMWindowProperty.h"
-#include "Supplementable.h"
-
 namespace WebCore {
 
@@ -37 +34 @@
 class DOMWindow;
 
-class DOMWindowIndexedDatabase : public DOMWindowProperty, public Supplement<DOMWindow> {
+class DOMWindowIndexedDatabase {
 public:
-    virtual ~DOMWindowIndexedDatabase();
-    static DOMWindowIndexedDatabase* from(DOMWindow*);
-
     static IDBFactory* webkitIndexedDB(DOMWindow*);
 
-    virtual void disconnectFrame() OVERRIDE;
-
 private:
-    explicit DOMWindowIndexedDatabase(DOMWindow*);
-
-    IDBFactory* webkitIndexedDB();
-
-    DOMWindow* m_window;
-    RefPtr<IDBFactory> m_idbFactory;
+    DOMWindowIndexedDatabase();
+    ~DOMWindowIndexedDatabase();
 };
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -421 +421 @@
     ASSERT(!m_notifications);
 #endif
+#if ENABLE(INDEXED_DATABASE)
+    ASSERT(!m_idbFactory);
+#endif
 #if ENABLE(BLOB)
     ASSERT(!m_domURL);
@@ -529 +532 @@
     resetNotifications();
 #endif
+#if ENABLE(INDEXED_DATABASE)
+    m_idbFactory = 0;
+#endif
 #if ENABLE(BLOB)
     m_domURL = 0;
@@ -732 +738 @@
     m_notifications->disconnectFrame();
     m_notifications = 0;
+}
+#endif
+
+#if ENABLE(INDEXED_DATABASE)
+void DOMWindow::setIDBFactory(PassRefPtr<IDBFactory> idbFactory)
+{
+    m_idbFactory = idbFactory;
 }
 #endif

trunk/Source/WebCore/page/DOMWindow.h

@@ -31 +31 @@
 #include "FrameDestructionObserver.h"
 #include "KURL.h"
-#include "Supplementable.h"
 
 namespace WebCore {
@@ -82 +81 @@
     enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
 
-    class DOMWindow : public RefCounted<DOMWindow>, public EventTarget, public FrameDestructionObserver, public Supplementable<DOMWindow> {
+    class DOMWindow : public RefCounted<DOMWindow>, public EventTarget, public FrameDestructionObserver {
     public:
         static PassRefPtr<DOMWindow> create(Frame* frame) { return adoptRef(new DOMWindow(frame)); }
@@ -395 +394 @@
         bool isCurrentlyDisplayedInFrame() const;
 
+#if ENABLE(INDEXED_DATABASE)
+        IDBFactory* idbFactory() { return m_idbFactory.get(); }
+        void setIDBFactory(PassRefPtr<IDBFactory>);
+#endif
+
     private:
         explicit DOMWindow(Frame*);
@@ -442 +446 @@
         mutable RefPtr<Storage> m_sessionStorage;
         mutable RefPtr<Storage> m_localStorage;
+
+#if ENABLE(INDEXED_DATABASE)
+        mutable RefPtr<IDBFactory> m_idbFactory;
+#endif
+
         mutable RefPtr<DOMApplicationCache> m_applicationCache;