Implement maxWidth for fillText and strokeText, fixing the canvas/philip/tests/2d...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Nov 2011 16:32:02 +0000 (16:32 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Nov 2011 16:32:02 +0000 (16:32 +0000)
commit6525995c95a7629aef813b04187d650c269e626c
tree24c98cb295263071ecd6dfd498035ce03c6df44e
parent673833d1e14a552e32ca077fd5feb06d2efe4469
Implement maxWidth for fillText and strokeText, fixing the canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface.html test.
https://bugs.webkit.org/show_bug.cgi?id=61528

Patch by Philip Rogers <pdr@google.com> on 2011-11-15
Reviewed by Stephen White.

Source/WebCore:

Tests: fast/canvas/2d.text.draw.fill.maxWidth.gradient.html
       fast/canvas/2d.text.draw.fill.maxWidth.negative.html
       fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html
       fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html

* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawTextInternal):

LayoutTests:

* fast/canvas/2d.text.draw.fill.maxWidth.gradient-expected.txt: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.gradient.html: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.negative-expected.txt: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.negative.html: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.veryLarge-expected.txt: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.verySmall-expected.txt: Added.
* fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html: Added.
* platform/chromium/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/gtk/Skipped:
* platform/mac-leopard/Skipped:
* platform/mac/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt:
* platform/qt/Skipped:
* resources/Ahem.ttf: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100285 268f45cc-cd09-0410-ab3c-d52691b4dbfc
18 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient-expected.txt [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.gradient.html [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative-expected.txt [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.negative.html [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge-expected.txt [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.veryLarge.html [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall-expected.txt [new file with mode: 0644]
LayoutTests/fast/canvas/2d.text.draw.fill.maxWidth.verySmall.html [new file with mode: 0644]
LayoutTests/platform/chromium/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/gtk/Skipped
LayoutTests/platform/mac-leopard/Skipped
LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt
LayoutTests/platform/qt/Skipped
LayoutTests/resources/Ahem.ttf [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp