Changeset 161208 in webkit

Timestamp:

Jan 2, 2014, 7:51:59 AM (11 years ago)

Author:

Antti Koivisto

Message:

Always resolve style from root
​https://bugs.webkit.org/show_bug.cgi?id=126380

Reviewed by Andreas Kling.

Forced style resolve that does not start from the root is never really correct.
Remove the few remaining instances.

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::setResetStyleInheritance):

Update style asynchronously.

• dom/ShadowRoot.h:
• dom/Text.h:
• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::createElementRenderer):
(WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache):
(WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache):

Delete the render tree synchronously on suspend and rebuild it asynchronously on resume.
No need for m_customStyleForPageCache hack.

• html/HTMLPlugInImageElement.h:

Remove m_customStyleForPageCache.

• style/StyleResolveTree.cpp:
• style/StyleResolveTree.h:

Remove Element version of resolveTree from the interface.

• svg/SVGUseElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (1 diff)
• dom/ShadowRoot.h (modified) (1 diff)
• dom/Text.h (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (3 diffs)
• html/HTMLPlugInImageElement.h (modified) (2 diffs)
• style/StyleResolveTree.cpp (modified) (1 diff)
• style/StyleResolveTree.h (modified) (1 diff)
• svg/SVGUseElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-02  Antti Koivisto  <antti@apple.com>
+
+        Always resolve style from root
+        https://bugs.webkit.org/show_bug.cgi?id=126380
+
+        Reviewed by Andreas Kling.
+        
+        Forced style resolve that does not start from the root is never really correct. 
+        Remove the few remaining instances.
+
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::setResetStyleInheritance):
+        
+            Update style asynchronously.
+
+        * dom/ShadowRoot.h:
+        * dom/Text.h:
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::createElementRenderer):
+        (WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache):
+        (WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache):
+        
+            Delete the render tree synchronously on suspend and rebuild it asynchronously on resume.
+            No need for m_customStyleForPageCache hack.
+
+        * html/HTMLPlugInImageElement.h:
+        
+            Remove m_customStyleForPageCache.
+
+        * style/StyleResolveTree.cpp:
+        * style/StyleResolveTree.h:
+        
+            Remove Element version of resolveTree from the interface.
+
+        * svg/SVGUseElement.h:
+
 2014-01-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -141 +141 @@
     if (value != m_resetStyleInheritance) {
         m_resetStyleInheritance = value;
-        if (renderer() && hostElement())
-            Style::resolveTree(*hostElement(), Style::Force);
+        if (hostElement())
+            setNeedsStyleRecalc();
     }
 }

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -34 +34 @@
 #include "Element.h"
 #include "ExceptionCode.h"
-#include "StyleResolveTree.h"
 #include "TreeScope.h"
 

trunk/Source/WebCore/dom/Text.h

@@ -26 +26 @@
 #include "CharacterData.h"
 #include "RenderPtr.h"
-#include "StyleResolveTree.h"
 
 namespace WebCore {

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -199 +199 @@
 RenderPtr<RenderElement> HTMLPlugInImageElement::createElementRenderer(PassRef<RenderStyle> style)
 {
+    ASSERT(!document().inPageCache());
+
     if (displayState() >= PreparingPluginReplacement)
         return HTMLPlugInElement::createElementRenderer(std::move(style));
@@ -310 +312 @@
 void HTMLPlugInImageElement::documentWillSuspendForPageCache()
 {
-    if (RenderStyle* renderStyle = this->renderStyle()) {
-        m_customStyleForPageCache = RenderStyle::clone(renderStyle);
-        m_customStyleForPageCache->setDisplay(NONE);
-        Style::resolveTree(*this, Style::Force);
-    }
+    if (renderer())
+        Style::detachRenderTree(*this);
 
     HTMLPlugInElement::documentWillSuspendForPageCache();
@@ -321 +320 @@
 void HTMLPlugInImageElement::documentDidResumeFromPageCache()
 {
-    if (m_customStyleForPageCache) {
-        m_customStyleForPageCache = 0;
-        Style::resolveTree(*this, Style::Force);
-    }
+    setNeedsStyleRecalc(ReconstructRenderTree);
 
     HTMLPlugInElement::documentDidResumeFromPageCache();
-}
-
-PassRefPtr<RenderStyle> HTMLPlugInImageElement::customStyleForRenderer()
-{
-    if (!m_customStyleForPageCache)
-        return document().ensureStyleResolver().styleForElement(this);
-    return m_customStyleForPageCache;
 }
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -128 +128 @@
     virtual void documentDidResumeFromPageCache() OVERRIDE;
 
-    virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
-
     virtual bool isRestartedPlugin() const OVERRIDE { return m_isRestartedPlugin; }
     virtual bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) OVERRIDE;
@@ -159 +157 @@
     bool m_shouldPreferPlugInsForImages;
     bool m_needsDocumentActivationCallbacks;
-    RefPtr<RenderStyle> m_customStyleForPageCache;
     RefPtr<MouseEvent> m_pendingClickEventFromSnapshot;
     DeferrableOneShotTimer<HTMLPlugInImageElement> m_simulatedMouseClickTimer;

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -65 +65 @@
 static void attachTextRenderer(Text&);
 static void detachRenderTree(Element&, DetachType);
+static void resolveTree(Element&, Change);
 
 Change determineChange(const RenderStyle* s1, const RenderStyle* s2, Settings* settings)

trunk/Source/WebCore/style/StyleResolveTree.h

@@ -39 +39 @@
 enum Change { NoChange, NoInherit, Inherit, Detach, Force };
 
-void resolveTree(Element&, Change);
 void resolveTree(Document&, Change);
 
 void detachRenderTree(Element&);
+void detachTextRenderer(Text&);
 
-void detachTextRenderer(Text&);
 void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
 

trunk/Source/WebCore/svg/SVGUseElement.h

@@ -31 +31 @@
 #include "SVGNames.h"
 #include "SVGURIReference.h"
-#include "StyleResolveTree.h"
 
 namespace WebCore {