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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ASSERT on ownerElement->widget() == this causes many tests to fail. Created 7 years 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/Frame.cpp ('k') | Source/core/html/HTMLAppletElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index e379a3674eaba1695d2bce225ccb10061a7e657b..c4d95b25ddddc9e024fc34a9bb27a0c8039ff107 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -241,9 +241,9 @@ FrameView::~FrameView()
ASSERT(m_frame);
ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
- RenderPart* renderer = m_frame->ownerRenderer();
- if (renderer && renderer->widget() == this)
- renderer->setWidget(0);
+ HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement();
+ if (ownerElement && ownerElement->widget() == this)
eseidel 2014/01/07 22:54:28 I would just ASSERT(ownerElement->widghet() == thi
wjmaclean 2014/01/08 14:36:21 Maybe I'm misunderstanding, but ownerElement has b
+ ownerElement->setWidget(0);
}
void FrameView::reset()
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/html/HTMLAppletElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698