Re-attach plugin renderers in the standard way.

Source/core/html/HTMLPlugInElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 52 matching lines @@
     , m_NPObject(0)
     , m_isCapturingMouseEvents(false)
     // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
     // widget updates until after all children are parsed. For HTMLEmbedElement
     // this delay is unnecessary, but it is simpler to make both classes share
     // the same codepath in this class.
     , m_needsWidgetUpdate(!createdByParser)
     , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
     , m_usePlaceholderContent(false)
 {
-    setHasCustomStyleCallbacks();
 }
 
 HTMLPlugInElement::~HTMLPlugInElement()
 {
     ASSERT(!m_pluginWrapper); // cleared in detach()
     ASSERT(!m_isDelayingLoadEvent);
 
     if (m_NPObject) {
         _NPN_ReleaseObject(m_NPObject);
         m_NPObject = 0;
@@ skipping 154 matching lines @@
         image->setImageResource(RenderImageResource::create());
         return image;
     }
 
     if (usePlaceholderContent())
         return new RenderBlockFlow(this);
 
     return new RenderEmbeddedObject(this);
 }
 
-void HTMLPlugInElement::willRecalcStyle(StyleRecalcChange)
-{
-    // FIXME: Why is this necessary? Manual re-attach is almost always wrong.
-    if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType())
-        reattach();
-}
-
 void HTMLPlugInElement::finishParsingChildren()
 {
     HTMLFrameOwnerElement::finishParsingChildren();
     if (useFallbackContent())
         return;
 
     setNeedsWidgetUpdate(true);
     if (inDocument())
-        setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Plugin));
+        lazyReattachIfNeeded();
 }
 
 void HTMLPlugInElement::resetInstance()
 {
     m_pluginWrapper.clear();
 }
 
 SharedPersistent<v8::Object>* HTMLPlugInElement::pluginWrapper()
 {
     LocalFrame* frame = document().frame();
@@ skipping 317 matching lines @@
 }
 
 void HTMLPlugInElement::setUsePlaceholderContent(bool use)
 {
     if (use != m_usePlaceholderContent) {
         m_usePlaceholderContent = use;
         lazyReattachIfAttached();
     }
 }
 
+void HTMLPlugInElement::lazyReattachIfNeeded()
+{
+    if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType())
+        lazyReattachIfAttached();
 }
+
+}