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

Unified Diff: Source/core/frame/LocalDOMWindow.h

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update OilpanExpectations 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/frame/LocalDOMWindow.h
diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
index 955475e2693e62201f363ff20bcd1ccd63782569..5917685c7534167b7d17c5cac55b1723535cb1db 100644
--- a/Source/core/frame/LocalDOMWindow.h
+++ b/Source/core/frame/LocalDOMWindow.h
@@ -339,7 +339,10 @@ private:
Page* page();
+ // FrameDestructionObserver
+#if !ENABLE(OILPAN)
virtual void frameDestroyed() OVERRIDE;
+#endif
virtual void willDetachFrameHost() OVERRIDE;
void clearDocument();
@@ -365,7 +368,7 @@ private:
bool m_hasBeenReset;
#endif
- HashSet<DOMWindowProperty*> m_properties;
+ WillBeHeapHashSet<RawPtrWillBeMember<DOMWindowProperty> > m_properties;
mutable RefPtrWillBeMember<Screen> m_screen;
mutable RefPtrWillBeMember<History> m_history;

Powered by Google App Engine
This is Rietveld 408576698