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

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

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Handle FrameHost-detached access in FrameLoader::allowPlugins() 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
« no previous file with comments | « Source/core/frame/Console.cpp ('k') | Source/core/frame/DOMWindowProperty.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/DOMWindowProperty.h
diff --git a/Source/core/frame/DOMWindowProperty.h b/Source/core/frame/DOMWindowProperty.h
index eb3542d30b268ca52d08918fd0ff5ce28a1d52ef..0b75cc1b3c6adb0eb7a44ceb7ff67304b1a304bb 100644
--- a/Source/core/frame/DOMWindowProperty.h
+++ b/Source/core/frame/DOMWindowProperty.h
@@ -26,12 +26,14 @@
#ifndef DOMWindowProperty_h
#define DOMWindowProperty_h
+#include "platform/heap/Handle.h"
+
namespace blink {
class LocalDOMWindow;
class LocalFrame;
-class DOMWindowProperty {
+class DOMWindowProperty : public WillBeGarbageCollectedMixin {
public:
explicit DOMWindowProperty(LocalFrame*);
@@ -40,11 +42,15 @@ public:
LocalFrame* frame() const { return m_frame; }
+ virtual void trace(Visitor*);
+
protected:
+#if !ENABLE(OILPAN)
virtual ~DOMWindowProperty();
+#endif
- LocalFrame* m_frame;
- LocalDOMWindow* m_associatedDOMWindow;
+ RawPtrWillBeWeakMember<LocalFrame> m_frame;
+ RawPtrWillBeMember<LocalDOMWindow> m_associatedDOMWindow;
};
}
« no previous file with comments | « Source/core/frame/Console.cpp ('k') | Source/core/frame/DOMWindowProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698