Changeset 142754 in webkit


Ignore:
Timestamp:
Feb 13, 2013 9:01:31 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

The 2D Canvas functions fillText()/strokeText() should display nothing when maxWidth is less then or equal to zero
​https://bugs.webkit.org/show_bug.cgi?id=102656

Patch by Rashmi Shyamasundar <​rashmi.s2@samsung.com> on 2013-02-13
Reviewed by Dirk Schulze.

The functions fillText()/strokeText() should not display anything when
maxWidth is less than or equal to zero, according to spec :
​http://www.w3.org/TR/2dcontext/#text-preparation-algorithm

Source/WebCore:

Test: fast/canvas/canvas-fillText-maxWidth-zero.html

  • html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::drawTextInternal):

LayoutTests:

  • fast/canvas/canvas-fillText-invalid-maxWidth-expected.txt: Added.
  • fast/canvas/canvas-fillText-invalid-maxWidth.html: Added.
  • fast/canvas/canvas-strokeText-invalid-maxWidth-expected.txt: Added.
  • fast/canvas/canvas-strokeText-invalid-maxWidth.html: Added.
  • fast/canvas/script-tests/canvas-fillText-invalid-maxWidth.js: Added.
  • fast/canvas/script-tests/canvas-strokeText-invalid-maxWidth.js: Added.
Location:
trunk
Files:
6 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r142753 r142754  
     12013-02-13  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
     2
     3        The 2D Canvas functions fillText()/strokeText() should display nothing when maxWidth is less then or equal to zero
     4        https://bugs.webkit.org/show_bug.cgi?id=102656
     5
     6        Reviewed by Dirk Schulze.
     7
     8        The functions fillText()/strokeText() should not display anything when
     9        maxWidth is less than or equal to zero, according to spec :
     10        http://www.w3.org/TR/2dcontext/#text-preparation-algorithm
     11
     12        * fast/canvas/canvas-fillText-invalid-maxWidth-expected.txt: Added.
     13        * fast/canvas/canvas-fillText-invalid-maxWidth.html: Added.
     14        * fast/canvas/canvas-strokeText-invalid-maxWidth-expected.txt: Added.
     15        * fast/canvas/canvas-strokeText-invalid-maxWidth.html: Added.
     16        * fast/canvas/script-tests/canvas-fillText-invalid-maxWidth.js: Added.
     17        * fast/canvas/script-tests/canvas-strokeText-invalid-maxWidth.js: Added.
     18
    1192013-02-13  Sergio Villar Senin  <svillar@igalia.com>
    220

  • trunk/Source/WebCore/ChangeLog

    r142749 r142754  
     12013-02-13  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
     2
     3        The 2D Canvas functions fillText()/strokeText() should display nothing when maxWidth is less then or equal to zero
     4        https://bugs.webkit.org/show_bug.cgi?id=102656
     5
     6        Reviewed by Dirk Schulze.
     7
     8        The functions fillText()/strokeText() should not display anything when
     9        maxWidth is less than or equal to zero, according to spec :
     10        http://www.w3.org/TR/2dcontext/#text-preparation-algorithm
     11
     12        Test: fast/canvas/canvas-fillText-maxWidth-zero.html
     13
     14        * html/canvas/CanvasRenderingContext2D.cpp:
     15        (WebCore::CanvasRenderingContext2D::drawTextInternal):
     16
    1172013-02-13  ChangSeok Oh  <shivamidow@gmail.com>
    218

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r142271 r142754  
    21762176    if (!isfinite(x) | !isfinite(y))
    21772177        return;
    2178     if (useMaxWidth && !isfinite(maxWidth))
     2178    if (useMaxWidth && (!isfinite(maxWidth) || maxWidth <= 0))
    21792179        return;
    21802180
Note: See TracChangeset for help on using the changeset viewer.