Changeset 45162 in webkit

Timestamp:

Jun 25, 2009 1:19:46 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-06-25 Eric Seidel <​eric@webkit.org>

No review, reverting r45144 only.

Roll out r45144 after 18 test failures appeared on the bots.
​https://bugs.webkit.org/show_bug.cgi?id=26698

• GNUmakefile.am:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• WebCoreSources.bkl:
• storage/LocalStorage.cpp: (WebCore::LocalStorage::storageArea):
• storage/LocalStorage.h:
• storage/SessionStorage.cpp: (WebCore::SessionStorage::copy): (WebCore::SessionStorage::storageArea):
• storage/SessionStorage.h:
• storage/StorageArea.cpp: (WebCore::StorageArea::StorageArea): (WebCore::StorageArea::~StorageArea): (WebCore::StorageArea::setItem): (WebCore::StorageArea::removeItem): (WebCore::StorageArea::clear):
• storage/StorageArea.h:
• storage/StorageAreaSync.cpp: (WebCore::StorageAreaSync::StorageAreaSync): (WebCore::StorageAreaSync::scheduleFinalSync): (WebCore::StorageAreaSync::syncTimerFired): (WebCore::StorageAreaSync::performImport):
• storage/StorageAreaSync.h:
• storage/StorageSyncManager.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• WebCoreSources.bkl (modified) (2 diffs)
• storage/LocalStorage.cpp (modified) (2 diffs)
• storage/LocalStorage.h (modified) (2 diffs)
• storage/SessionStorage.cpp (modified) (2 diffs)
• storage/SessionStorage.h (modified) (2 diffs)
• storage/StorageArea.cpp (modified) (5 diffs)
• storage/StorageArea.h (modified) (4 diffs)
• storage/StorageAreaSync.cpp (modified) (4 diffs)
• storage/StorageAreaSync.h (modified) (1 diff)
• storage/StorageSyncManager.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-25  Eric Seidel  <eric@webkit.org>
+
+        No review, reverting r45144 only.
+
+        Roll out r45144 after 18 test failures appeared on the bots.
+        https://bugs.webkit.org/show_bug.cgi?id=26698
+
+        * GNUmakefile.am:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * storage/LocalStorage.cpp:
+        (WebCore::LocalStorage::storageArea):
+        * storage/LocalStorage.h:
+        * storage/SessionStorage.cpp:
+        (WebCore::SessionStorage::copy):
+        (WebCore::SessionStorage::storageArea):
+        * storage/SessionStorage.h:
+        * storage/StorageArea.cpp:
+        (WebCore::StorageArea::StorageArea):
+        (WebCore::StorageArea::~StorageArea):
+        (WebCore::StorageArea::setItem):
+        (WebCore::StorageArea::removeItem):
+        (WebCore::StorageArea::clear):
+        * storage/StorageArea.h:
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::StorageAreaSync):
+        (WebCore::StorageAreaSync::scheduleFinalSync):
+        (WebCore::StorageAreaSync::syncTimerFired):
+        (WebCore::StorageAreaSync::performImport):
+        * storage/StorageAreaSync.h:
+        * storage/StorageSyncManager.h:
+
 2009-06-24  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/GNUmakefile.am

@@ -2088 +2088 @@
         WebCore/storage/LocalStorage.cpp \
         WebCore/storage/LocalStorage.h \
+        WebCore/storage/LocalStorageArea.cpp \
+        WebCore/storage/LocalStorageArea.h \
         WebCore/storage/LocalStorageTask.cpp \
         WebCore/storage/LocalStorageTask.h \
@@ -2094 +2096 @@
         WebCore/storage/SessionStorage.cpp \
         WebCore/storage/SessionStorage.h \
+        WebCore/storage/SessionStorageArea.cpp \
+        WebCore/storage/SessionStorageArea.h \
         WebCore/storage/Storage.cpp \
         WebCore/storage/Storage.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -29996 +29996 @@
                         </File>
                         <File
+                                RelativePath="..\storage\LocalStorageArea.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\storage\LocalStorageArea.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\storage\LocalStorageTask.cpp"
                                 >
@@ -30033 +30041 @@
                         <File
                                 RelativePath="..\storage\SessionStorage.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\storage\SessionStorageArea.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\storage\SessionStorageArea.h"
                                 >
                         </File>

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -777 +777 @@
                 514B3F730C722047000530DF /* FileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 514B3F720C722047000530DF /* FileSystem.h */; };
                 514B3F760C722055000530DF /* FileSystemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514B3F750C722055000530DF /* FileSystemMac.mm */; };
+                514B49DB0DB6D6AD001C3770 /* LocalStorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 514B49D90DB6D6AD001C3770 /* LocalStorageArea.h */; };
+                514B49DC0DB6D6AD001C3770 /* LocalStorageArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514B49DA0DB6D6AD001C3770 /* LocalStorageArea.cpp */; };
+                514B49DF0DB6D6B6001C3770 /* SessionStorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 514B49DD0DB6D6B6001C3770 /* SessionStorageArea.h */; };
+                514B49E00DB6D6B6001C3770 /* SessionStorageArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514B49DE0DB6D6B6001C3770 /* SessionStorageArea.cpp */; };
                 514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76350CE9225E007EF3CD /* JSSQLError.cpp */; };
                 514C76380CE9225E007EF3CD /* JSSQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76360CE9225E007EF3CD /* JSSQLTransaction.cpp */; };
@@ -5733 +5737 @@
                 514B3F720C722047000530DF /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = "<group>"; };
                 514B3F750C722055000530DF /* FileSystemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileSystemMac.mm; sourceTree = "<group>"; };
+                514B49D90DB6D6AD001C3770 /* LocalStorageArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageArea.h; sourceTree = "<group>"; };
+                514B49DA0DB6D6AD001C3770 /* LocalStorageArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageArea.cpp; sourceTree = "<group>"; };
+                514B49DD0DB6D6B6001C3770 /* SessionStorageArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionStorageArea.h; sourceTree = "<group>"; };
+                514B49DE0DB6D6B6001C3770 /* SessionStorageArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionStorageArea.cpp; sourceTree = "<group>"; };
                 514C76350CE9225E007EF3CD /* JSSQLError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLError.cpp; sourceTree = "<group>"; };
                 514C76360CE9225E007EF3CD /* JSSQLTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransaction.cpp; sourceTree = "<group>"; };
@@ -9675 +9683 @@
                                 51BE38260DAEF7DA001085FC /* LocalStorage.cpp */,
                                 51BE38270DAEF7DA001085FC /* LocalStorage.h */,
+                                514B49DA0DB6D6AD001C3770 /* LocalStorageArea.cpp */,
+                                514B49D90DB6D6AD001C3770 /* LocalStorageArea.h */,
                                 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */,
                                 511F23140DC160DA004F0032 /* LocalStorageTask.h */,
@@ -9702 +9712 @@
                                 51E0BB220DA572A600A9E417 /* SessionStorage.cpp */,
                                 51E0BB210DA572A600A9E417 /* SessionStorage.h */,
+                                514B49DE0DB6D6B6001C3770 /* SessionStorageArea.cpp */,
+                                514B49DD0DB6D6B6001C3770 /* SessionStorageArea.h */,
                                 51E3F9C50DA059DC00250911 /* Storage.cpp */,
                                 51E3F9C40DA059DC00250911 /* Storage.h */,
@@ -16173 +16185 @@
                                 06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
                                 51BE38290DAEF7DA001085FC /* LocalStorage.h in Headers */,
+                                514B49DB0DB6D6AD001C3770 /* LocalStorageArea.h in Headers */,
                                 511F23180DC160DA004F0032 /* LocalStorageTask.h in Headers */,
                                 511F231A0DC160DA004F0032 /* LocalStorageThread.h in Headers */,
@@ -16612 +16625 @@
                                 BC7FA6810D1F167900DB22A9 /* SelectorNodeList.h in Headers */,
                                 51E0BB230DA572A600A9E417 /* SessionStorage.h in Headers */,
+                                514B49DF0DB6D6B6001C3770 /* SessionStorageArea.h in Headers */,
                                 93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
                                 93F1994F08245E59001E9ABC /* Settings.h in Headers */,
@@ -18256 +18270 @@
                                 06E81EEC0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm in Sources */,
                                 51BE38280DAEF7DA001085FC /* LocalStorage.cpp in Sources */,
+                                514B49DC0DB6D6AD001C3770 /* LocalStorageArea.cpp in Sources */,
                                 511F23170DC160DA004F0032 /* LocalStorageTask.cpp in Sources */,
                                 511F23190DC160DA004F0032 /* LocalStorageThread.cpp in Sources */,
@@ -18656 +18671 @@
                                 BC7FA6820D1F167900DB22A9 /* SelectorNodeList.cpp in Sources */,
                                 51E0BB240DA572A600A9E417 /* SessionStorage.cpp in Sources */,
+                                514B49E00DB6D6B6001C3770 /* SessionStorageArea.cpp in Sources */,
                                 93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */,
                                 14C9A5EA0B3D105F005A0232 /* Settings.cpp in Sources */,

trunk/WebCore/WebCoreSources.bkl

@@ -1012 +1012 @@
         storage/DatabaseTracker.cpp
         storage/LocalStorage.cpp
+        storage/LocalStorageArea.cpp
         storage/LocalStorageTask.cpp
         storage/LocalStorageThread.cpp
@@ -1025 +1026 @@
         storage/StorageMap.cpp
         storage/SessionStorage.cpp
+        storage/SessionStorageArea.cpp
         storage/StorageAreaSync.cpp
         storage/StorageSyncManager.cpp

trunk/WebCore/storage/LocalStorage.cpp

@@ -34 +34 @@
 #include "Frame.h"
 #include "FrameTree.h"
+#include "LocalStorageArea.h"
 #include "Page.h"
 #include "PageGroup.h"
@@ -90 +91 @@
     // sync its existance and quota out to disk via an task of type AreaSync
 
-    RefPtr<StorageArea> storageArea;
+    RefPtr<LocalStorageArea> storageArea;
     if (storageArea = m_storageAreaMap.get(origin))
         return storageArea.release();
 
-    storageArea = StorageArea::createLocalStorage(origin, m_syncManager);
+    storageArea = LocalStorageArea::create(origin, m_syncManager);
     m_storageAreaMap.set(origin, storageArea);
     return storageArea.release();

trunk/WebCore/storage/LocalStorage.h

@@ -29 +29 @@
 #if ENABLE(DOM_STORAGE)
 
+#include "LocalStorageArea.h"
 #include "SecurityOriginHash.h"
 
@@ -52 +53 @@
         LocalStorage(const String& path);
 
-        typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>, SecurityOriginHash> LocalStorageAreaMap;
+        typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<LocalStorageArea>, SecurityOriginHash> LocalStorageAreaMap;
         LocalStorageAreaMap m_storageAreaMap;
 

trunk/WebCore/storage/SessionStorage.cpp

@@ -57 +57 @@
     SessionStorageAreaMap::iterator end = m_storageAreaMap.end();
     for (SessionStorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i) {
-        RefPtr<StorageArea> areaCopy = i->second->copy(i->first.get(), newPage);
+        RefPtr<SessionStorageArea> areaCopy = i->second->copy(i->first.get(), newPage);
         newSession->m_storageAreaMap.set(i->first, areaCopy.release());
     }
@@ -66 +66 @@
 PassRefPtr<StorageArea> SessionStorage::storageArea(SecurityOrigin* origin)
 {
-    RefPtr<StorageArea> storageArea;
+    RefPtr<SessionStorageArea> storageArea;
     if (storageArea = m_storageAreaMap.get(origin))
         return storageArea.release();
         
-    storageArea = StorageArea::createSessionStorage(origin, m_page);
+    storageArea = SessionStorageArea::create(origin, m_page);
     m_storageAreaMap.set(origin, storageArea);
     return storageArea.release();

trunk/WebCore/storage/SessionStorage.h

@@ -30 +30 @@
 
 #include "SecurityOriginHash.h"
-#include "StorageArea.h"
+#include "SessionStorageArea.h"
 
 #include <wtf/HashMap.h>
@@ -57 +57 @@
         Page* m_page;
         
-        typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>, SecurityOriginHash> SessionStorageAreaMap;
+        typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<SessionStorageArea>, SecurityOriginHash> SessionStorageAreaMap;
         SessionStorageAreaMap m_storageAreaMap;
     };

trunk/WebCore/storage/StorageArea.cpp

@@ -29 +29 @@
 #if ENABLE(DOM_STORAGE)
 
-#include "EventNames.h"
+#include "CString.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "Page.h"
-#include "PageGroup.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
-#include "StorageEvent.h"
-#include "StorageAreaSync.h"
 #include "StorageMap.h"
-#include "StorageSyncManager.h"
 
 namespace WebCore {
 
-PassRefPtr<StorageArea> StorageArea::createLocalStorage(SecurityOrigin* origin, PassRefPtr<StorageSyncManager> syncManager)
+StorageArea::StorageArea(SecurityOrigin* origin)
+    : m_securityOrigin(origin)
+    , m_storageMap(StorageMap::create())
 {
-    return adoptRef(new StorageArea(origin, syncManager));
 }
 
-StorageArea::StorageArea(SecurityOrigin* origin, PassRefPtr<StorageSyncManager> syncManager)
+StorageArea::StorageArea(SecurityOrigin* origin, StorageArea* area)
     : m_securityOrigin(origin)
-    , m_storageMap(StorageMap::create())
-    , m_storageSyncManager(syncManager)
-    , m_sessionStoragePage(0)
+    , m_storageMap(area->m_storageMap)
 {
-    ASSERT(m_securityOrigin);
-    ASSERT(m_storageMap);
-
-    // FIXME: If there's no backing storage for LocalStorage, the default WebKit behavior should be that of private browsing,
-    // not silently ignoring it.  https://bugs.webkit.org/show_bug.cgi?id=25894
-    if (m_storageSyncManager) {
-        m_storageAreaSync = StorageAreaSync::create(m_storageSyncManager, this);
-        ASSERT(m_storageAreaSync);
-    }
 }
 
-PassRefPtr<StorageArea> StorageArea::createSessionStorage(SecurityOrigin* origin, Page* page)
+StorageArea::~StorageArea()
 {
-    return adoptRef(new StorageArea(origin, page, 0));
-}
-
-PassRefPtr<StorageArea> StorageArea::copy(SecurityOrigin* origin, Page* page)
-{
-    return adoptRef(new StorageArea(origin, page, this));
-}
-
-StorageArea::StorageArea(SecurityOrigin* origin, Page* page, StorageArea* area)
-    : m_securityOrigin(origin)
-    , m_storageMap(area->m_storageMap)
-    , m_sessionStoragePage(page)
-{
-    ASSERT(m_securityOrigin);
-    ASSERT(m_sessionStoragePage);
-
-    if (!m_storageMap) {
-        m_storageMap = StorageMap::create();
-        ASSERT(m_storageMap);
-    }
 }
 
@@ -139 +105 @@
 
     // Only notify the client if an item was actually changed
-    if (oldValue != value) {
-        if (m_storageAreaSync)
-            m_storageAreaSync->scheduleItemForSync(key, value);
-        dispatchStorageEvent(key, oldValue, value, frame);
-    }
+    if (oldValue != value)
+        itemChanged(key, oldValue, value, frame);
 }
 
@@ -159 +122 @@
 
     // Only notify the client if an item was actually removed
-    if (!oldValue.isNull()) {
-        if (m_storageAreaSync)
-            m_storageAreaSync->scheduleItemForSync(key, String());
-        dispatchStorageEvent(key, oldValue, String(), frame);
-    }
+    if (!oldValue.isNull())
+        itemRemoved(key, oldValue, frame);
 }
 
@@ -175 +135 @@
     m_storageMap = StorageMap::create();
     
-    if (m_storageAreaSync)
-        m_storageAreaSync->scheduleClear();
-    dispatchStorageEvent(String(), String(), String(), frame);
+    areaCleared(frame);
 }
 
@@ -192 +150 @@
 }
 
-void StorageArea::scheduleFinalSync()
-{
-    if (m_storageAreaSync)
-        m_storageAreaSync->scheduleFinalSync();
-}
-
-void StorageArea::blockUntilImportComplete() const
-{
-    if (m_storageAreaSync)
-        m_storageAreaSync->blockUntilImportComplete();
-}
-
-void StorageArea::dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame)
-{
-    // We need to copy all relevant frames from every page to a vector since sending the event to one frame might mutate the frame tree
-    // of any given page in the group or mutate the page group itself.
-    Vector<RefPtr<Frame> > frames;
-
-    if (m_sessionStoragePage) {
-        // Send events only to our page.
-        for (Frame* frame = m_sessionStoragePage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-            if (frame->document()->securityOrigin()->equal(securityOrigin()))
-                frames.append(frame);
-        }
-        
-        for (unsigned i = 0; i < frames.size(); ++i)
-            frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), sourceFrame->domWindow(), frames[i]->domWindow()->sessionStorage()));
-    } else {
-        // FIXME: When can this occur?
-        Page* page = sourceFrame->page();
-        if (!page)
-            return;
-
-        // Send events to every page.
-        const HashSet<Page*>& pages = page->group().pages();
-        HashSet<Page*>::const_iterator end = pages.end();
-        for (HashSet<Page*>::const_iterator it = pages.begin(); it != end; ++it) {
-            for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-                if (frame->document()->securityOrigin()->equal(securityOrigin()))
-                    frames.append(frame);
-            }
-        }
-        
-        for (unsigned i = 0; i < frames.size(); ++i)
-            frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), sourceFrame->domWindow(), frames[i]->domWindow()->localStorage()));
-    }        
-}
-
 }
 

trunk/WebCore/storage/StorageArea.h

@@ -30 +30 @@
 
 #include "PlatformString.h"
-#include "SecurityOrigin.h"
-#include "StorageAreaSync.h"
-#include "StorageMap.h"
-#include "StorageSyncManager.h"
 
 #include <wtf/Forward.h>
@@ -43 +39 @@
 
     class Frame;
-    class Page;
     class SecurityOrigin;
-    class StorageAreaSync;
     class StorageMap;
-    class StorageSyncManager;
     typedef int ExceptionCode;
 
     class StorageArea : public ThreadSafeShared<StorageArea> {
     public:
-        static PassRefPtr<StorageArea> createLocalStorage(SecurityOrigin* origin, PassRefPtr<StorageSyncManager> syncManager);
-        static PassRefPtr<StorageArea> createSessionStorage(SecurityOrigin* origin, Page* page);
-        PassRefPtr<StorageArea> copy(SecurityOrigin*, Page*);
-
+        virtual ~StorageArea();
+        
         // The HTML5 DOM Storage API
         unsigned length() const;
@@ -65 +56 @@
 
         bool contains(const String& key) const;
-        void scheduleFinalSync();
 
         // Could be called from a background thread.
@@ -72 +62 @@
 
     protected:
-        StorageArea(SecurityOrigin*, PassRefPtr<StorageSyncManager>);
-        StorageArea(SecurityOrigin*, Page*);
-        StorageArea(SecurityOrigin*, Page*, StorageArea*);
+        StorageArea(SecurityOrigin*);
+        StorageArea(SecurityOrigin*, StorageArea*);
 
     private:
-        void blockUntilImportComplete() const;
-
-        void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame);
+        virtual void itemChanged(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame) = 0;
+        virtual void itemRemoved(const String& key, const String& oldValue, Frame* sourceFrame) = 0;
+        virtual void areaCleared(Frame* sourceFrame) = 0;
+        virtual void blockUntilImportComplete() const = 0;
 
         RefPtr<SecurityOrigin> m_securityOrigin;
         RefPtr<StorageMap> m_storageMap;
-
-        RefPtr<StorageAreaSync> m_storageAreaSync;
-        RefPtr<StorageSyncManager> m_storageSyncManager;
-        Page* m_sessionStoragePage;  // NULL iff it's LocalStorage
     };
 

trunk/WebCore/storage/StorageAreaSync.cpp

@@ -58 +58 @@
 {
     ASSERT(m_storageArea);
-    ASSERT(m_syncManager);
-
-    // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
-    // not silently ignoring it.  https://bugs.webkit.org/show_bug.cgi?id=25894
-    if (!m_syncManager->scheduleImport(this))
+    if (!m_syncManager || !m_syncManager->scheduleImport(this))
         m_importComplete = true;
 }
@@ -76 +72 @@
 {
     ASSERT(isMainThread());
+    if (!m_syncManager)
+        return;
     
     if (m_syncTimer.isActive())
@@ -124 +122 @@
 {
     ASSERT(isMainThread());
+    if (!m_syncManager)
+        return;
 
     HashMap<String, String>::iterator it = m_changedItems.begin();
@@ -162 +162 @@
     ASSERT(!isMainThread());
     ASSERT(!m_database.isOpen());
+    if (!m_syncManager)
+        return;
 
     String databaseFilename = m_syncManager->fullDatabaseFilename(m_storageArea->securityOrigin());

trunk/WebCore/storage/StorageAreaSync.h

@@ -37 +37 @@
 namespace WebCore {
 
-    class Frame;
     class StorageArea;    
     class StorageSyncManager;

trunk/WebCore/storage/StorageSyncManager.h

@@ -29 +29 @@
 #if ENABLE(DOM_STORAGE)
 
+#include "LocalStorageArea.h"
 #include "LocalStorageTask.h"
 #include "LocalStorageThread.h"
-#include "StorageArea.h"
 #include "StorageAreaSync.h"