Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1697)

Unified Diff: Source/core/storage/StorageArea.h

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Back out non-Oilpan experiment + tidy up by adding frame() ref accessors Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/storage/StorageArea.h
diff --git a/Source/core/storage/StorageArea.h b/Source/core/storage/StorageArea.h
index 799e3c6c50617fbc90a04c69db879c44175a56b1..38763b8c9ceca814b65d1062347f4fa17cebd070 100644
--- a/Source/core/storage/StorageArea.h
+++ b/Source/core/storage/StorageArea.h
@@ -32,11 +32,6 @@
#include "wtf/text/WTFString.h"
namespace blink {
-class WebStorageArea;
-class WebStorageNamespace;
-}
-
-namespace blink {
class ExceptionState;
class LocalFrame;
@@ -44,15 +39,18 @@ class KURL;
class Page;
class SecurityOrigin;
class Storage;
+class WebStorageArea;
+class WebStorageNamespace;
enum StorageType {
LocalStorage,
SessionStorage
};
-class StorageArea : public NoBaseWillBeGarbageCollectedFinalized<StorageArea> {
+class StorageArea FINAL : public NoBaseWillBeGarbageCollectedFinalized<StorageArea> {
public:
- StorageArea(PassOwnPtr<blink::WebStorageArea>, StorageType);
+ static PassOwnPtrWillBeRawPtr<StorageArea> create(PassOwnPtr<WebStorageArea>, StorageType);
+
virtual ~StorageArea();
// The HTML5 DOM Storage API
@@ -68,20 +66,22 @@ public:
size_t memoryBytesUsedByCache();
static void dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue,
- SecurityOrigin*, const KURL& pageURL, blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess);
+ SecurityOrigin*, const KURL& pageURL, WebStorageArea* sourceAreaInstance, bool originatedInProcess);
static void dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue,
- SecurityOrigin*, const KURL& pageURL, const blink::WebStorageNamespace&,
- blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess);
+ SecurityOrigin*, const KURL& pageURL, const WebStorageNamespace&,
+ WebStorageArea* sourceAreaInstance, bool originatedInProcess);
- void trace(Visitor*) { }
+ void trace(Visitor*);
private:
- static bool isEventSource(Storage*, blink::WebStorageArea* sourceAreaInstance);
+ StorageArea(PassOwnPtr<WebStorageArea>, StorageType);
+
+ static bool isEventSource(Storage*, WebStorageArea* sourceAreaInstance);
- OwnPtr<blink::WebStorageArea> m_storageArea;
+ OwnPtr<WebStorageArea> m_storageArea;
StorageType m_storageType;
+ RawPtrWillBeMember<LocalFrame> m_canAccessStorageCachedFrame;
bool m_canAccessStorageCachedResult;
- LocalFrame* m_canAccessStorageCachedFrame;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698