diff options
| author | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 00:22:44 +0000 |
|---|---|---|
| committer | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 00:22:44 +0000 |
| commit | 0a85d7be7b67b07e2e20cd7bd16e0732aae831b9 (patch) | |
| tree | acb41ec59457d293c0bb29e90e69c4502265a07f | |
| parent | 866ba4c8103f3ebde2c1bb15a325dae0edf885f7 (diff) | |
| download | chromium_src-0a85d7be7b67b07e2e20cd7bd16e0732aae831b9.zip chromium_src-0a85d7be7b67b07e2e20cd7bd16e0732aae831b9.tar.gz chromium_src-0a85d7be7b67b07e2e20cd7bd16e0732aae831b9.tar.bz2 | |
Cleanup from being webkit gardener. Update bug numbers on 2, rebaseline one test that changed upstream.
TEST=try servers
BUG=30816,29737
Review URL: http://codereview.chromium.org/500145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35010 0039d316-1c4b-4281-b951-d872f2087c98
6 files changed, 9 insertions, 13 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.checksum index 2938d2d..461ef9e 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.checksum @@ -1 +1 @@ -8a2c428215894fa54567c1a76952fda1
\ No newline at end of file +f7048501347d43cb1b9cd1ae5afa6bd6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.png Binary files differnew file mode 100644 index 0000000..5ef289c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/empty-merge-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.checksum index fc1c88c..36304b3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.checksum @@ -1 +1 @@ -89e8676fb93a99553bb2e4759a97eb73
\ No newline at end of file +fce3cbcab7912c8de007b33afbbdf6b5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.png Binary files differindex 1f2a6bc..1d5342d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.txt index 9ffcb87..fa1b782 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/empty-merge-expected.txt @@ -1,9 +1,9 @@ -KCanvasResource {id="MyFilter" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]} +KCanvasResource {id="MyFilter1" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]} +KCanvasResource {id="MyFilter2" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]} layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 800x600 - RenderSVGRoot {svg} at (-0.50,-0.50) size 102x102 + RenderSVGRoot {svg} at (10,10) size 220x100 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 - RenderPath {rect} at (0.50,0.50) size 101x101 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#888888]}] [data="M1.00,1.00 L101.00,1.00 L101.00,101.00 L1.00,101.00 Z"] - RenderSVGContainer {g} at (-0.50,-0.50) size 101x101 [filter=MyFilter] - RenderPath {rect} at (-0.50,-0.50) size 101x101 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"] + RenderPath {rect} at (10,10) size 100x100 [fill={[type=SOLID] [color=#008000]}] [filter=MyFilter1] [data="M10.00,10.00 L110.00,10.00 L110.00,110.00 L10.00,110.00 Z"] + RenderPath {rect} at (130,10) size 100x100 [fill={[type=SOLID] [color=#008000]}] [filter=MyFilter2] [data="M130.00,10.00 L230.00,10.00 L230.00,110.00 L130.00,110.00 Z"] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 8eaaaf3..49c401c 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3117,17 +3117,13 @@ BUG9798 MAC RELEASE : LayoutTests/fast/borders/block-mask-overlay-image.html = T // Webkit roll 52198->52205 // Newly added test in r52202 -BUG_JPARENT : LayoutTests/svg/filters/filter-source-position.svg = IMAGE+TEXT - -// Webkit roll 52205->52227 -// New expectations added in 52219 -BUG_JPARENT WIN LINUX : LayoutTests/svg/custom/empty-merge.svg = IMAGE+TEXT +BUG29737 : LayoutTests/svg/filters/filter-source-position.svg = IMAGE+TEXT // Flaky since SVG filters turned on BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS // Newly added test in r52235 -BUG_JPARENT WIN LINUX : LayoutTests/editing/selection/doubleclick-beside-cr-span.html = TEXT +BUG30816 WIN LINUX : LayoutTests/editing/selection/doubleclick-beside-cr-span.html = TEXT // WebKit update 52293->52323 BUG30792 : LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript.html = TEXT
\ No newline at end of file |
