Changeset 143045 in webkit

Timestamp:

Feb 15, 2013, 1:35:57 PM (12 years ago)

Author:

eae@chromium.org

Message:

Clamp span value in RenderTableCell::parse[Col|Row]SpanFromDOM
​https://bugs.webkit.org/show_bug.cgi?id=109878

Source/WebCore:

Reviewed by Abhishek Arya.

Test: fast/table/colspan-huge-number.html

Clamp colspan and rowspan values to their respective maximum
supported values.

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::parseColSpanFromDOM):
(WebCore::RenderTableCell::parseRowSpanFromDOM):

LayoutTests:

Reviewed by Abhishek Arya.

Add test for handling of very large colspan value.

• fast/table/colspan-huge-number-expected.txt: Added.
• fast/table/colspan-huge-number.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/colspan-huge-number-expected.txt (added)
• LayoutTests/fast/table/colspan-huge-number.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTableCell.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-14  Emil A Eklund  <eae@chromium.org>
+
+        Clamp span value in RenderTableCell::parse[Col|Row]SpanFromDOM
+        https://bugs.webkit.org/show_bug.cgi?id=109878
+
+        Reviewed by Abhishek Arya.
+        
+        Add test for handling of very large colspan value.
+
+        * fast/table/colspan-huge-number-expected.txt: Added.
+        * fast/table/colspan-huge-number.html: Added.
+
 2013-02-15  Xueqing Huang  <huangxueqing@baidu.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-14  Emil A Eklund  <eae@chromium.org>
+
+        Clamp span value in RenderTableCell::parse[Col|Row]SpanFromDOM
+        https://bugs.webkit.org/show_bug.cgi?id=109878
+
+        Reviewed by Abhishek Arya.
+
+        Test: fast/table/colspan-huge-number.html
+        
+        Clamp colspan and rowspan values to their respective maximum
+        supported values.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::parseColSpanFromDOM):
+        (WebCore::RenderTableCell::parseRowSpanFromDOM):
+
 2013-02-15  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -80 +80 @@
     ASSERT(node());
     if (node()->hasTagName(tdTag) || node()->hasTagName(thTag))
-        return toHTMLTableCellElement(node())->colSpan();
+        return min<unsigned>(toHTMLTableCellElement(node())->colSpan(), maxColumnIndex);
 #if ENABLE(MATHML)
     if (node()->hasTagName(MathMLNames::mtdTag))
-        return toMathMLElement(node())->colSpan();
+        return min<unsigned>(toMathMLElement(node())->colSpan(), maxColumnIndex);
 #endif
     return 1;
@@ -92 +92 @@
     ASSERT(node());
     if (node()->hasTagName(tdTag) || node()->hasTagName(thTag))
-        return toHTMLTableCellElement(node())->rowSpan();
+        return min<unsigned>(toHTMLTableCellElement(node())->rowSpan(), maxRowIndex);
 #if ENABLE(MATHML)
     if (node()->hasTagName(MathMLNames::mtdTag))
-        return toMathMLElement(node())->rowSpan();
+        return min<unsigned>(toMathMLElement(node())->rowSpan(), maxRowIndex);
 #endif
     return 1;