Title: [144829] trunk/Source/WebKit2
- Revision
- 144829
- Author
- ander...@apple.com
- Date
- 2013-03-05 15:31:54 -0800 (Tue, 05 Mar 2013)
Log Message
Move storageType() to StorageAreaProxy
https://bugs.webkit.org/show_bug.cgi?id=111488
Reviewed by Andreas Kling.
* WebProcess/Storage/StorageAreaProxy.cpp:
(WebKit::StorageAreaProxy::StorageAreaProxy):
(WebKit::StorageAreaProxy::storageType):
(WebKit::StorageAreaProxy::disabledByPrivateBrowsingInFrame):
* WebProcess/Storage/StorageAreaProxy.h:
(StorageAreaProxy):
* WebProcess/Storage/StorageNamespaceProxy.cpp:
* WebProcess/Storage/StorageNamespaceProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (144828 => 144829)
--- trunk/Source/WebKit2/ChangeLog 2013-03-05 23:31:07 UTC (rev 144828)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-05 23:31:54 UTC (rev 144829)
@@ -1,3 +1,19 @@
+2013-03-05 Anders Carlsson <ander...@apple.com>
+
+ Move storageType() to StorageAreaProxy
+ https://bugs.webkit.org/show_bug.cgi?id=111488
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/Storage/StorageAreaProxy.cpp:
+ (WebKit::StorageAreaProxy::StorageAreaProxy):
+ (WebKit::StorageAreaProxy::storageType):
+ (WebKit::StorageAreaProxy::disabledByPrivateBrowsingInFrame):
+ * WebProcess/Storage/StorageAreaProxy.h:
+ (StorageAreaProxy):
+ * WebProcess/Storage/StorageNamespaceProxy.cpp:
+ * WebProcess/Storage/StorageNamespaceProxy.h:
+
2013-03-05 Jeffrey Pfau <jp...@apple.com>
Clear associated cache partitions when deleting origins' cache
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (144828 => 144829)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-03-05 23:31:07 UTC (rev 144828)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp 2013-03-05 23:31:54 UTC (rev 144829)
@@ -54,7 +54,7 @@
}
StorageAreaProxy::StorageAreaProxy(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
- : m_storageType(storageNamespaceProxy->storageType())
+ : m_storageNamespaceID(storageNamespaceProxy->storageNamespaceID())
, m_quotaInBytes(storageNamespaceProxy->quotaInBytes())
, m_storageAreaID(generateStorageAreaID())
{
@@ -209,12 +209,21 @@
// FIXME: Implement this.
}
+StorageType StorageAreaProxy::storageType() const
+{
+ // A zero storage namespace ID is used for local storage.
+ if (!m_storageNamespaceID)
+ return LocalStorage;
+
+ return SessionStorage;
+}
+
bool StorageAreaProxy::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const
{
if (!sourceFrame->page()->settings()->privateBrowsingEnabled())
return false;
- if (m_storageType != LocalStorage)
+ if (storageType() != LocalStorage)
return true;
return !SchemeRegistry::allowsLocalStorageAccessInPrivateBrowsing(sourceFrame->document()->securityOrigin()->protocol());
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h (144828 => 144829)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-03-05 23:31:07 UTC (rev 144828)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h 2013-03-05 23:31:54 UTC (rev 144829)
@@ -66,11 +66,12 @@
void didSetItem(const String& key, bool quotaError);
void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString);
+ WebCore::StorageType storageType() const;
bool disabledByPrivateBrowsingInFrame(const WebCore::Frame* sourceFrame) const;
void loadValuesIfNeeded();
- WebCore::StorageType m_storageType;
+ uint64_t m_storageNamespaceID;
unsigned m_quotaInBytes;
uint64_t m_storageAreaID;
RefPtr<WebCore::StorageMap> m_storageMap;
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp (144828 => 144829)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-03-05 23:31:07 UTC (rev 144828)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp 2013-03-05 23:31:54 UTC (rev 144829)
@@ -50,15 +50,6 @@
{
}
-StorageType StorageNamespaceProxy::storageType() const
-{
- // A zero storage namespace ID is used for local storage.
- if (!m_storageNamespaceID)
- return LocalStorage;
-
- return SessionStorage;
-}
-
PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
{
return StorageAreaProxy::create(this, securityOrigin);
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h (144828 => 144829)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h 2013-03-05 23:31:07 UTC (rev 144828)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h 2013-03-05 23:31:54 UTC (rev 144829)
@@ -41,8 +41,6 @@
uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
unsigned quotaInBytes() const { return m_quotaInBytes; }
- WebCore::StorageType storageType() const;
-
private:
explicit StorageNamespaceProxy(uint64_t storageNamespaceID, unsigned quotaInBytes);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
