Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Issue 437065: Merge WebKit 51201: Do not assert when a high number is used for roman numera... (Closed)

Created:
11 years ago by Mark Larson (Google)
Modified:
9 years, 7 months ago
Reviewers:
kuchhal
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Merge WebKit 51201: Do not assert when a high number is used for roman numerals in lists. https://bugs.webkit.org/show_bug.cgi?id=31652 BUG= http://crbug.com/28762 TBR= kuchhal TEST= layout tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=33103

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+15 lines, -1 line) Patch
A LayoutTests/fast/lists/ol-start-roman.html View 1 chunk +10 lines, -0 lines 0 comments Download
A LayoutTests/fast/lists/ol-start-roman-expected.txt View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderListMarker.cpp View 1 chunk +3 lines, -1 line 0 comments Download

Messages

Total messages: 2 (0 generated)
Mark Larson (Google)
11 years ago (2009-11-25 19:52:05 UTC) #1
kuchhal
11 years ago (2009-11-25 19:53:28 UTC) #2
lgtm.

On Wed, Nov 25, 2009 at 11:52 AM, <mal.chromium@gmail.com> wrote:

> Reviewers: kuchhal,
>
> Description:
> Merge WebKit 51201: Do not assert when a high number is used for roman
> numerals
> in lists.
>
> https://bugs.webkit.org/show_bug.cgi?id=31652
>
> BUG= http://crbug.com/28762
> TBR= kuchhal
> TEST= layout tests
>
>
> Please review this at http://codereview.chromium.org/437065
>
> SVN Base: svn://chrome-svn/chrome/branches/WebKit/249/
>
> Affected files:
>  A     LayoutTests/fast/lists/ol-start-roman-expected.txt
>  A     LayoutTests/fast/lists/ol-start-roman.html
>  M     WebCore/rendering/RenderListMarker.cpp
>
>
> Index: WebCore/rendering/RenderListMarker.cpp
> ===================================================================
> --- WebCore/rendering/RenderListMarker.cpp      (revision 33098)
> +++ WebCore/rendering/RenderListMarker.cpp      (working copy)
> @@ -48,7 +48,9 @@
>     if (number < 1 || number > 3999)
>         return String::number(number);
>
> -    const int lettersSize = 12; // big enough for three each of I, X, C,
> and M
> +    // Big enough to store largest roman number less than 3999 which
> +    // is 3888 (MMMDCCCLXXXVIII)
> +    const int lettersSize = 15;
>     UChar letters[lettersSize];
>
>     int length = 0;
> Index: LayoutTests/fast/lists/ol-start-roman-expected.txt
> ===================================================================
> --- LayoutTests/fast/lists/ol-start-roman-expected.txt  (revision 0)
> +++ LayoutTests/fast/lists/ol-start-roman-expected.txt  (revision 33098)
> @@ -0,0 +1,2 @@
> +PASS: test did not crash, bug 31652.
> +PASS: test did not crash, bug 31652.
> Index: LayoutTests/fast/lists/ol-start-roman.html
> ===================================================================
> --- LayoutTests/fast/lists/ol-start-roman.html  (revision 0)
> +++ LayoutTests/fast/lists/ol-start-roman.html  (revision 33098)
> @@ -0,0 +1,10 @@
> +<script>
> +    if (window.layoutTestController)
> +        layoutTestController.dumpAsText();
> +</script>
> +<ol start="3888" type="i">
> +<li>PASS: test did not crash, bug 31652.</li>
> +</ol>
> +<ol start="4888" type="i">
> +<li>PASS: test did not crash, bug 31652.</li>
> +</ol>
>
>
>

Powered by Google App Engine
This is Rietveld 408576698