Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Reviewed by Eric. 
        https://bugs.webkit.org/show_bug.cgi?id=15431
        SVGRenderStyle should store pre-modified resource URIs

        Store pre-modified resource URIs to decrease string
        operations during layout/rendering.



Canonical link: https://commits.webkit.org/27513@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@35072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Rob Buis committed Jul 9, 2008
1 parent a28fe14 commit f3ce72d
Show file tree
Hide file tree
Showing 66 changed files with 369 additions and 275 deletions.
66 changes: 66 additions & 0 deletions LayoutTests/ChangeLog
View file
@@ -1,3 +1,69 @@
2008-07-09 Rob Buis <buis@kde.org>

Reviewed by Eric.

Changed tests for:
https://bugs.webkit.org/show_bug.cgi?id=15431
SVGRenderStyle should store pre-modified resource URIs

* platform/mac/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-displace-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-example-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-felem-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-image-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-offset-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-tile-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/masking-path-02-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/masking-path-05-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/painting-marker-03-f-expected.txt:
* platform/mac/svg/batik/filters/filterRegions-expected.txt:
* platform/mac/svg/batik/paints/patternPreserveAspectRatioA-expected.txt:
* platform/mac/svg/batik/text/textEffect2-expected.txt:
* platform/mac/svg/batik/text/textProperties-expected.txt:
* platform/mac/svg/custom/circular-marker-reference-1-expected.txt:
* platform/mac/svg/custom/circular-marker-reference-2-expected.txt:
* platform/mac/svg/custom/circular-marker-reference-3-expected.txt:
* platform/mac/svg/custom/circular-marker-reference-4-expected.txt:
* platform/mac/svg/custom/clip-path-child-changes-expected.txt:
* platform/mac/svg/custom/clip-path-display-none-child-expected.txt:
* platform/mac/svg/custom/clip-path-href-changes-expected.txt:
* platform/mac/svg/custom/clip-path-referencing-use-expected.txt:
* platform/mac/svg/custom/clip-path-referencing-use2-expected.txt:
* platform/mac/svg/custom/clip-path-units-changes-expected.txt:
* platform/mac/svg/custom/clip-path-with-transform-expected.txt:
* platform/mac/svg/custom/empty-clip-path-expected.txt:
* platform/mac/svg/custom/empty-merge-expected.txt:
* platform/mac/svg/custom/feComponentTransfer-Discrete-expected.txt:
* platform/mac/svg/custom/feComponentTransfer-Gamma-expected.txt:
* platform/mac/svg/custom/feComponentTransfer-Linear-expected.txt:
* platform/mac/svg/custom/feComponentTransfer-Table-expected.txt:
* platform/mac/svg/custom/feDisplacementMap-01-expected.txt:
* platform/mac/svg/custom/filter-source-alpha-expected.txt:
* platform/mac/svg/custom/js-late-marker-and-object-creation-expected.txt:
* platform/mac/svg/custom/js-late-marker-creation-expected.txt:
* platform/mac/svg/custom/marker-changes-expected.txt:
* platform/mac/svg/custom/marker-child-changes-expected.txt:
* platform/mac/svg/custom/marker-default-width-height-expected.txt:
* platform/mac/svg/custom/marker-overflow-clip-expected.txt:
* platform/mac/svg/custom/marker-viewBox-changes-expected.txt:
* platform/mac/svg/custom/non-circular-marker-reference-expected.txt:
* platform/mac/svg/custom/non-opaque-filters-expected.txt:
* platform/mac/svg/custom/recursive-clippath-expected.txt:
* platform/mac/svg/custom/shapes-supporting-markers-expected.txt:
* platform/mac/svg/custom/visibility-override-clip-expected.txt:
* platform/mac/svg/custom/visibility-override-filter-expected.txt:

2008-07-08 Simon Fraser <simon.fraser@apple.com>

Reviewed by Darin.
Expand Down
12 changes: 6 additions & 6 deletions LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt
View file
Expand Up @@ -5,14 +5,14 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (15,15) size 435x294
RenderImage {image} at (0,0) size 100x98
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderPath {rect} at (90,30) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendNormal] [data="M30.00,10.00 L150.00,10.00 L150.00,20.00 L30.00,20.00"]
RenderPath {rect} at (90,69) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendMultiply] [data="M30.00,23.00 L150.00,23.00 L150.00,33.00 L30.00,33.00"]
RenderSVGContainer {g} at (90,108) size 360x69 [filter=#BlendMultiply]
RenderPath {rect} at (90,30) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=BlendNormal] [data="M30.00,10.00 L150.00,10.00 L150.00,20.00 L30.00,20.00"]
RenderPath {rect} at (90,69) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=BlendMultiply] [data="M30.00,23.00 L150.00,23.00 L150.00,33.00 L30.00,33.00"]
RenderSVGContainer {g} at (90,108) size 360x69 [filter=BlendMultiply]
RenderPath {rect} at (90,108) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [data="M30.00,36.00 L150.00,36.00 L150.00,46.00 L30.00,46.00"]
RenderPath {rect} at (90,147) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#FFFF00]}] [data="M30.00,49.00 L150.00,49.00 L150.00,59.00 L30.00,59.00"]
RenderPath {rect} at (90,186) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendScreen] [data="M30.00,62.00 L150.00,62.00 L150.00,72.00 L30.00,72.00"]
RenderPath {rect} at (90,225) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendDarken] [data="M30.00,75.00 L150.00,75.00 L150.00,85.00 L30.00,85.00"]
RenderPath {rect} at (90,264) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=#BlendLighten] [data="M30.00,88.00 L150.00,88.00 L150.00,98.00 L30.00,98.00"]
RenderPath {rect} at (90,186) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=BlendScreen] [data="M30.00,62.00 L150.00,62.00 L150.00,72.00 L30.00,72.00"]
RenderPath {rect} at (90,225) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=BlendDarken] [data="M30.00,75.00 L150.00,75.00 L150.00,85.00 L30.00,85.00"]
RenderPath {rect} at (90,264) size 360x30 [opacity=0.50] [fill={[type=SOLID] [color=#0000FF]}] [filter=BlendLighten] [data="M30.00,88.00 L150.00,88.00 L150.00,98.00 L30.00,98.00"]
RenderSVGContainer {g} at (15,33) size 78x258
RenderSVGText {text} at (5,17) size 21x8 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-6) size 21x8
Expand Down
8 changes: 4 additions & 4 deletions LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-color-01-b-expected.txt
View file
Expand Up @@ -17,19 +17,19 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (20,95) size 196x48 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-40) size 196x48
chunk 1 text run 1 at (20.00,95.00) startOffset 0 endOffset 10 width 196.00: "Unfiltered"
RenderPath {rect} at (19.60,74.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Matrix] [data="M20.00,120.00 L780.00,120.00 L780.00,160.00 L20.00,160.00"]
RenderPath {rect} at (19.60,74.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=Matrix] [data="M20.00,120.00 L780.00,120.00 L780.00,160.00 L20.00,160.00"]
RenderSVGText {text} at (20,195) size 675x48 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-40) size 675x48
chunk 1 text run 1 at (20.00,195.00) startOffset 0 endOffset 32 width 675.00: "type=\"matrix\" (grayscale matrix)"
RenderPath {rect} at (19.60,132.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#Saturate40] [data="M20.00,220.00 L780.00,220.00 L780.00,260.00 L20.00,260.00"]
RenderPath {rect} at (19.60,132.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=Saturate40] [data="M20.00,220.00 L780.00,220.00 L780.00,260.00 L20.00,260.00"]
RenderSVGText {text} at (20,295) size 577x48 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-40) size 577x48
chunk 1 text run 1 at (20.00,295.00) startOffset 0 endOffset 27 width 577.00: "type=\"saturate\" values=\".4\""
RenderPath {rect} at (19.60,190.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#HueRotate90] [data="M20.00,320.00 L780.00,320.00 L780.00,360.00 L20.00,360.00"]
RenderPath {rect} at (19.60,190.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=HueRotate90] [data="M20.00,320.00 L780.00,320.00 L780.00,360.00 L20.00,360.00"]
RenderSVGText {text} at (20,395) size 626x48 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-40) size 626x48
chunk 1 text run 1 at (20.00,395.00) startOffset 0 endOffset 28 width 626.00: "type=\"hueRotate\" values=\"90\""
RenderPath {rect} at (19.60,248.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=#LuminanceToAlpha] [data="M20.00,420.00 L780.00,420.00 L780.00,460.00 L20.00,460.00"]
RenderPath {rect} at (19.60,248.60) size 440.80x23.20 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#DD00DD), (0.33,#22CC22), (0.67,#400000), (1.00,#A0A0FF)]] [bounding box mode=0] [start=(20,0)] [end=(760,0)]}] [filter=LuminanceToAlpha] [data="M20.00,420.00 L780.00,420.00 L780.00,460.00 L20.00,460.00"]
RenderSVGText {text} at (20,495) size 524x48 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-40) size 524x48
chunk 1 text run 1 at (20.00,495.00) startOffset 0 endOffset 23 width 524.00: "type=\"luminanceToAlpha\""
Expand Down
24 changes: 12 additions & 12 deletions LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-composite-02-b-expected.txt
View file
Expand Up @@ -17,50 +17,50 @@ layer at (0,0) size 480x360
RenderSVGInlineText {#text} at (0,-60) size 792x73
chunk 1 text run 1 at (100.00,180.00) startOffset 0 endOffset 25 width 792.00: "on second row opacity 0.5"
RenderSVGContainer {g} at (26,102) size 60x165.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,230.00)}]
RenderPath {rect} at (26,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (26,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=over] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,400) size 134x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 134x73
chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 4 width 134.00: "over"
RenderSVGContainer {g} at (26,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,430.00)}]
RenderPath {rect} at (26,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#over50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (26,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=over50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGContainer {g} at (98,102) size 60x165.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,230.00)}]
RenderPath {rect} at (98,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (98,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=in] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,400) size 54x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 54x73
chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 2 width 54.00: "in"
RenderSVGContainer {g} at (98,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(195.00,430.00)}]
RenderPath {rect} at (98,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#in50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (98,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=in50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGContainer {g} at (170,102) size 60x165.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,230.00)}]
RenderPath {rect} at (170,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (170,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=out] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,400) size 98x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 98x73
chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 3 width 98.00: "out"
RenderSVGContainer {g} at (170,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(375.00,430.00)}]
RenderPath {rect} at (170,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#out50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (170,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=out50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGContainer {g} at (242,102) size 60x165.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,230.00)}]
RenderPath {rect} at (242,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (242,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=atop] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,400) size 133x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 133x73
chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 4 width 133.00: "atop"
RenderSVGContainer {g} at (242,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(555.00,430.00)}]
RenderPath {rect} at (242,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#atop50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (242,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=atop50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGContainer {g} at (314,102) size 60x165.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,230.00)}]
RenderPath {rect} at (314,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (314,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=xor] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,400) size 98x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 98x73
chunk 1 text run 1 at (10.00,400.00) startOffset 0 endOffset 3 width 98.00: "xor"
RenderSVGContainer {g} at (314,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(735.00,430.00)}]
RenderPath {rect} at (314,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#xor50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (314,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=xor50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGContainer {g} at (376,102) size 70x193.20 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,230.00)}]
RenderPath {rect} at (386,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (386,102) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=arithmetic] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (-25,400) size 167x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 167x73
chunk 1 text run 1 at (-25.00,400.00) startOffset 0 endOffset 6 width 167.00: "arith-"
RenderSVGText {text} at (-25,470) size 165x73 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-60) size 165x73
chunk 1 text run 1 at (-25.00,470.00) startOffset 0 endOffset 5 width 165.00: "metic"
RenderSVGContainer {g} at (386,182) size 60x60 [transform={m=((1.00,0.00)(0.00,1.00)) t=(915.00,430.00)}]
RenderPath {rect} at (386,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=#arithmetic50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderPath {rect} at (386,182) size 60x60 [fill={[type=SOLID] [color=#000000]}] [filter=arithmetic50] [data="M0.00,0.00 L150.00,0.00 L150.00,150.00 L0.00,150.00"]
RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-36) size 264x46
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
Expand Down

0 comments on commit f3ce72d

Please sign in to comment.