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; |