Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / DOMWindowProperty.h

diff --git a/src/third_party/WebKit/Source/core/frame/DOMWindowProperty.h b/src/third_party/WebKit/Source/core/frame/DOMWindowProperty.h
index eb3542d..38060a0 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/DOMWindowProperty.h
+++ b/src/third_party/WebKit/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,13 +42,21 @@ public:
 
     LocalFrame* frame() const { return m_frame; }
 
+    virtual void trace(Visitor*);
+
 protected:
+#if !ENABLE(OILPAN)
     virtual ~DOMWindowProperty();
+#endif
 
-    LocalFrame* m_frame;
+    RawPtrWillBeWeakMember<LocalFrame> m_frame;
+
+#if !ENABLE(OILPAN)
+private:
     LocalDOMWindow* m_associatedDOMWindow;
+#endif
 };
 
-}
+} // namespace blink
 
 #endif