diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 20:33:24 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 20:33:24 +0000 |
| commit | e4b4591f0c327baec00da5809fa2e2cdb85e4362 (patch) | |
| tree | eef341b0ca907158b624c2e074978214070759c2 | |
| parent | 49fd5cd62a9773ce94fdd5e0e3d048d8c4fd0ff0 (diff) | |
| download | chromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.zip chromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.tar.gz chromium_src-e4b4591f0c327baec00da5809fa2e2cdb85e4362.tar.bz2 | |
WebKit Merge 42805:42932, Chromium side.
Gross offenders:
* Unforking LazyEventListeners: http://trac.webkit.org/changeset/42843
* Removing ListMarkerBox: http://trac.webkit.org/changeset/42846
* SVG changes: http://trac.webkit.org/changeset/42840
* Window object is now an event target: http://trac.webkit.org/changeset/42882
R=jeremy
BUG=0
TEST=trybots
Review URL: http://codereview.chromium.org/99147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14776 0039d316-1c4b-4281-b951-d872f2087c98
65 files changed, 154 insertions, 133 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42805", + "webkit_revision": "42932", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@14722", + "/trunk/deps/third_party/WebKit@14775", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 9af57c6..bc96b47 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42805
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42932
\ No newline at end of file diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 30a532c..0e1dffc 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -3237,14 +3237,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ListMarkerBox.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ListMarkerBox.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\MediaControlElements.cpp" > </File> diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.checksum index 61c866a..b6a78e4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.checksum @@ -1 +1 @@ -4c4374e6639ee6fdc1abd0b628b6d967
\ No newline at end of file +ec80192019931c262580e94c1eaf8837
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png Binary files differindex 8974add..ea40a42 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/4960120-1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.checksum index 8598c93..e862adf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.checksum @@ -1 +1 @@ -65b4669f7dfb2b7b1b4584d6784cdc74
\ No newline at end of file +470ad7dd065a75ee5321a6d506dbc781
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png Binary files differindex d2c0ccd..ea40a42 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt index f269e9e..74997f6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt @@ -3,26 +3,26 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {DIV} at (0,0) size 784x188 - RenderBlock {DIV} at (0,0) size 784x152 + RenderBlock {DIV} at (0,0) size 784x156 + RenderBlock {DIV} at (0,0) size 784x136 RenderBlock {P} at (0,0) size 784x20 RenderText {#text} at (0,0) size 584x19 text run at (0,0) width 584: "This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted." - RenderBlock {BLOCKQUOTE} at (40,36) size 704x80 - RenderText {#text} at (0,0) size 22x19 - text run at (0,0) width 22: "one" - RenderBR {BR} at (22,15) size 0x0 - RenderText {#text} at (0,20) size 23x19 - text run at (0,20) width 23: "two" - RenderBR {BR} at (23,35) size 0x0 - RenderText {#text} at (0,40) size 30x19 - text run at (0,40) width 30: "three" - RenderBR {BR} at (30,55) size 0x0 - RenderText {#text} at (0,60) size 23x19 - text run at (0,60) width 23: "two" - RenderBlock (anonymous) at (0,132) size 784x0 - RenderBlock {BLOCKQUOTE} at (40,132) size 704x20 - RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,168) size 784x20 + RenderBlock {BLOCKQUOTE} at (0,36) size 784x80 [color=#0000FF] [border: (2px solid #0000FF)] + RenderText {#text} at (22,0) size 22x19 + text run at (22,0) width 22: "one" + RenderBR {BR} at (44,15) size 0x0 + RenderText {#text} at (22,20) size 23x19 + text run at (22,20) width 23: "two" + RenderBR {BR} at (45,35) size 0x0 + RenderText {#text} at (22,40) size 30x19 + text run at (22,40) width 30: "three" + RenderBR {BR} at (52,55) size 0x0 + RenderText {#text} at (22,60) size 23x19 + text run at (22,60) width 23: "two" + RenderBlock (anonymous) at (0,116) size 784x0 + RenderBlock {BLOCKQUOTE} at (0,116) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)] + RenderBR {BR} at (22,0) size 0x19 + RenderBlock (anonymous) at (0,136) size 784x20 RenderBR {BR} at (0,0) size 0x19 caret: position 3 of child 6 {#text} of child 3 {BLOCKQUOTE} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.checksum index 251ac3d..78513cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.checksum @@ -1 +1 @@ -c3aab36e316922f41b448114c7b03e55
\ No newline at end of file +2f6c39b92e681798a1c12a7bb1bdcebd
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.png Binary files differindex bd9ab24..e908359d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrollbar-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.checksum index 7f0c3c6..41a2cb9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.checksum @@ -1 +1 @@ -9f5b8f312c0c877f0c7ceeacf48939c6
\ No newline at end of file +89e4e9be748400c0295d3fa818757137
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.png Binary files differindex 2d38062..e908359d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-type-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.checksum index f4f01fe..5492039 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.checksum @@ -1 +1 @@ -013c053ef8ddc7304ec95cbd25083c84
\ No newline at end of file +d3a195006a2017f67ad1c0e3996e1d28
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png Binary files differindex 87f5719..e908359d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-focus-ring-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png Binary files differindex bac4212..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png 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 1188fb9..5643dba 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 - RenderSVGImage {image} at (0,0) size 40x80 + RenderSVGImage {image} at (230,5) 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 - RenderSVGImage {image} at (0,0) size 40x80 + RenderSVGImage {image} at (319,1.63) size 52x26.00 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png Binary files differindex ce2c044..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png 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 d7ea7dc..acf9962 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)}] - RenderSVGImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (165,75) 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)}] - RenderSVGImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (140,170) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.png Binary files differindex c2f8b12..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f-expected.png 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 5fae40f..34ff9fe 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 - RenderSVGImage {image} at (0,0) size 190x190 + RenderSVGImage {image} at (30,0) size 190x190 RenderSVGContainer {g} at (260,90) size 190x190 - RenderSVGImage {image} at (0,0) size 190x190 + RenderSVGImage {image} at (260,90) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png Binary files differindex 96fca96..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png 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 dfc2c6e..04fa396 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)}] - RenderSVGImage {image} at (0,0) size 40x40 + RenderSVGImage {image} at (20,70) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (120,80) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (190,80) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (120,130) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (300,80) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (350,80) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (400,80) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (120,215) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (170,215) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (220,215) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (300,215) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (370,215) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (300,265) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png Binary files differindex 722d5e0..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png 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 bdd3548..1d0a63e 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 - RenderSVGImage {image} at (0,0) size 100x98 + RenderSVGImage {image} at (120,15) size 300x294 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.png Binary files differindex d2fe228..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f-expected.png 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 147c838..918c917 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 - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (30,70) size 50x63 [filter=convolve1] 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)}] - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (180,70) size 50x63 [filter=convolve2] 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)}] - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (330,70) size 50x63 [filter=convolve3] 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)}] - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (30,163) size 50x63 [filter=convolve4] 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)}] - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (180,163) size 50x63 [filter=convolve5] 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)}] - RenderSVGImage {image} at (0,0) size 50x63 + RenderSVGImage {image} at (330,163) size 50x63 [filter=convolve6] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png Binary files differindex 4e04b3109..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png 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 1265ddc..1fbb620 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" - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,80) size 50x30 [filter=surfaceScaleA] + RenderSVGImage {image} at (160,80) size 50x30 [filter=surfaceScaleB] + RenderSVGImage {image} at (230,80) size 50x30 [filter=surfaceScaleC] 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" - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,150) size 50x30 [filter=diffuseConstantA] + RenderSVGImage {image} at (160,150) size 50x30 [filter=diffuseConstantB] + RenderSVGImage {image} at (230,150) size 50x30 [filter=diffuseConstantC] 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" - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,220) size 50x30 [filter=lightingColorA] + RenderSVGImage {image} at (160,220) size 50x30 [filter=lightingColorB] + RenderSVGImage {image} at (230,220) size 50x30 [filter=lightingColorC] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png Binary files differindex aa55498..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png 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 54db9a0..b4064b9 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)" - 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 + RenderSVGImage {image} at (70,70) size 50x30 [filter=distantLightA] + RenderSVGImage {image} at (165,70) size 50x30 [filter=distantLightB] + RenderSVGImage {image} at (260,70) size 50x30 [filter=distantLightC] + RenderSVGImage {image} at (355,70) size 50x30 [filter=distantLightD] 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 - 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 + RenderSVGImage {image} at (70,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,150.00)}] [filter=pointLightA] + RenderSVGImage {image} at (165,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,150.00)}] [filter=pointLightB] + RenderSVGImage {image} at (260,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,150.00)}] [filter=pointLightC] + RenderSVGImage {image} at (355,150) size 50x30 [transform={m=((1.00,0.00)(0.00,1.00)) t=(355.00,150.00)}] [filter=pointLightD] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png Binary files differindex b446f40..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png 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 e04924c..25cdf95 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"] - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,50) size 50x30 [filter=surfaceScaleA] + RenderSVGImage {image} at (205,50) size 50x30 [filter=surfaceScaleB] + RenderSVGImage {image} at (320,50) size 50x30 [filter=surfaceScaleC] 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"] - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,120) size 50x30 [filter=specularConstantA] + RenderSVGImage {image} at (205,120) size 50x30 [filter=specularConstantB] + RenderSVGImage {image} at (320,120) size 50x30 [filter=specularConstantC] 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"] - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,190) size 50x30 [filter=specularExponentA] + RenderSVGImage {image} at (205,190) size 50x30 [filter=specularExponentB] + RenderSVGImage {image} at (320,190) size 50x30 [filter=specularExponentC] 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"] - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (90,260) size 50x30 [filter=lightingColorA] + RenderSVGImage {image} at (205,260) size 50x30 [filter=lightingColorB] + RenderSVGImage {image} at (320,260) size 50x30 [filter=lightingColorC] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.png Binary files differindex eab11ef..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.png 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 f58f967..8af6eb6 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 - RenderSVGImage {image} at (0,0) size 410x140 + RenderSVGImage {image} at (30,20) 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 - RenderSVGImage {image} at (0,0) size 410x160 + RenderSVGImage {image} at (20,170) size 410x160 [clip path="sample"] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.png Binary files differindex d575e66..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b-expected.png 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 26d7c10..5a97770 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"] - RenderSVGImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (291.60,135) size 144.00x144 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.png Binary files differindex b5c7b3d..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t-expected.png 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 8dd0783..40d1df2 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"] - RenderSVGImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (291.60,135) size 144.00x144 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.png Binary files differindex 714cd5d..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t-expected.png 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 6a4b3bb..5724872 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 - RenderSVGImage {image} at (0,0) size 240x150 - RenderSVGImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (240,0) size 240x150 + RenderSVGImage {image} at (240,150) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.png Binary files differindex ae9129f..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t-expected.png 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 dc43f9c..746a4d4 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"] - 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 + RenderSVGImage {image} at (25,15) size 430x48 + RenderSVGImage {image} at (25,43) size 430x48 + RenderSVGImage {image} at (25,91) size 430x48 + RenderSVGImage {image} at (25,139) size 430x48 + RenderSVGImage {image} at (25,187) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.png Binary files differindex 35a2151..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t-expected.png 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 1c833f7..fdc6e8d 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 - RenderSVGImage {image} at (0,0) size 240x150 - RenderSVGImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (240,0) size 240x150 + RenderSVGImage {image} at (240,150) 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-06-t-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.png Binary files differindex 8bbf7a8f..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t-expected.png 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 666c7dc..f45dda3 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)}] - RenderSVGImage {image} at (0,0) size 50x50 + RenderSVGImage {image} at (20,40) 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"] - RenderSVGImage {image} at (0,0) size 50x30 + RenderSVGImage {image} at (130,50) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (260,50) 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"] - RenderSVGImage {image} at (0,0) size 30x60 + RenderSVGImage {image} at (380,50) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.png Binary files differindex 5a3dfbd..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t-expected.png 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 a6e744e..b5d7e92 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"] - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,60) size 162x150 + RenderSVGImage {image} at (160,60) size 162x150 + RenderSVGImage {image} at (320,60) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.png Binary files differindex 4d0a6f6..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t-expected.png 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 511670d..fcbf651 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"] - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (10,60) size 162x150 + RenderSVGImage {image} at (160,60) size 162x150 + RenderSVGImage {image} at (320,60) 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.png Binary files differindex 61c7641..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t-expected.png 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 c88185b..5e2b6e4 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"] - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 - RenderSVGImage {image} at (0,0) size 162x150 + RenderSVGImage {image} at (0,60) size 162x150 + RenderSVGImage {image} at (160,60) size 162x150 + RenderSVGImage {image} at (320,60) 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 c332bb2..011f7cb 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 03d5b22..fed1ac3 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 - RenderSVGImage {image} at (0,0) size 240x150 + RenderSVGImage {image} at (141.51,125) size 282.85x249.90 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png Binary files differindex af657ca..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png 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 d4450fa..21186f0 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 - RenderSVGImage {image} at (0,0) size 503x410 + RenderSVGImage {image} at (0,25) size 503x410 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-25.00)}] [clip path="myclip"] [filter=myfilter] 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.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png Binary files differindex 1406161..011f7cb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png 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 0ce73fb..1fc5663 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"] - RenderSVGImage {image} at (0,0) size 80x80 + RenderSVGImage {image} at (291.60,135) size 144.00x144 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/custom/viewport-update2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.checksum index 7363841..f880664 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.checksum @@ -1 +1 @@ -778803df0a824ed8f2c7dfa07c56832e
\ No newline at end of file +b35c089bbf5449867924db028737079d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.png Binary files differindex ef7a357..a5fda07 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/viewport-update2-expected.png diff --git a/webkit/port/bindings/v8/JSDOMBinding.cpp b/webkit/port/bindings/v8/JSDOMBinding.cpp index c72a92b..c5810ff 100644 --- a/webkit/port/bindings/v8/JSDOMBinding.cpp +++ b/webkit/port/bindings/v8/JSDOMBinding.cpp @@ -41,12 +41,4 @@ void updateDOMNodeDocument(Node* node, Document* oldDocument, // We don't do anything here in V8 bindings } -ScriptState* scriptStateFromNode(Node* node) -{ - // This should be never reached with V8 bindings (WebKit only uses it - // for non-JS bindings) - ASSERT_NOT_REACHED(); - return 0; -} - } // namespace WebCore diff --git a/webkit/port/bindings/v8/JSDOMBinding.h b/webkit/port/bindings/v8/JSDOMBinding.h index 350dc94..7c198c7 100644 --- a/webkit/port/bindings/v8/JSDOMBinding.h +++ b/webkit/port/bindings/v8/JSDOMBinding.h @@ -43,8 +43,6 @@ namespace WebCore { void updateDOMNodeDocument(Node*, Document* oldDocument, Document* newDocument); - ScriptState* scriptStateFromNode(Node*); - } diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index b9ea99b..01dd9a8 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -2953,8 +2953,8 @@ v8::Handle<v8::Value> V8Proxy::NodeToV8Object(Node* node) // A JS object of type EventTarget can only be the following possible types: -// 1) EventTargetNode; 2) XMLHttpRequest; 3) MessagePort; 4) SVGElementInstance; -// 5) XMLHttpRequestUpload 6) Worker +// 1) EventTargetNode; 2) DOMWindow 3) XMLHttpRequest; 4) MessagePort; +// 5) XMLHttpRequestUpload // check EventTarget.h for new type conversion methods v8::Handle<v8::Value> V8Proxy::EventTargetToV8Object(EventTarget* target) { @@ -2977,6 +2977,9 @@ v8::Handle<v8::Value> V8Proxy::EventTargetToV8Object(EventTarget* target) if (node) return NodeToV8Object(node); + if (DOMWindow* domWindow = target->toDOMWindow()) + return ToV8Object(V8ClassIndex::DOMWINDOW, domWindow); + // XMLHttpRequest is created within its JS counterpart. XMLHttpRequest* xhr = target->toXMLHttpRequest(); if (xhr) { diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 638245f..72ea0d3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2560,3 +2560,41 @@ BUG11011 WIN : LayoutTests/fast/workers/worker-event-listener.html = TIMEOUT PAS BUG11011 WIN : LayoutTests/fast/workers/worker-gc.html = TIMEOUT PASS // The following failure was filed in BUG9798, used to be FAIL and PASS. BUG11011 WIN : LayoutTests/fast/workers/worker-terminate.html = TIMEOUT FAIL PASS + +// New failures from WebKit Merge 42805:42932 +LayoutTests/fast/dom/Window/dispatchEvent.html = FAIL +BUG11121 : LayoutTests/fast/repaint/layer-outline-horizontal.html = FAIL +BUG11121 : LayoutTests/fast/repaint/layer-outline.html = FAIL + +// Need Mac/Linux rebaselines from WebKit Merge 42805:42932 +BUG11123 LINUX MAC : LayoutTests/editing/deleting/delete-br-013.html +BUG11123 LINUX MAC : LayoutTests/editing/inserting/4960120-1.html +BUG11123 LINUX MAC : LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote.html +BUG11123 LINUX MAC : LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3.html +BUG11123 LINUX MAC : LayoutTests/fast/css/nested-layers-with-hover.html +BUG11123 LINUX MAC : LayoutTests/fast/forms/textarea-scrollbar.html +BUG11123 LINUX MAC : LayoutTests/fast/forms/textarea-scrolled-type.html +BUG11123 LINUX MAC : LayoutTests/fast/overflow/overflow-focus-ring.html +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/animate-elem-40-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/color-prof-01-f.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/filters-specular-01-f.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/render-groups-01-b.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t.svg +BUG11123 LINUX MAC : LayoutTests/svg/custom/image-clipped-hit.svg +BUG11123 LINUX MAC : LayoutTests/svg/custom/image-with-transform-clip-filter.svg +BUG11123 LINUX MAC : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html +BUG11123 LINUX MAC : LayoutTests/svg/custom/viewport-update2.svg diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 92a5adf..2b068e0 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3123,8 +3123,6 @@ '../third_party/WebKit/WebCore/rendering/InlineTextBox.h', '../third_party/WebKit/WebCore/rendering/LayoutState.cpp', '../third_party/WebKit/WebCore/rendering/LayoutState.h', - '../third_party/WebKit/WebCore/rendering/ListMarkerBox.cpp', - '../third_party/WebKit/WebCore/rendering/ListMarkerBox.h', '../third_party/WebKit/WebCore/rendering/MediaControlElements.cpp', '../third_party/WebKit/WebCore/rendering/MediaControlElements.h', '../third_party/WebKit/WebCore/rendering/PointerEventsHitRules.cpp', |
