2009-07-14 Brent Fulgham <bfulgham@webkit.org>
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jul 2009 20:39:17 +0000 (20:39 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jul 2009 20:39:17 +0000 (20:39 +0000)
        Revert http://trac.webkit.org/changeset/45864 after
        breaking of Windows build.

        * storage/LocalStorageTask.cpp:
        * storage/LocalStorageTask.h:
        * storage/Storage.cpp:
        * storage/Storage.h:
        * storage/StorageArea.cpp:
        * storage/StorageArea.h:
        * storage/StorageAreaImpl.cpp:
        * storage/StorageAreaImpl.h:
        * storage/StorageAreaSync.cpp:
        * storage/StorageAreaSync.h:
        * storage/StorageEvent.cpp:
        * storage/StorageEvent.h:
        (WebCore::StorageEvent::create):
        (WebCore::StorageEvent::StorageEvent):
        * storage/StorageNamespace.h:
        * storage/StorageNamespaceImpl.cpp:
        * storage/StorageNamespaceImpl.h:
        * storage/StorageSyncManager.cpp:
        * storage/StorageSyncManager.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@45866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
WebCore/ChangeLog
WebCore/storage/LocalStorageTask.cpp
WebCore/storage/LocalStorageTask.h
WebCore/storage/Storage.cpp
WebCore/storage/Storage.h
WebCore/storage/StorageArea.cpp
WebCore/storage/StorageArea.h
WebCore/storage/StorageAreaImpl.cpp
WebCore/storage/StorageAreaImpl.h
WebCore/storage/StorageAreaSync.cpp
WebCore/storage/StorageAreaSync.h
WebCore/storage/StorageEvent.cpp
WebCore/storage/StorageEvent.h
WebCore/storage/StorageNamespace.h
WebCore/storage/StorageNamespaceImpl.cpp
WebCore/storage/StorageNamespaceImpl.h
WebCore/storage/StorageSyncManager.cpp
WebCore/storage/StorageSyncManager.h

index 7d10b40..410c477 100644 (file)
@@ -1,3 +1,28 @@
+2009-07-14  Brent Fulgham  <bfulgham@webkit.org>
+
+        Revert http://trac.webkit.org/changeset/45864 after
+        breaking of Windows build.
+
+        * storage/LocalStorageTask.cpp:
+        * storage/LocalStorageTask.h:
+        * storage/Storage.cpp:
+        * storage/Storage.h:
+        * storage/StorageArea.cpp:
+        * storage/StorageArea.h:
+        * storage/StorageAreaImpl.cpp:
+        * storage/StorageAreaImpl.h:
+        * storage/StorageAreaSync.cpp:
+        * storage/StorageAreaSync.h:
+        * storage/StorageEvent.cpp:
+        * storage/StorageEvent.h:
+        (WebCore::StorageEvent::create):
+        (WebCore::StorageEvent::StorageEvent):
+        * storage/StorageNamespace.h:
+        * storage/StorageNamespaceImpl.cpp:
+        * storage/StorageNamespaceImpl.h:
+        * storage/StorageSyncManager.cpp:
+        * storage/StorageSyncManager.h:
+
 2009-07-11  Jeremy Orlow  <jorlow@chromium.org>
 
         Reviewed by Darin Adler.
index f5d4890..f9b8dc2 100644 (file)
@@ -49,10 +49,6 @@ LocalStorageTask::LocalStorageTask(Type type, PassRefPtr<LocalStorageThread> thr
     ASSERT(m_type == TerminateThread);
 }
 
-LocalStorageTask::~LocalStorageTask()
-{
-}
-
 void LocalStorageTask::performTask()
 {
     switch (m_type) {
index cd90734..2c397da 100644 (file)
@@ -49,9 +49,6 @@ namespace WebCore {
         void performTask();
 
     private:
-        friend class ThreadSafeShared<LocalStorageTask>;
-        ~LocalStorageTask();
-
         LocalStorageTask(Type, PassRefPtr<StorageAreaSync>);
         LocalStorageTask(Type, PassRefPtr<LocalStorageThread>);
 
index 0166098..e228971 100644 (file)
@@ -47,10 +47,6 @@ Storage::Storage(Frame* frame, PassRefPtr<StorageArea> storageArea)
     ASSERT(m_storageArea);
 }
 
-Storage::~Storage()
-{
-}
-
 unsigned Storage::length() const
 {
     if (!m_frame)
index acafb22..ca7a32e 100644 (file)
@@ -28,6 +28,8 @@
 
 #if ENABLE(DOM_STORAGE)
 
+#include "StorageArea.h"
+
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
@@ -35,7 +37,6 @@
 namespace WebCore {
 
     class Frame;
-    class StorageArea;
     class String;
     typedef int ExceptionCode;
 
@@ -55,9 +56,6 @@ namespace WebCore {
         void disconnectFrame() { m_frame = 0; }
 
     private:
-        friend class RefCounted<Storage>;
-        ~Storage();
-
         Storage(Frame*, PassRefPtr<StorageArea>);
             
         Frame* m_frame;
index 828926a..11b3517 100644 (file)
@@ -33,7 +33,6 @@
 #if ENABLE(DOM_STORAGE)
 
 #include "StorageAreaImpl.h"
-#include "StorageSyncManager.h"
 
 namespace WebCore {
 
index a2a50f0..31f716a 100644 (file)
 #if ENABLE(DOM_STORAGE)
 
 #include "PlatformString.h"
+#include "SecurityOrigin.h"
+#include "StorageAreaSync.h"
+#include "StorageMap.h"
+#include "StorageSyncManager.h"
 
+#include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/Threading.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
     class Frame;
+    class Page;
     class SecurityOrigin;
+    class StorageAreaSync;
+    class StorageMap;
     class StorageSyncManager;
     typedef int ExceptionCode;
     enum StorageType { LocalStorage, SessionStorage };
index e399464..ba31658 100644 (file)
@@ -28,6 +28,7 @@
 
 #if ENABLE(DOM_STORAGE)
 
+#include "DOMWindow.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
index 0288633..e2d14f1 100644 (file)
 
 #include "StorageArea.h"
 
-#include <wtf/RefPtr.h>
-
 namespace WebCore {
 
-    class SecurityOrigin;
-    class StorageMap;
-    class StorageAreaSync;
-
     class StorageAreaImpl : public StorageArea {
     public:
         static PassRefPtr<StorageArea> create(StorageType, SecurityOrigin*, PassRefPtr<StorageSyncManager>);
index b5f18bf..2cef56d 100644 (file)
@@ -33,7 +33,6 @@
 #include "HTMLElement.h"
 #include "SQLiteStatement.h"
 #include "StorageArea.h"
-#include "StorageSyncManager.h"
 #include "SuddenTermination.h"
 
 namespace WebCore {
@@ -66,10 +65,12 @@ StorageAreaSync::StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManag
         m_importComplete = true;
 }
 
+#ifndef NDEBUG
 StorageAreaSync::~StorageAreaSync()
 {
     ASSERT(!m_syncTimer.isActive());
 }
+#endif
 
 void StorageAreaSync::scheduleFinalSync()
 {
index e8ed59a..a7f1082 100644 (file)
@@ -28,9 +28,9 @@
 
 #if ENABLE(DOM_STORAGE)
 
-#include "PlatformString.h"
 #include "SQLiteDatabase.h"
 #include "StringHash.h"
+#include "StorageSyncManager.h"
 #include "Timer.h"
 #include <wtf/HashMap.h>
 
@@ -42,6 +42,10 @@ namespace WebCore {
     
     class StorageAreaSync : public RefCounted<StorageAreaSync> {
     public:
+#ifndef NDEBUG
+        ~StorageAreaSync();
+#endif
+
         static PassRefPtr<StorageAreaSync> create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageArea> storageArea);
         
         void scheduleFinalSync();
@@ -51,9 +55,6 @@ namespace WebCore {
         void scheduleClear();
         
     private:
-        friend class RefCounted<StorageAreaSync>;
-        ~StorageAreaSync();
-
         StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageArea> storageArea);
 
         void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame);
index 2e620d5..f2945a9 100644 (file)
 
 namespace WebCore {
 
-PassRefPtr<StorageEvent> StorageEvent::create()
-{
-    return adoptRef(new StorageEvent);
-}
-
-StorageEvent::StorageEvent()
-{
-}
-
-PassRefPtr<StorageEvent> StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea)
-{
-    return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, source, storageArea));
-}
-
 StorageEvent::StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea)
     : Event(type, false, true)
     , m_key(key)
index 703fb5a..ee3d5ad 100644 (file)
 #if ENABLE(DOM_STORAGE)
 
 #include "Event.h"
-#include "PlatformString.h"
+#include "Storage.h"
 
 namespace WebCore {
 
     class DOMWindow;
-    class Storage;
 
     class StorageEvent : public Event {
     public:
-        static PassRefPtr<StorageEvent> create();
-        static PassRefPtr<StorageEvent> create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea);
+        static PassRefPtr<StorageEvent> create()
+        {
+            return adoptRef(new StorageEvent);
+        }
+        static PassRefPtr<StorageEvent> create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea)
+        {
+            return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, source, storageArea));
+        }
 
         const String& key() const { return m_key; }
         const String& oldValue() const { return m_oldValue; }
@@ -56,7 +61,7 @@ namespace WebCore {
         virtual bool isStorageEvent() const { return true; }
 
     private:    
-        StorageEvent();
+        StorageEvent() { }
         StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea);
         
         String m_key;
index edbe339..687cea2 100644 (file)
 
 #if ENABLE(DOM_STORAGE)
 
-#include "PlatformString.h"
+#include "SecurityOriginHash.h"
+#include "StorageArea.h"
 
-#include <wtf/PassRefPtr.h>
+#include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-    class SecurityOrigin;
     class StorageArea;
+    class StorageSyncManager;
 
     // This interface is required for Chromium since these actions need to be proxied between processes.
     class StorageNamespace : public RefCounted<StorageNamespace> {
index c596d18..39ec27b 100644 (file)
 
 #if ENABLE(DOM_STORAGE)
 
-#include "SecurityOriginHash.h"
-#include "StringHash.h"
-#include "StorageArea.h"
-#include "StorageSyncManager.h"
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
index 7e4b8f9..6c5a9dc 100644 (file)
 
 #if ENABLE(DOM_STORAGE)
 
-#include "PlatformString.h"
-#include "SecurityOriginHash.h"
-#include "StorageArea.h"
 #include "StorageNamespace.h"
 
-#include <wtf/HashMap.h>
-#include <wtf/RefPtr.h>
-
 namespace WebCore {
 
     class StorageNamespaceImpl : public StorageNamespace {
index a935242..5dab7a6 100644 (file)
@@ -33,8 +33,6 @@
 #include "FileSystem.h"
 #include "Frame.h"
 #include "FrameTree.h"
-#include "LocalStorageTask.h"
-#include "LocalStorageThread.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "StorageAreaSync.h"
@@ -55,10 +53,6 @@ StorageSyncManager::StorageSyncManager(const String& path)
     m_thread->start();
 }
 
-StorageSyncManager::~StorageSyncManager()
-{
-}
-
 String StorageSyncManager::fullDatabaseFilename(SecurityOrigin* origin)
 {
     ASSERT(origin);
index 7d06ba7..83353ed 100644 (file)
 
 #if ENABLE(DOM_STORAGE)
 
-#include "PlatformString.h"
+#include "LocalStorageTask.h"
+#include "LocalStorageThread.h"
+#include "StorageArea.h"
+#include "StorageAreaSync.h"
 
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
 
 namespace WebCore {
 
-    class LocalStorageThread;
-    class SecurityOrigin;
-    class StorageAreaSync;
-
     class StorageSyncManager : public ThreadSafeShared<StorageSyncManager> {
     public:
         static PassRefPtr<StorageSyncManager> create(const String& path);
@@ -50,9 +47,6 @@ namespace WebCore {
         void close();
 
     private:
-        friend class ThreadSafeShared<StorageSyncManager>;
-        ~StorageSyncManager();
-
         StorageSyncManager(const String& path);
 
         RefPtr<LocalStorageThread> m_thread;