diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-01 17:44:06 +0000 |
|---|---|---|
| committer | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-01 17:44:06 +0000 |
| commit | a6bcb444a0fb3a85a2551cb0df7c37931bcfecd6 (patch) | |
| tree | b0364ffb909231f4fe5161cdcc778abffcd78349 | |
| parent | 4953b837f91f405955144b0927beedd01e4ed6ed (diff) | |
| download | chromium_src-a6bcb444a0fb3a85a2551cb0df7c37931bcfecd6.zip chromium_src-a6bcb444a0fb3a85a2551cb0df7c37931bcfecd6.tar.gz chromium_src-a6bcb444a0fb3a85a2551cb0df7c37931bcfecd6.tar.bz2 | |
Improvments to recently added test, fast/canvas/canvas-render-layer.html
https://bugs.webkit.org/show_bug.cgi?id=97940
Patch by Brian Salomon <bsalomon@google.com> on 2012-10-01
Reviewed by Ojan Vafai.
The test previously had whitespace between the canvases. This made the expectations dependent upon platform-specific text rendering. The spaces have been removed in the revised test.
* fast/canvas/canvas-render-layer.html:
* platform/chromium-linux/fast/canvas/canvas-render-layer-expected.png: Added.
* platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt: Added.
* platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.png: Added.
* platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt: Added.
git-svn-id: svn://svn.chromium.org/blink/trunk@130056 bbb929c8-8fbe-4397-9dbb-9b2b20218538
6 files changed, 46 insertions, 11 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog index b580b5f..253b32f 100644 --- a/third_party/WebKit/LayoutTests/ChangeLog +++ b/third_party/WebKit/LayoutTests/ChangeLog @@ -1,3 +1,18 @@ +2012-10-01 Brian Salomon <bsalomon@google.com> + + Improvments to recently added test, fast/canvas/canvas-render-layer.html + https://bugs.webkit.org/show_bug.cgi?id=97940 + + Reviewed by Ojan Vafai. + + The test previously had whitespace between the canvases. This made the expectations dependent upon platform-specific text rendering. The spaces have been removed in the revised test. + + * fast/canvas/canvas-render-layer.html: + * platform/chromium-linux/fast/canvas/canvas-render-layer-expected.png: Added. + * platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt: Added. + * platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.png: Added. + * platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt: Added. + 2012-10-01 Andrey Kosyakov <caseq@chromium.org> Unreviewed gardening -- clean up expectations for passing tests. 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 f01d4af2..3e26ba6 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html +++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-render-layer.html @@ -1,17 +1,12 @@ <!DOCTYPE html> +<!--The test makes four canvases. The first never receives a getContext. The + second is rendered into immediately. The third and fourth are rendered + into with from nested setTimeout callbacks. When the canvases are accelerated + we expect that the latter three are all placed in render layers while + the first is not.--> <html> <body> - <!--The test makes four canvases. The first never receives a getContext. The - second is rendered into immediately. The third and fourth are rendered - into with from nested setTimeout callbacks. When the canvases are accelerated - we expect that the latter three are all placed in render layers while - the first is not.--> - <canvas id="A" width=100 height=100></canvas> - <canvas id="B" width=100 height=100></canvas> - <br> - <canvas id="C" width=100 height=100></canvas> - <canvas id="D" width=100 height=100></canvas> - + <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) testRunner.waitUntilDone(); diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.png b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.png Binary files differnew file mode 100644 index 0000000..cf83c6c --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.png 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 new file mode 100644 index 0000000..4ed33ef --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/fast/canvas/canvas-render-layer-expected.txt @@ -0,0 +1,11 @@ +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 + RenderHTMLCanvas {CANVAS} at (0,0) size 100x100 + RenderHTMLCanvas {CANVAS} at (100,0) size 100x100 + RenderHTMLCanvas {CANVAS} at (200,0) size 100x100 + RenderHTMLCanvas {CANVAS} at (300,0) size 100x100 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.png b/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.png Binary files differnew file mode 100644 index 0000000..cf83c6c --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.png 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 new file mode 100644 index 0000000..8ff3e85 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/fast/canvas/canvas-render-layer-expected.txt @@ -0,0 +1,14 @@ +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 + RenderHTMLCanvas {CANVAS} at (0,0) size 100x100 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 +layer at (108,8) size 100x100 + RenderHTMLCanvas {CANVAS} at (100,0) size 100x100 +layer at (208,8) size 100x100 + RenderHTMLCanvas {CANVAS} at (200,0) size 100x100 +layer at (308,8) size 100x100 + RenderHTMLCanvas {CANVAS} at (300,0) size 100x100 |
