From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 3 Feb 2012 09:55:33 +0100
Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961
 (http://svn.webkit.org/repository/webkit/trunk@106560)

---
 Source/WebCore/html/HTMLPlugInImageElement.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'Source/WebCore/html/HTMLPlugInImageElement.cpp')

diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
index ce9bb7431..515022aad 100644
--- a/Source/WebCore/html/HTMLPlugInImageElement.cpp
+++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp
@@ -217,25 +217,23 @@ void HTMLPlugInImageElement::didMoveToNewDocument(Document* oldDocument)
 
 void HTMLPlugInImageElement::documentWillSuspendForPageCache()
 {
-    if (RenderStyle* rs = renderStyle()) {
-        m_customStyleForPageCache = RenderStyle::clone(rs);
+    if (RenderStyle* renderStyle = this->renderStyle()) {
+        m_customStyleForPageCache = RenderStyle::clone(renderStyle);
         m_customStyleForPageCache->setDisplay(NONE);
-    }
-
-    setHasCustomStyleForRenderer();
+        setHasCustomStyleForRenderer();
 
-    if (m_customStyleForPageCache)
         recalcStyle(Force);
-        
+    }
+
     HTMLPlugInElement::documentWillSuspendForPageCache();
 }
 
 void HTMLPlugInImageElement::documentDidResumeFromPageCache()
 {
-    clearHasCustomStyleForRenderer();
-
     if (m_customStyleForPageCache) {
         m_customStyleForPageCache = 0;
+        clearHasCustomStyleForRenderer();
+
         recalcStyle(Force);
     }
     
@@ -244,9 +242,7 @@ void HTMLPlugInImageElement::documentDidResumeFromPageCache()
 
 PassRefPtr<RenderStyle> HTMLPlugInImageElement::customStyleForRenderer()
 {
-    if (!m_customStyleForPageCache)
-        return renderStyle();
-
+    ASSERT(m_customStyleForPageCache);
     return m_customStyleForPageCache;
 }
 
-- 
cgit v1.2.1