Diff
Modified: trunk/Source/WebKit2/ChangeLog (140722 => 140723)
--- trunk/Source/WebKit2/ChangeLog 2013-01-24 22:27:44 UTC (rev 140722)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-24 22:32:39 UTC (rev 140723)
@@ -1,3 +1,14 @@
+2013-01-24 Anders Carlsson <[email protected]>
+
+ Add stubbed out StorageAreaProxy class
+ https://bugs.webkit.org/show_bug.cgi?id=107864
+
+ Reviewed by Beth Dakin.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Storage/StorageAreaProxy.cpp: Added.
+ * WebProcess/Storage/StorageAreaProxy.h: Added.
+
2013-01-24 Csaba Osztrogonác <[email protected]>
Unreviewed trivial buildfix after r140711.
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (140722 => 140723)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 22:27:44 UTC (rev 140722)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 22:32:39 UTC (rev 140723)
@@ -250,6 +250,8 @@
1AC8702E130B49A2002C1257 /* WebPluginSiteDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */; };
1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
+ 1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */; };
+ 1AD3306F16B1D991004F60E7 /* StorageAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */; };
1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4976611FF658E0048B464 /* NPJSObject.h */; };
1AE4976911FF658E0048B464 /* NPJSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4976711FF658E0048B464 /* NPJSObject.cpp */; };
@@ -1493,6 +1495,8 @@
1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginSiteDataManager.cpp; sourceTree = "<group>"; };
1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxyMap.cpp; sourceTree = "<group>"; };
1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
+ 1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaProxy.cpp; sourceTree = "<group>"; };
+ 1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaProxy.h; sourceTree = "<group>"; };
1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = "<group>"; };
1AE4976611FF658E0048B464 /* NPJSObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObject.h; sourceTree = "<group>"; };
1AE4976711FF658E0048B464 /* NPJSObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObject.cpp; sourceTree = "<group>"; };
@@ -2788,6 +2792,8 @@
1AAC4DDE16B1CBF6009425E3 /* Storage */ = {
isa = PBXGroup;
children = (
+ 1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */,
+ 1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */,
1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */,
1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */,
1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
@@ -5065,6 +5071,7 @@
519B4FF516A9EA970066874D /* SchedulableLoader.h in Headers */,
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
1AAC4DE716B1CBF6009425E3 /* WebKeyValueStorageManager.h in Headers */,
+ 1AD3306F16B1D991004F60E7 /* StorageAreaProxy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6045,6 +6052,7 @@
519B4FF416A9EA970066874D /* SchedulableLoader.cpp in Sources */,
E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */,
1AAC4DE616B1CBF6009425E3 /* WebKeyValueStorageManager.cpp in Sources */,
+ 1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (0 => 140723)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-01-24 22:32:39 UTC (rev 140723)
@@ -0,0 +1,121 @@
+/*
+ * 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 "StorageAreaProxy.h"
+
+namespace WebKit {
+
+PassRefPtr<StorageAreaProxy> StorageAreaProxy::create()
+{
+ return adoptRef(new StorageAreaProxy);
+}
+
+StorageAreaProxy::StorageAreaProxy()
+{
+}
+
+StorageAreaProxy::~StorageAreaProxy()
+{
+}
+
+unsigned StorageAreaProxy::length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+String StorageAreaProxy::key(unsigned index, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String StorageAreaProxy::getItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+void StorageAreaProxy::setItem(const String& key, const String& value, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageAreaProxy::removeItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageAreaProxy::clear(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+bool StorageAreaProxy::contains(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+bool StorageAreaProxy::canAccessStorage(WebCore::Frame*) const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+size_t StorageAreaProxy::memoryBytesUsedByCache() const
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+void StorageAreaProxy::incrementAccessCount()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageAreaProxy::decrementAccessCount()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+void StorageAreaProxy::closeDatabaseIfIdle()
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h (0 => 140723)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-01-24 22:32:39 UTC (rev 140723)
@@ -0,0 +1,58 @@
+/*
+ * 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 StorageAreaProxy_h
+#define StorageAreaProxy_h
+
+#include <WebCore/StorageArea.h>
+
+namespace WebKit {
+
+class StorageAreaProxy : public WebCore::StorageArea {
+public:
+ static PassRefPtr<StorageAreaProxy> create();
+ virtual ~StorageAreaProxy();
+
+private:
+ StorageAreaProxy();
+
+ // WebCore::StorageArea.
+ virtual unsigned length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const OVERRIDE;
+ virtual String key(unsigned index, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const OVERRIDE;
+ virtual String getItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const OVERRIDE;
+ virtual void setItem(const String& key, const String& value, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) OVERRIDE;
+ virtual void removeItem(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) OVERRIDE;
+ virtual void clear(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) OVERRIDE;
+ virtual bool contains(const String& key, WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) const OVERRIDE;
+ virtual bool canAccessStorage(WebCore::Frame*) const OVERRIDE;
+ virtual size_t memoryBytesUsedByCache() const OVERRIDE;
+ virtual void incrementAccessCount() OVERRIDE;
+ virtual void decrementAccessCount() OVERRIDE;
+ virtual void closeDatabaseIfIdle() OVERRIDE;
+};
+
+} // namespace WebKit
+
+#endif // StorageAreaProxy_h
