Changeset 56644 in webkit

Timestamp:

Mar 26, 2010 3:12:47 PM (14 years ago)

Author:

Beth Dakin

Message:

WebCore: Partial fix for ​https://bugs.webkit.org/show_bug.cgi?id=36564
Performance regression for setting content of <text> in SVG
-and corresponding-
<rdar://problem/7693963>

Reviewed by Darin Adler.

toClipPath() is extremely inefficient, so this patch removes the
call to it from RenderSVGResourceClipper::resourceBoundingBox()
which is very hot code in SVG with clip-paths. It is sufficient to
call unite with the objectBoundingBox(), which will return early if
objectBoundingBox() is empty.

• rendering/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::resourceBoundingBox):

LayoutTests: Updated test for ​https://bugs.webkit.org/show_bug.cgi?id=36564
Performance regression for setting content of <text> in SVG
-and corresponding-
<rdar://problem/7693963>

Reviewed by Darin Adler.

• platform/mac/svg/custom/clip-path-referencing-use2-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/clip-path-referencing-use2-expected.txt (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderSVGResourceClipper.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-26  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Updated test for https://bugs.webkit.org/show_bug.cgi?id=36564 
+        Performance regression for setting content of <text> in SVG
+        -and corresponding-
+        <rdar://problem/7693963>
+
+        * platform/mac/svg/custom/clip-path-referencing-use2-expected.txt:
+
 2010-03-26  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/LayoutTests/platform/mac/svg/custom/clip-path-referencing-use2-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
-CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
 CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
 layer at (0,0) size 800x600
@@ -35 +15 @@
               RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
     RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
-    RenderSVGContainer {g} at (0,0) size 100x100
-      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 0x0
+    RenderSVGContainer {g} at (0,0) size 50x50
+      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 50x50
       RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
     RenderSVGText {text} at (10,120) size 377x18 contains 1 chunk(s)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-26 Beth Dakin <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Partial fix for https://bugs.webkit.org/show_bug.cgi?id=36564 
+        Performance regression for setting content of <text> in SVG
+        -and corresponding-
+        <rdar://problem/7693963>
+
+        toClipPath() is extremely inefficient, so this patch removes the 
+        call to it from RenderSVGResourceClipper::resourceBoundingBox() 
+        which is very hot code in SVG with clip-paths. It is sufficient to 
+        call unite with the objectBoundingBox(), which will return early if 
+        objectBoundingBox() is empty.
+
+        * rendering/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::resourceBoundingBox):
+
 2010-03-26  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebCore/rendering/RenderSVGResourceClipper.cpp

@@ -130 +130 @@
         SVGStyledTransformableElement* styled = static_cast<SVGStyledTransformableElement*>(childNode);
         RenderStyle* style = styled->renderer() ? styled->renderer()->style() : 0;
-        if (!style || style->display() == NONE || styled->toClipPath().isEmpty())
+        if (!style || style->display() == NONE)
             continue;
         clipRect.unite(styled->renderer()->objectBoundingBox());