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

Unified Diff: Source/core/html/HTMLPlugInElement.cpp

Issue 132333018: Revert of Reland r165710 "Replace RenderFullScreen with top layer" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | « Source/core/html/HTMLPlugInElement.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLPlugInElement.cpp
diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp
index af98fe7cca34eb31ac548576c27345366cf6f35b..0b2df23c31693eb216d32f4f308cd4248aba55c8 100644
--- a/Source/core/html/HTMLPlugInElement.cpp
+++ b/Source/core/html/HTMLPlugInElement.cpp
@@ -68,7 +68,6 @@
, m_needsWidgetUpdate(!createdByParser)
, m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
, m_displayState(Playing)
- , m_protectWidgetDuringReattach(0)
{
setHasCustomStyleCallbacks();
}
@@ -117,19 +116,8 @@
{
HTMLFrameOwnerElement::attach(context);
- if (m_protectWidgetDuringReattach) {
- RenderEmbeddedObject* object = renderEmbeddedObject();
- if (object && !needsWidgetUpdate()) {
- object->setWidget(m_protectWidgetDuringReattach.get());
- m_protectWidgetDuringReattach.clear();
- return;
- }
- m_protectWidgetDuringReattach.clear();
- }
-
if (!renderer() || useFallbackContent())
return;
-
if (isImageType()) {
if (!m_imageLoader)
m_imageLoader = adoptPtr(new HTMLImageLoader(this));
@@ -158,11 +146,8 @@
{
// Update the widget the next time we attach (detaching destroys the plugin).
// FIXME: None of this "needsWidgetUpdate" related code looks right.
- if (context.performingReattach && renderEmbeddedObject() && !needsWidgetUpdate() && existingRenderWidget())
- m_protectWidgetDuringReattach = existingRenderWidget()->widget();
- else if (renderer() && !useFallbackContent())
+ if (renderer() && !useFallbackContent())
setNeedsWidgetUpdate(true);
-
if (m_isDelayingLoadEvent) {
m_isDelayingLoadEvent = false;
document().decrementLoadEventDelayCount();
« no previous file with comments | « Source/core/html/HTMLPlugInElement.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698