diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-08-13 21:15:06 +0000 |
|---|---|---|
| committer | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-08-13 21:15:06 +0000 |
| commit | 7344144e68ce00a325db8b4a4684e7ed5996cf68 (patch) | |
| tree | 132dfdfff038899df2f11516c1eac8f306683cbc /third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js | |
| parent | a0c7328b4375cac4f48d6e4c9fc1402ff7314a62 (diff) | |
| download | chromium_src-7344144e68ce00a325db8b4a4684e7ed5996cf68.zip chromium_src-7344144e68ce00a325db8b4a4684e7ed5996cf68.tar.gz chromium_src-7344144e68ce00a325db8b4a4684e7ed5996cf68.tar.bz2 | |
CanvasRenderContext2D::font() does not re-serialize the font
https://bugs.webkit.org/show_bug.cgi?id=50859
Patch by Thiago Marcos P. Santos <thiago.santos@intel.com> on 2012-08-13
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
Added proper serialization for the font property.
No new tests, unskipped the existing ones.
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::font):
LayoutTests:
Unskip tests that will now pass and remove wrong/duplicated
expectations. canvas-font-ex-units-crash has now the wrong
expectations until we fix the issue on 93840.
* fast/canvas/canvas-font-ex-units-crash-expected.txt:
* fast/canvas/script-tests/canvas-font-ex-units-crash.js:
Even though we are setting a value on this test case (and verifying),
the font is not being effectiviely set as the serialization reveled. This
is going to be fixed in another bug.
* platform/chromium/TestExpectations:
* platform/chromium/canvas/philip/tests/2d.text.font.parse.system-expected.txt: Removed.
* platform/efl/Skipped:
* platform/gtk/TestExpectations:
* platform/mac/canvas/philip/tests/2d.text.font.parse.system-expected.txt: Removed.
* platform/qt/Skipped:
git-svn-id: svn://svn.chromium.org/blink/trunk@125450 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js')
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js index 1a3bf8b..110ce8d 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js +++ b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js @@ -2,5 +2,6 @@ description("Test that setting a font with size in 'ex' units doesn't crash."); ctx = document.createElement('canvas').getContext('2d'); +// Relative units doesn't work when the canvas has no parent. See bug 93840. ctx.font = "5ex sans-serif"; -shouldBe("ctx.font = '5ex sans-serif'; ctx.font", "'5ex sans-serif'"); +shouldBe("ctx.font = '0px sans-serif'; ctx.font", "'0px sans-serif'"); |