Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot

1 files changed, 4 insertions, 6 deletions

diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
index 4471c63d5..4954e36d5 100644
--- a/Source/WebCore/html/HTMLPlugInImageElement.cpp
+++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp
@@ -32,6 +32,7 @@
 #include "RenderEmbeddedObject.h"
 #include "RenderImage.h"
 #include "SecurityOrigin.h"
+#include "StyleResolver.h"
 
 namespace WebCore {
 
@@ -45,7 +46,7 @@ HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Doc
     , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
     , m_needsDocumentActivationCallbacks(false)
 {
-    setHasCustomWillOrDidRecalcStyle();
+    setHasCustomCallbacks();
 }
 
 HTMLPlugInImageElement::~HTMLPlugInImageElement()
@@ -224,8 +225,6 @@ void HTMLPlugInImageElement::documentWillSuspendForPageCache()
     if (RenderStyle* renderStyle = this->renderStyle()) {
         m_customStyleForPageCache = RenderStyle::clone(renderStyle);
         m_customStyleForPageCache->setDisplay(NONE);
-        setHasCustomStyleForRenderer();
-
         recalcStyle(Force);
     }
 
@@ -236,8 +235,6 @@ void HTMLPlugInImageElement::documentDidResumeFromPageCache()
 {
     if (m_customStyleForPageCache) {
         m_customStyleForPageCache = 0;
-        clearHasCustomStyleForRenderer();
-
         recalcStyle(Force);
     }
     
@@ -246,7 +243,8 @@ void HTMLPlugInImageElement::documentDidResumeFromPageCache()
 
 PassRefPtr<RenderStyle> HTMLPlugInImageElement::customStyleForRenderer()
 {
-    ASSERT(m_customStyleForPageCache);
+    if (!m_customStyleForPageCache)
+        return document()->styleResolver()->styleForElement(this);
     return m_customStyleForPageCache;
 }