diff options
30 files changed, 145 insertions, 90 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42725", + "webkit_revision": "42805", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@14459", + "/trunk/deps/third_party/WebKit@14483", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index b53f7f9..9af57c6 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42725
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42805
\ No newline at end of file diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 8c3d0f2..23e966a 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -4981,6 +4981,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerLibxml2.cpp" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerScope.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\XMLTokenizerScope.h" + > + </File> </Filter> <Filter Name="editing" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt index ae92df4..45e36a8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt @@ -10,4 +10,3 @@ layer at (8,21) size 784x37 layer at (8,21) size 202x202 RenderBlock (positioned) at (0,0) size 202x202 [border: (1px solid #FF0000)] RenderText at (0,0) size 0x0 -caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {BODY} of child 1 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt index ae6b99d..1188fb9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.txt @@ -38,7 +38,7 @@ layer at (0,0) size 480x360 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderPath {polygon} at (239,19) size 22x22 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M240.00,20.00 L240.00,40.00 L260.00,40.00 L260.00,20.00 Z"] RenderSVGHiddenContainer {defs} at (0,0) size 0x0 - RenderImage {image} at (0,0) size 40x80 + RenderSVGImage {image} at (0,0) size 40x80 RenderSVGContainer {use} at (44.26,12.13) size 29.49x53.74 RenderSVGContainer {g} at (44.26,12.13) size 29.49x53.74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,0.00)}] RenderPath {line} at (44.26,12.13) size 29.49x53.74 [stroke={[type=SOLID] [color=#105D8C] [stroke width=3.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M30.00,50.00 L10.00,10.00"] @@ -56,7 +56,7 @@ layer at (0,0) size 480x360 RenderPath {polygon} at (408.70,11.70) size 28.60x28.60 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M240.00,20.00 L240.00,40.00 L260.00,40.00 L260.00,20.00 Z"] RenderSVGContainer {use} at (319,1.63) size 52x26.00 [transform={m=((1.00,0.00)(0.00,0.25)) t=(0.00,0.00)}] RenderSVGContainer {g} at (319,1.63) size 52x26.00 - RenderImage {image} at (0,0) size 40x80 + RenderSVGImage {image} at (0,0) size 40x80 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.6 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt index 4350367..d7ea7dc 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt @@ -41,7 +41,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-15) size 80x19 chunk 1 (middle anchor) text run 1 at (-39.50,60.00) startOffset 0 endOffset 12 width 79.00: "x/y on <use>" RenderSVGContainer {g} at (133,71.50) size 94x82.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,90.00)}] - RenderImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (0,0) size 50x50 RenderSVGContainer {use} at (161.50,71.50) size 37x37 RenderSVGContainer {g} at (161.50,71.50) size 37x37 RenderSVGContainer {g} at (161.50,71.50) size 37x37 @@ -152,7 +152,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-15) size 100x19 chunk 1 (middle anchor) text run 1 at (-49.50,60.00) startOffset 0 endOffset 16 width 99.00: "x/y on <text>(2)" RenderSVGContainer {g} at (138,168) size 82x121 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,210.00)}] - RenderImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (0,0) size 50x50 RenderPath {rect} at (138,168) size 54x54 [stroke={[type=SOLID] [color=#FFB400] [stroke width=4.00]}] [data="M-40.00,-40.00 L10.00,-40.00 L10.00,10.00 L-40.00,10.00 Z"] RenderPath {rect} at (140,170) size 80x20 [stroke={[type=SOLID] [color=#FFB400] [stroke width=0.00]}] [data="M-40.00,-40.00 L40.00,-40.00 L40.00,-20.00 L-40.00,-20.00 Z"] RenderPath {rect} at (140,170) size 20x80 [stroke={[type=SOLID] [color=#FFB400] [stroke width=0.00]}] [data="M-40.00,-40.00 L-20.00,-40.00 L-20.00,40.00 L-40.00,40.00 Z"] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt index 3cebdd2..5fae40f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.txt @@ -5,9 +5,9 @@ layer at (0,0) size 480x360 RenderSVGContainer {g} at (30,0) size 431x280 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (30,0) size 190x190 - RenderImage {image} at (0,0) size 190x190 + RenderSVGImage {image} at (0,0) size 190x190 RenderSVGContainer {g} at (260,90) size 190x190 - RenderImage {image} at (0,0) size 190x190 + RenderSVGImage {image} at (0,0) size 190x190 RenderSVGText {text} at (250,20) size 211x15 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-12) size 211x15 chunk 1 text run 1 at (250.00,20.00) startOffset 0 endOffset 40 width 211.00: "Basic test of ICC profile with an image." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt index a8b826b..dfc2c6e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 44x12 chunk 1 text run 1 at (10.00,30.00) startOffset 0 endOffset 13 width 44.00: "Raster to fit" RenderSVGContainer {g} at (20,70) size 40x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}] - RenderImage {image} at (0,0) size 40x40 + RenderSVGImage {image} at (0,0) size 40x40 RenderSVGText {text} at (10,110) size 43x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 43x12 chunk 1 text run 1 at (10.00,110.00) startOffset 0 endOffset 10 width 43.00: "Viewport 1" @@ -28,19 +28,19 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMin*" RenderPath {rect} at (120,80) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (190,65) size 50x45 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}] RenderSVGText {text} at (0,-5) size 25x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMid*" RenderPath {rect} at (190,80) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (120,115) size 50x45 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}] RenderSVGText {text} at (0,-5) size 25x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMax*" RenderPath {rect} at (120,130) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (300,50) size 130x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,50.00)}] RenderSVGText {text} at (0,-20) size 123x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 123x12 @@ -50,19 +50,19 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMin" RenderPath {rect} at (300,80) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (350,65) size 30x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}] RenderSVGText {text} at (0,-5) size 28x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMid" RenderPath {rect} at (350,80) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (400,65) size 30x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}] RenderSVGText {text} at (0,-5) size 28x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMax" RenderPath {rect} at (400,80) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (120,185) size 130x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,185.00)}] RenderSVGText {text} at (0,-20) size 127x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 127x12 @@ -72,19 +72,19 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMin*" RenderPath {rect} at (120,215) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (170,200) size 30x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}] RenderSVGText {text} at (0,-5) size 25x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMid*" RenderPath {rect} at (170,215) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (220,200) size 30x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}] RenderSVGText {text} at (0,-5) size 25x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMax*" RenderPath {rect} at (220,215) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (300,185) size 120x110 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,185.00)}] RenderSVGText {text} at (0,-20) size 115x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 115x12 @@ -94,19 +94,19 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMin" RenderPath {rect} at (300,215) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (370,200) size 50x45 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,0.00)}] RenderSVGText {text} at (0,-5) size 28x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMid" RenderPath {rect} at (370,215) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (300,250) size 50x45 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}] RenderSVGText {text} at (0,-5) size 28x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMax" RenderPath {rect} at (300,265) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.5 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt index 279b1ec..bdd3548 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.txt @@ -3,7 +3,7 @@ layer at (0,0) size 480x360 layer at (0,0) size 480x360 RenderSVGRoot {svg} at (2.25,2.25) size 475.50x355.50 RenderSVGContainer {g} at (15,15) size 435x294 - RenderImage {image} at (0,0) size 100x98 + RenderSVGImage {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 Z"] 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 Z"] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt index 96b6875..147c838 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt @@ -10,32 +10,32 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-15) size 62x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 10 width 62.00: "Blur (3x3)" RenderSVGContainer {g} at (30,70) size 50x63 - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,20) size 130x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 130x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 20 width 130.00: "Edge Detection (3x3)" RenderSVGContainer {g} at (180,70) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,0.00)}] - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,20) size 104x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 104x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 16 width 104.00: "Sharpening (3x3)" RenderSVGContainer {g} at (330,70) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,0.00)}] - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,20) size 102x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 102x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 15 width 102.00: "Embossing (3x3)" RenderSVGContainer {g} at (30,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,93.00)}] - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,20) size 126x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 126x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 21 width 126.00: "Horizontal blur (3x1)" RenderSVGContainer {g} at (180,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,93.00)}] - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,20) size 111x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 111x19 chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 19 width 111.00: "Vertical blur (1x3)" RenderSVGContainer {g} at (330,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,93.00)}] - RenderImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (0,0) size 50x63 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.5 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt index d3b48da..1265ddc 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.txt @@ -11,23 +11,23 @@ layer at (0,0) size 480x360 RenderSVGText {text} at (90,25) size 280x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 280x19 chunk 1 text run 1 at (90.00,25.00) startOffset 0 endOffset 46 width 280.00: "Various values for surfaceScale: 1, 10 and -10" - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (90,130) size 281x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}] RenderSVGText {text} at (90,25) size 281x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 281x19 chunk 1 text run 1 at (90.00,25.00) startOffset 0 endOffset 47 width 281.00: "Various values for diffuseConstants: 0, 1 and 2" - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (90,200) size 318x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,190.00)}] RenderSVGText {text} at (90,25) size 318x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 318x19 chunk 1 text run 1 at (90.00,25.00) startOffset 0 endOffset 55 width 318.00: "Various values for lighting color: red, yellow and blue" - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.4 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt index 295b4a0..54db9a0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.txt @@ -23,10 +23,10 @@ layer at (0,0) size 480x360 RenderSVGText {text} at (355,25) size 50x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 50x19 chunk 1 text run 1 at (355.00,25.00) startOffset 0 endOffset 8 width 50.00: "(45, 45)" - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (70,115) size 359x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}] RenderSVGText {text} at (70,10) size 256x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 256x19 @@ -44,10 +44,10 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-15) size 74x19 chunk 1 text run 1 at (355.00,25.00) startOffset 0 endOffset 12 width 74.00: "(50, 30, 10)" RenderSVGContainer {g} at (70,150) size 335x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (70,195) size 440x49 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,210.00)}] RenderSVGText {text} at (70,0) size 440x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 440x19 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt index 02ab07a..e04924c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.txt @@ -15,9 +15,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (90,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00 L140.00,30.00 L140.00,60.00 L90.00,60.00 Z"] RenderPath {rect} at (205,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00 L255.00,30.00 L255.00,60.00 L205.00,60.00 Z"] RenderPath {rect} at (320,50) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00 L370.00,30.00 L370.00,60.00 L320.00,60.00 Z"] - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (90,100) size 292x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}] RenderSVGText {text} at (90,25) size 292x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 292x19 @@ -26,9 +26,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (90,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00 L140.00,30.00 L140.00,60.00 L90.00,60.00 Z"] RenderPath {rect} at (205,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00 L255.00,30.00 L255.00,60.00 L205.00,60.00 Z"] RenderPath {rect} at (320,120) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00 L370.00,30.00 L370.00,60.00 L320.00,60.00 Z"] - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (90,170) size 295x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}] RenderSVGText {text} at (90,25) size 295x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 295x19 @@ -37,9 +37,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (90,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00 L140.00,30.00 L140.00,60.00 L90.00,60.00 Z"] RenderPath {rect} at (205,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00 L255.00,30.00 L255.00,60.00 L205.00,60.00 Z"] RenderPath {rect} at (320,190) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00 L370.00,30.00 L370.00,60.00 L320.00,60.00 Z"] - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (90,240) size 318x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,230.00)}] RenderSVGText {text} at (90,25) size 318x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 318x19 @@ -48,9 +48,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (90,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,30.00 L140.00,30.00 L140.00,60.00 L90.00,60.00 Z"] RenderPath {rect} at (205,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M205.00,30.00 L255.00,30.00 L255.00,60.00 L205.00,60.00 Z"] RenderPath {rect} at (320,260) size 50x30 [fill={[type=SOLID] [color=#000000]}] [data="M320.00,30.00 L370.00,30.00 L370.00,60.00 L320.00,60.00 Z"] - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.8 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt index b5914f4..f58f967 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt @@ -6,12 +6,12 @@ layer at (0,0) size 480x360 RenderSVGContainer {g} at (20,20) size 420x310 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (30,20) size 410x140 - RenderImage {image} at (0,0) size 410x140 + RenderSVGImage {image} at (0,0) size 410x140 RenderSVGText {text} at (55,130) size 353x122 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-101) size 353x122 chunk 1 text run 1 at (55.00,130.00) startOffset 0 endOffset 9 width 353.00: "Clip Test" RenderSVGContainer {g} at (20,170) size 410x160 - RenderImage {image} at (0,0) size 410x160 + RenderSVGImage {image} at (0,0) size 410x160 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.8 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt index a2e55c4..26d7c10 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt @@ -20,7 +20,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-84) size 173x120 chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 3 width 132.36: "SVG" RenderPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [data="M70.00,55.00 L200.00,55.00 L200.00,125.00 L70.00,125.00 Z"] - RenderImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (0,0) size 80x80 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.6 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt index 9b1d449..8dd0783 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt @@ -19,7 +19,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-84) size 173x120 chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 3 width 132.36: "SVG" RenderPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [data="M70.00,55.00 L200.00,55.00 L200.00,125.00 L70.00,125.00 Z"] - RenderImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (0,0) size 80x80 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.6 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt index 8be6937..6a4b3bb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.txt @@ -3,8 +3,8 @@ layer at (0,0) size 480x360 layer at (0,0) size 480x360 RenderSVGRoot {svg} at (0.50,0) size 479.50x359.50 RenderSVGContainer {g} at (240,0) size 240x300 - RenderImage {image} at (0,0) size 240x150 - RenderImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.8 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt index 3ab6c29..dc43f9c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 480x360 RenderSVGRoot {svg} at (0.50,0.50) size 479x359 RenderSVGContainer {g} at (23,13) size 434x282 RenderPath {rect} at (23,13) size 434x224 [fill={[type=SOLID] [color=#000000]}] [data="M23.00,13.00 L457.00,13.00 L457.00,237.00 L23.00,237.00 Z"] - RenderImage {image} at (0,0) size 430x48 - RenderImage {image} at (0,0) size 430x48 - RenderImage {image} at (0,0) size 430x48 - RenderImage {image} at (0,0) size 430x48 - RenderImage {image} at (0,0) size 430x48 + RenderSVGImage {image} at (0,0) size 430x48 + RenderSVGImage {image} at (0,0) size 430x48 + RenderSVGImage {image} at (0,0) size 430x48 + RenderSVGImage {image} at (0,0) size 430x48 + RenderSVGImage {image} at (0,0) size 430x48 RenderSVGText {text} at (25,285) size 293x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 293x46 chunk 1 text run 1 at (25.00,285.00) startOffset 0 endOffset 16 width 293.00: "Gamma correction" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt index a17a05c..1c833f7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.txt @@ -3,8 +3,8 @@ layer at (0,0) size 480x360 layer at (0,0) size 480x360 RenderSVGRoot {svg} at (0.50,0) size 479.50x359.50 RenderSVGContainer {g} at (240,0) size 240x300 - RenderImage {image} at (0,0) size 240x150 - RenderImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.5 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt index d641016..5aea3d0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b-expected.txt @@ -3,7 +3,7 @@ layer at (0,0) size 480x360 layer at (0,0) size 480x360 RenderSVGRoot {svg} at (0,0) size 479.50x359.50 RenderSVGContainer {g} at (0,0) size 240x150 - RenderImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.1 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.txt index d33e740..666c7dc 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 38x12 chunk 1 text run 1 at (10.00,30.00) startOffset 0 endOffset 10 width 38.00: "SVG to fit" RenderSVGContainer {g} at (20,40) size 50x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}] - RenderImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (0,0) size 50x50 RenderSVGText {text} at (10,110) size 43x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 43x12 chunk 1 text run 1 at (10.00,110.00) startOffset 0 endOffset 10 width 43.00: "Viewport 1" @@ -28,7 +28,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 25x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 25.00: "xMid*" RenderPath {rect} at (130,50) size 50x30 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L49.50,0.50 L49.50,29.50 L0.50,29.50 Z"] - RenderImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (0,0) size 50x30 RenderSVGContainer {g} at (230,20) size 81x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(230.00,50.00)}] RenderSVGText {text} at (0,-20) size 81x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 81x12 @@ -38,7 +38,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 28x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 28.00: "*YMid" RenderPath {rect} at (260,50) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGContainer {g} at (350,20) size 81x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,50.00)}] RenderSVGText {text} at (0,-20) size 81x12 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-10) size 81x12 @@ -48,7 +48,7 @@ layer at (0,0) size 480x360 RenderSVGInlineText {#text} at (0,-10) size 24x12 chunk 1 text run 1 at (0.00,-5.00) startOffset 0 endOffset 5 width 24.00: "*none" RenderPath {rect} at (380,50) size 30x60 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L29.50,0.50 L29.50,59.50 L0.50,59.50 Z"] - RenderImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (0,0) size 30x60 RenderSVGText {text} at (10,340) size 281x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 281x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 281.00: "$Revision: 1.11 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.txt index 3b36e1f..a6e744e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.txt @@ -6,9 +6,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (0,50) size 160x170 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,50.00 L160.00,50.00 L160.00,220.00 L0.00,220.00 Z"] RenderPath {rect} at (160,50) size 160x170 [fill={[type=SOLID] [color=#992200]}] [data="M160.00,50.00 L320.00,50.00 L320.00,220.00 L160.00,220.00 Z"] RenderPath {rect} at (320,50) size 160x170 [fill={[type=SOLID] [color=#002299]}] [data="M320.00,50.00 L480.00,50.00 L480.00,220.00 L320.00,220.00 Z"] - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 RenderSVGText {text} at (10,340) size 281x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 281x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 281.00: "$Revision: 1.12 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.txt index 2532581..511670d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.txt @@ -5,9 +5,9 @@ layer at (0,0) size 480x360 RenderSVGContainer {g} at (10,50) size 472x162 RenderPath {rect} at (150,50) size 162x162 [fill={[type=SOLID] [color=#AAFF44]}] [data="M150.00,50.00 L312.00,50.00 L312.00,212.00 L150.00,212.00 Z"] RenderPath {rect} at (310,50) size 162x162 [fill={[type=SOLID] [color=#FFAA66]}] [data="M310.00,50.00 L472.00,50.00 L472.00,212.00 L310.00,212.00 Z"] - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.3 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.txt index 2afc98c..c88185b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.txt @@ -6,9 +6,9 @@ layer at (0,0) size 480x360 RenderPath {rect} at (0,50) size 160x170 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,50.00 L160.00,50.00 L160.00,220.00 L0.00,220.00 Z"] RenderPath {rect} at (160,50) size 160x170 [fill={[type=SOLID] [color=#992200]}] [data="M160.00,50.00 L320.00,50.00 L320.00,220.00 L160.00,220.00 Z"] RenderPath {rect} at (320,50) size 160x170 [fill={[type=SOLID] [color=#002299]}] [data="M320.00,50.00 L480.00,50.00 L480.00,220.00 L320.00,220.00 Z"] - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 - RenderImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,0) size 162x150 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.5 $" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.png Binary files differindex 9576ef5..c332bb2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.txt index 909ef71..03d5b22 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x600 RenderSVGRoot {svg} at (90,115) size 334.35x259.90 RenderSVGContainer {g} at (141.51,125) size 282.85x249.90 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(0.00,0.00)}] RenderSVGViewportContainer {svg} at (141.51,125) size 282.85x249.90 - RenderImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (0,0) size 240x150 RenderSVGText {text} at (90,130) size 43x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 43x19 chunk 1 text run 1 at (90.00,130.00) startOffset 0 endOffset 6 width 43.00: "Passed" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt index cee5c5c..d4450fa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderSVGRoot {svg} at (0,25) size 523x410 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 - RenderImage {image} at (0,0) size 503x410 + RenderSVGImage {image} at (0,0) size 503x410 RenderSVGText {text} at (0,125) size 523x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 523x19 chunk 1 text run 1 at (0.00,125.00) startOffset 0 endOffset 84 width 523.00: "You should see a solid green block above (a blurred and clipped green checkerboard)." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index fc3e76a..0ce73fb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt @@ -77,7 +77,7 @@ layer at (0,0) size 1026x1034 RenderSVGInlineText {#text} at (0,-84) size 173x120 chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 3 width 132.36: "SVG" RenderPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [data="M70.00,55.00 L200.00,55.00 L200.00,125.00 L70.00,125.00 Z"] - RenderImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (0,0) size 80x80 RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-36) size 261x46 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.6 $" diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 6fdd117b..7c65a0d 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2537,5 +2537,51 @@ BUG10861 LINUX MAC : LayoutTests/security/set-form-autocomplete-attribute.html = BUG10861 MAC : LayoutTests/svg/custom/js-late-marker-creation.svg = FAIL BUG10861 LINUX : LayoutTests/fast/dynamic/001.html = FAIL - +// New failures from WebKit merge 42725:42805 +// The following tests needs rebaseline on LINUX and MAC since +// WebKit change http://trac.webkit.org/changeset/42751 +// changed the name of SVG image in the dump from "RenderImage" +// to "RenderSVGImage". +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b.svg = FAIL +BUG10998 MAC : LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b.svg = FAIL +BUG10998 MAC : LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b.svg = FAIL +BUG10998 MAC : LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t.svg = FAIL +BUG10998 LINUX MAC : LayoutTests/svg/custom/image-with-transform-clip-filter.svg = FAIL +BUG10998 MAC : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html = FAIL + +// New failures from WebKit merge 42725:42805 +// The following tests needs rebaseline on LINUX and MAC because of +// WebKit change http://trac.webkit.org/changeset/42732 +BUG10999 LINUX MAC : LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash.html = FAIL + +// New failures from WebKit merge 42725:42805 +// Because of WebKit change http://trac.webkit.org/changeset/42740, +// DumpRenderTree now dumps additional info on the element that was +// passed to the policy delegate. So the dump changes. +// We need to reflect the change in test shell. +BUG11000 LINUX MAC WIN : LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL +BUG11000 LINUX MAC WIN : LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html = FAIL +BUG11000 LINUX MAC WIN : LayoutTests/http/tests/misc/policy-delegate-called-twice.html = FAIL +BUG11000 LINUX MAC WIN : LayoutTests/http/tests/misc/redirect-to-external-url.html = FAIL + +// New failures from WebKit merge 42725:42805 +// WebKit change http://trac.webkit.org/changeset/42785 +// added a test which submits a form and then uses history.back() +// to go back. in test_shell history.back() does not go back, +// so the test timeouts. +BUG11001 LINUX MAC WIN : LayoutTests/http/tests/history/back-to-post.php = TIMEOUT diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 22d6ab7..b866619 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1446,6 +1446,8 @@ '../third_party/WebKit/WebCore/dom/XMLTokenizer.cpp', '../third_party/WebKit/WebCore/dom/XMLTokenizer.h', '../third_party/WebKit/WebCore/dom/XMLTokenizerLibxml2.cpp', + '../third_party/WebKit/WebCore/dom/XMLTokenizerScope.cpp', + '../third_party/WebKit/WebCore/dom/XMLTokenizerScope.h', '../third_party/WebKit/WebCore/dom/XMLTokenizerQt.cpp', '../third_party/WebKit/WebCore/editing/android/EditorAndroid.cpp', '../third_party/WebKit/WebCore/editing/chromium/EditorChromium.cpp', |
