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

Unified Diff: Source/core/html/HTMLFrameOwnerElement.h

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add ~Scrollbar assert 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/html/HTMLFrameOwnerElement.h
diff --git a/Source/core/html/HTMLFrameOwnerElement.h b/Source/core/html/HTMLFrameOwnerElement.h
index 94ed55576faa3e7f6ed3b260782a8ee81f73bc15..5aa2af37ecd483fde63579178614451676484f7b 100644
--- a/Source/core/html/HTMLFrameOwnerElement.h
+++ b/Source/core/html/HTMLFrameOwnerElement.h
@@ -48,7 +48,7 @@ public:
void setContentFrame(Frame&);
void clearContentFrame();
- void disconnectContentFrame();
+ virtual void disconnectContentFrame();
// Most subclasses use RenderPart (either RenderEmbeddedObject or RenderIFrame)
// except for HTMLObjectElement and HTMLEmbedElement which may return any
@@ -65,7 +65,7 @@ public:
virtual void renderFallbackContent() { }
virtual bool isObjectElement() const { return false; }
- void setWidget(PassRefPtr<Widget>);
+ void setWidget(PassRefPtrWillBeRawPtr<Widget>);
Widget* ownedWidget() const;
class UpdateSuspendScope {
@@ -79,6 +79,10 @@ public:
virtual void trace(Visitor*) OVERRIDE;
+#if ENABLE(OILPAN)
+ static void disposeWidget(Widget*);
+#endif
+
protected:
HTMLFrameOwnerElement(const QualifiedName& tagName, Document&);
void setSandboxFlags(SandboxFlags);
@@ -95,7 +99,7 @@ private:
virtual void dispatchLoad() OVERRIDE;
RawPtrWillBeMember<Frame> m_contentFrame;
- RefPtr<Widget> m_widget;
+ RefPtrWillBeMember<Widget> m_widget;
SandboxFlags m_sandboxFlags;
};

Powered by Google App Engine
This is Rietveld 408576698