diff options
| author | ojan@chromium.org <ojan@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-01 21:58:15 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-01 21:58:15 +0000 |
| commit | 8abfa90fd2e7582c7679395015a1fe467f9f99cd (patch) | |
| tree | 9c4b92c5dd06a0f67590a941299cf67e68aa8b56 | |
| parent | 08633a0399ed272bcd527870e71dac2e885c2bb7 (diff) | |
| download | chromium_src-8abfa90fd2e7582c7679395015a1fe467f9f99cd.zip chromium_src-8abfa90fd2e7582c7679395015a1fe467f9f99cd.tar.gz chromium_src-8abfa90fd2e7582c7679395015a1fe467f9f99cd.tar.bz2 | |
Set the line-height of the body to 0 to make this test not be text rendering dependent.
* fast/canvas/canvas-render-layer.html:
* platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt:
* platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt:
git-svn-id: svn://svn.chromium.org/blink/trunk@130080 bbb929c8-8fbe-4397-9dbb-9b2b20218538
4 files changed, 15 insertions, 7 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog index 586f0f9..30f08f2 100644 --- a/third_party/WebKit/LayoutTests/ChangeLog +++ b/third_party/WebKit/LayoutTests/ChangeLog @@ -1,5 +1,13 @@ 2012-10-01 Ojan Vafai <ojan@chromium.org> + Set the line-height of the body to 0 to make this test not be text rendering dependent. + + * fast/canvas/canvas-render-layer.html: + * platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt: + * platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt: + +2012-10-01 Ojan Vafai <ojan@chromium.org> + Actually restrict to Windows debug this time. * platform/chromium/TestExpectations: diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html index 3e26ba6..b177956 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html +++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html @@ -5,7 +5,7 @@ we expect that the latter three are all placed in render layers while the first is not.--> <html> -<body> +<body style="line-height: 0;"> <canvas id="A" width=100 height=100></canvas><canvas id="B" width=100 height=100></canvas><canvas id="C" width=100 height=100></canvas><canvas id="D" width=100 height=100></canvas> <script type="text/javascript" charset="utf-8"> if (window.testRunner) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt index 4ed33ef..4d27f7e 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x121 - RenderBlock {HTML} at (0,0) size 800x121 - RenderBody {BODY} at (8,8) size 784x105 +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,8) size 784x100 RenderHTMLCanvas {CANVAS} at (0,0) size 100x100 RenderHTMLCanvas {CANVAS} at (100,0) size 100x100 RenderHTMLCanvas {CANVAS} at (200,0) size 100x100 diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt index 8ff3e85..02f00d5 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x121 - RenderBlock {HTML} at (0,0) size 800x121 - RenderBody {BODY} at (8,8) size 784x105 +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,8) size 784x100 RenderHTMLCanvas {CANVAS} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 |