Changeset 135788 in webkit

Timestamp:

Nov 26, 2012, 4:41:39 PM (13 years ago)

Author:

akling@apple.com

Message:

RenderStyle: Move 'list-style-image' to rare inherited data.
<​http://webkit.org/b/103300>

Reviewed by Antti Koivisto.

list-style-image is not nearly common enough to merit a spot in StyleInheritedData.
Move it to StyleRareInheritedData.

134kB progression on Membuster3.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):
(WebCore::RenderStyle::listStyleImage):
(WebCore::RenderStyle::setListStyleImage):

• rendering/style/StyleInheritedData.cpp:

(WebCore::StyleInheritedData::StyleInheritedData):
(WebCore::StyleInheritedData::operator==):

• rendering/style/StyleInheritedData.h:

(StyleInheritedData):

• rendering/style/StyleRareInheritedData.h:
• rendering/style/StyleRareInheritedData.cpp:

(SameSizeAsStyleRareInheritedData):
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/RenderStyle.cpp (modified) (3 diffs)
• rendering/style/StyleInheritedData.cpp (modified) (4 diffs)
• rendering/style/StyleInheritedData.h (modified) (2 diffs)
• rendering/style/StyleRareInheritedData.cpp (modified) (5 diffs)
• rendering/style/StyleRareInheritedData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-26  Andreas Kling  <akling@apple.com>
+
+        RenderStyle: Move 'list-style-image' to rare inherited data.
+        <http://webkit.org/b/103300>
+
+        Reviewed by Antti Koivisto.
+
+        list-style-image is not nearly common enough to merit a spot in StyleInheritedData.
+        Move it to StyleRareInheritedData.
+
+        134kB progression on Membuster3.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        (WebCore::RenderStyle::listStyleImage):
+        (WebCore::RenderStyle::setListStyleImage):
+        * rendering/style/StyleInheritedData.cpp:
+        (WebCore::StyleInheritedData::StyleInheritedData):
+        (WebCore::StyleInheritedData::operator==):
+        * rendering/style/StyleInheritedData.h:
+        (StyleInheritedData):
+        * rendering/style/StyleRareInheritedData.h:
+        * rendering/style/StyleRareInheritedData.cpp:
+        (SameSizeAsStyleRareInheritedData):
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+        (WebCore::StyleRareInheritedData::operator==):
+
 2012-11-26  James Simonsen  <simonjam@chromium.org>
 

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

@@ -492 +492 @@
 #endif
             || rareInheritedData->m_lineSnap != other->rareInheritedData->m_lineSnap
-            || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lineAlign)
+            || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lineAlign
+            || rareInheritedData->listStyleImage != other->rareInheritedData->listStyleImage)
             return StyleDifferenceLayout;
 
@@ -508 +509 @@
 
     if (inherited->line_height != other->inherited->line_height
-        || inherited->list_style_image != other->inherited->list_style_image
         || inherited->font != other->inherited->font
         || inherited->horizontal_border_spacing != other->inherited->horizontal_border_spacing
@@ -967 +967 @@
 }
 
-StyleImage* RenderStyle::listStyleImage() const { return inherited->list_style_image.get(); }
+StyleImage* RenderStyle::listStyleImage() const { return rareInheritedData->listStyleImage.get(); }
 void RenderStyle::setListStyleImage(PassRefPtr<StyleImage> v)
 {
-    if (inherited->list_style_image != v)
-        inherited.access()->list_style_image = v;
+    if (rareInheritedData->listStyleImage != v)
+        rareInheritedData.access()->listStyleImage = v;
 }
 

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

@@ -24 +24 @@
 
 #include "RenderStyle.h"
-#include "StyleImage.h"
 
 namespace WebCore {
@@ -32 +31 @@
     , vertical_border_spacing(RenderStyle::initialVerticalBorderSpacing())
     , line_height(RenderStyle::initialLineHeight())
-    , list_style_image(RenderStyle::initialListStyleImage())
     , color(RenderStyle::initialColor())
     , visitedLinkColor(RenderStyle::initialColor())
@@ -47 +45 @@
     , vertical_border_spacing(o.vertical_border_spacing)
     , line_height(o.line_height)
-    , list_style_image(o.list_style_image)
     , font(o.font)
     , color(o.color)
@@ -57 +54 @@
 {
     return line_height == o.line_height
-        && StyleImage::imagesEquivalent(list_style_image.get(), o.list_style_image.get())
         && font == o.font
         && color == o.color

trunk/Source/WebCore/rendering/style/StyleInheritedData.h

@@ -35 +35 @@
 namespace WebCore {
 
-class StyleImage;
-
 class StyleInheritedData : public RefCounted<StyleInheritedData> {
 public:
@@ -56 +54 @@
     Length line_height;
 
-    RefPtr<StyleImage> list_style_image;
-
     Font font;
     Color color;

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

@@ -28 +28 @@
 #include "RenderStyleConstants.h"
 #include "ShadowData.h"
+#include "StyleImage.h"
 #include "WebCoreMemoryInstrumentation.h"
 #include <wtf/MemoryObjectInfo.h>
@@ -34 +35 @@
 
 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareInheritedData> {
+    void* styleImage;
     Color firstColor;
     float firstFloat;
@@ -63 +65 @@
 
 StyleRareInheritedData::StyleRareInheritedData()
-    : textStrokeWidth(RenderStyle::initialTextStrokeWidth())
+    : listStyleImage(RenderStyle::initialListStyleImage())
+    , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
     , indent(RenderStyle::initialTextIndent())
     , m_effectiveZoom(RenderStyle::initialZoom())
@@ -119 +122 @@
 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     : RefCounted<StyleRareInheritedData>()
+    , listStyleImage(o.listStyleImage)
     , textStrokeColor(o.textStrokeColor)
     , textStrokeWidth(o.textStrokeWidth)
@@ -261 +265 @@
         && m_variables == o.m_variables
 #endif
-        && m_lineAlign == o.m_lineAlign;
+        && m_lineAlign == o.m_lineAlign
+        && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.get());
 }
 

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

@@ -42 +42 @@
 class QuotesData;
 class ShadowData;
+class StyleImage;
 
 // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific properties.
@@ -60 +61 @@
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
+
+    RefPtr<StyleImage> listStyleImage;
 
     Color textStrokeColor;