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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

Issue 1517993004: Oilpan: simplify plugin container finalization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simplify away disconnectContentFrame override Created 5 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
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
index 7692c9c0c9a7fba0788e01aff8adb4d620af7099..4272b022eeaf99a34a47d990d7b3bd024dad346a 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -181,16 +181,6 @@ void HTMLFrameOwnerElement::disconnectContentFrame()
if (RefPtrWillBeRawPtr<Frame> frame = contentFrame()) {
frame->detach(FrameDetachType::Remove);
}
-#if ENABLE(OILPAN)
- // Oilpan: a plugin container must be explicitly disposed before it
- // is swept and finalized. This is because the underlying plugin needs
- // to be able to access a fully-functioning frame (and all it refers
- // to) while it destructs and cleans out its resources.
- if (m_widget) {
- m_widget->dispose();
- m_widget = nullptr;
- }
-#endif
}
HTMLFrameOwnerElement::~HTMLFrameOwnerElement()
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698