Diff
Modified: trunk/Source/WebCore/ChangeLog (140711 => 140712)
--- trunk/Source/WebCore/ChangeLog 2013-01-24 20:46:28 UTC (rev 140711)
+++ trunk/Source/WebCore/ChangeLog 2013-01-24 21:00:27 UTC (rev 140712)
@@ -1,3 +1,14 @@
+2013-01-24 Anders Carlsson <ander...@apple.com>
+
+ Add stubbed out StorageNamespaceProxy class
+ https://bugs.webkit.org/show_bug.cgi?id=107846
+
+ Reviewed by Sam Weinig.
+
+ Make StorageNamespace.h and StorageArea.h private headers.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2013-01-24 Tony Chang <t...@chromium.org>
Remove document as a parameter from a few internals methods
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (140711 => 140712)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-01-24 20:46:28 UTC (rev 140711)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-01-24 21:00:27 UTC (rev 140712)
@@ -1625,7 +1625,7 @@
51ABAE1F103C1913008C5260 /* SocketStreamHandleCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */; };
51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */; };
51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
- 51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BE37DE0DAEE00E001085FC /* StorageArea.h */; };
+ 51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BE37DE0DAEE00E001085FC /* StorageArea.h */; settings = {ATTRIBUTES = (Private, ); }; };
51C0AA390F2AA10A001648C2 /* CachedFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0AA380F2AA10A001648C2 /* CachedFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
51C0AA410F2AA15E001648C2 /* CachedFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C0AA400F2AA15E001648C2 /* CachedFrame.cpp */; };
51C81B890C4422F70019ECE3 /* FTPDirectoryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */; };
@@ -5884,7 +5884,7 @@
C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */; };
- C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; };
+ C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; settings = {ATTRIBUTES = (Private, ); }; };
C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */; };
C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */; };
C5102ECF0FD9EF8C00FAFF04 /* StorageAreaSync.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102ECD0FD9EF8C00FAFF04 /* StorageAreaSync.h */; };
Modified: trunk/Source/WebKit2/ChangeLog (140711 => 140712)
--- trunk/Source/WebKit2/ChangeLog 2013-01-24 20:46:28 UTC (rev 140711)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-24 21:00:27 UTC (rev 140712)
@@ -1,5 +1,18 @@
2013-01-24 Anders Carlsson <ander...@apple.com>
+ Add stubbed out StorageNamespaceProxy class
+ https://bugs.webkit.org/show_bug.cgi?id=107846
+
+ Reviewed by Sam Weinig.
+
+ Add new class.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Storage/StorageNamespaceProxy.cpp: Added.
+ * WebProcess/Storage/StorageNamespaceProxy.h: Added.
+
+2013-01-24 Anders Carlsson <ander...@apple.com>
+
Move WebKeyValueStorageManager to WebProcess/Storage.
Rubber-stamped by Sam Weinig.
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (140711 => 140712)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 20:46:28 UTC (rev 140711)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 21:00:27 UTC (rev 140712)
@@ -72,6 +72,7 @@
1A119A95127B796200A9ECB1 /* MessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119A94127B796200A9ECB1 /* MessageSender.h */; };
1A13BEB31635A9C800F19C03 /* StringReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A13BEB11635A9C800F19C03 /* StringReference.cpp */; };
1A13BEB41635A9C800F19C03 /* StringReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A13BEB21635A9C800F19C03 /* StringReference.h */; };
+ 1A17635616B1D5D000D88FD6 /* StorageNamespaceProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */; };
1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */; };
1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */; };
1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */; };
@@ -1290,6 +1291,8 @@
1A119A94127B796200A9ECB1 /* MessageSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSender.h; sourceTree = "<group>"; };
1A13BEB11635A9C800F19C03 /* StringReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringReference.cpp; sourceTree = "<group>"; };
1A13BEB21635A9C800F19C03 /* StringReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringReference.h; sourceTree = "<group>"; };
+ 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceProxy.cpp; sourceTree = "<group>"; };
+ 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceProxy.h; sourceTree = "<group>"; };
1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginCreationParameters.cpp; sourceTree = "<group>"; };
1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginCreationParameters.h; sourceTree = "<group>"; };
1A186EE812EF7618008E5F37 /* LayerTreeHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHost.h; sourceTree = "<group>"; };
@@ -2785,6 +2788,8 @@
1AAC4DDE16B1CBF6009425E3 /* Storage */ = {
isa = PBXGroup;
children = (
+ 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */,
+ 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */,
1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */,
1AAC4DE316B1CBF6009425E3 /* WebKeyValueStorageManager.messages.in */,
@@ -5495,6 +5500,7 @@
buildActionMask = 2147483647;
files = (
1A6FA31111E3921E00DB1371 /* MainMacProcess.cpp in Sources */,
+ 1A17635616B1D5D000D88FD6 /* StorageNamespaceProxy.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp (0 => 140712)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-01-24 21:00:27 UTC (rev 140712)
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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 ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "StorageNamespaceProxy.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+PassRefPtr<StorageNamespaceProxy> StorageNamespaceProxy::create()
+{
+ return adoptRef(new StorageNamespaceProxy);
+}
+
+StorageNamespaceProxy::StorageNamespaceProxy()
+{
+}
+
+StorageNamespaceProxy::~StorageNamespaceProxy()
+{
+}
+
+PassRefPtr<WebCore::StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<WebCore::SecurityOrigin>)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
+PassRefPtr<WebCore::StorageNamespace> StorageNamespaceProxy::copy()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
+void StorageNamespaceProxy::close()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceProxy::clearOriginForDeletion(WebCore::SecurityOrigin*)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceProxy::clearAllOriginsForDeletion()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceProxy::sync()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageNamespaceProxy::closeIdleLocalStorageDatabases()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h (0 => 140712)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h 2013-01-24 21:00:27 UTC (rev 140712)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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 ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef StorageNamespaceProxy_h
+#define StorageNamespaceProxy_h
+
+#include <WebCore/StorageArea.h>
+#include <WebCore/StorageNamespace.h>
+
+namespace WebKit {
+
+class StorageNamespaceProxy : public WebCore::StorageNamespace {
+public:
+ // FIXME: Figure out what else to pass here.
+ static PassRefPtr<StorageNamespaceProxy> create();
+ virtual ~StorageNamespaceProxy();
+
+private:
+ StorageNamespaceProxy();
+
+ virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) OVERRIDE;
+ virtual PassRefPtr<WebCore::StorageNamespace> copy() OVERRIDE;
+ virtual void close() OVERRIDE;
+ virtual void clearOriginForDeletion(WebCore::SecurityOrigin*) OVERRIDE;
+ virtual void clearAllOriginsForDeletion() OVERRIDE;
+ virtual void sync() OVERRIDE;
+ virtual void closeIdleLocalStorageDatabases() OVERRIDE;
+};
+
+} // namespace WebKit
+
+#endif // StorageNamespaceProxy_h
