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

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

Issue 558213002: Simplify DOMWindowProperty and its unregistration. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Iterate instead 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 | « no previous file | Source/core/frame/DOMWindowProperty.cpp » ('j') | Source/core/frame/LocalDOMWindow.h » ('J')
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 2666f88c0fe13096ea5714ecf1f10fff7d89652a..ba2aa8999dfefd5c857b0afb531e955b314c0ec0 100644
--- a/Source/core/frame/DOMWindowProperty.h
+++ b/Source/core/frame/DOMWindowProperty.h
@@ -30,10 +30,10 @@
namespace blink {
-class LocalDOMWindow;
class LocalFrame;
class DOMWindowProperty : public WillBeGarbageCollectedMixin {
+ DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowProperty);
public:
explicit DOMWindowProperty(LocalFrame*);
@@ -42,15 +42,10 @@ public:
LocalFrame* frame() const { return m_frame; }
- virtual void trace(Visitor*);
+ virtual void trace(Visitor*) { }
protected:
-#if !ENABLE(OILPAN)
- virtual ~DOMWindowProperty();
-#endif
-
LocalFrame* m_frame;
- RawPtrWillBeMember<LocalDOMWindow> m_associatedDOMWindow;
};
}
« no previous file with comments | « no previous file | Source/core/frame/DOMWindowProperty.cpp » ('j') | Source/core/frame/LocalDOMWindow.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698