Changeset 159989 in webkit

Timestamp:

Dec 2, 2013 7:19:08 PM (10 years ago)

Author:

akling@apple.com

Message:

Avoid setting style twice for generated image content.
<​https://webkit.org/b/125128>

Take care of a FIXME I added in r158097 and avoid redundant work in
ImageContentData::createRenderer().

I changed the inheritance helper RenderImage::setPseudoStyle() into
a new createStyleInheritingFromPseudoStyle() function instead so it
can be used from both PseudoElement and ImageContentData.

Reviewed by Antti Koivisto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/PseudoElement.cpp (modified) (1 diff)
• rendering/RenderImage.cpp (modified) (2 diffs)
• rendering/RenderImage.h (modified) (1 diff)
• rendering/style/ContentData.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-02  Andreas Kling  <akling@apple.com>
+
+        Avoid setting style twice for generated image content.
+        <https://webkit.org/b/125128>
+
+        Take care of a FIXME I added in r158097 and avoid redundant work in
+        ImageContentData::createRenderer().
+
+        I changed the inheritance helper RenderImage::setPseudoStyle() into
+        a new createStyleInheritingFromPseudoStyle() function instead so it
+        can be used from both PseudoElement and ImageContentData.
+
+        Reviewed by Antti Koivisto.
+
 2013-12-02  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/dom/PseudoElement.cpp

@@ -115 +115 @@
         if (!child->isImage())
             continue;
-        toRenderImage(child)->setPseudoStyle(&renderer->style());
+        toRenderImage(*child).setStyle(RenderImage::createStyleInheritingFromPseudoStyle(renderer->style()));
     }
 }

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -75 +75 @@
 }
 
-
-void RenderImage::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle)
-{
-    ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER);
+PassRef<RenderStyle> RenderImage::createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle)
+{
+    ASSERT(pseudoStyle.styleType() == BEFORE || pseudoStyle.styleType() == AFTER);
 
     // Images are special and must inherit the pseudoStyle so the width and height of
@@ -84 +83 @@
     // can just share the style.
     auto style = RenderStyle::create();
-    style.get().inheritFrom(pseudoStyle.get());
-    setStyle(std::move(style));
+    style.get().inheritFrom(&pseudoStyle);
+    return style;
 }
 

trunk/Source/WebCore/rendering/RenderImage.h

@@ -40 +40 @@
     virtual ~RenderImage();
 
-    // Set the style of the object if it's generated content.
-    void setPseudoStyle(PassRefPtr<RenderStyle>);
+    // Create a RenderStyle for generated content by inheriting from a pseudo style.
+    static PassRef<RenderStyle> createStyleInheritingFromPseudoStyle(const RenderStyle&);
 
     void setImageResource(PassOwnPtr<RenderImageResource>);

trunk/Source/WebCore/rendering/style/ContentData.cpp

@@ -50 +50 @@
 RenderObject* ImageContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
 {
-    // FIXME: We should find a way to avoid setting the style twice here.
-    RenderImage* image = new RenderImage(document, pseudoStyle);
-    image->setPseudoStyle(&pseudoStyle);
+    RenderImage* image = new RenderImage(document, RenderImage::createStyleInheritingFromPseudoStyle(pseudoStyle));
+    image->initializeStyle();
     image->setAltText(altText());
     if (m_image)