Changeset 147645 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Apr 4, 2013, 11:10:07 AM (12 years ago)

Author:

[email protected]

Message:

Source/WebCore: Change RenderFrameSet::computeEdgeInfo to use m-rows/m_cols directly
​https://bugs.webkit.org/show_bug.cgi?id=113825

Reviewed by Eric Seidel.

Tests: fast/frames/invalid-frameset-compute-edge.html

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::computeEdgeInfo):

LayoutTests: Change RenderFrameSet::computeEdgeInfo to use m-rows/m_cols directly
​https://bugs.webkit.org/show_bug.cgi?id=113825

Reviewed by Eric Seidel.

Add test for accessing an invalid frame.

• fast/frames/invalid-frameset-compute-edge-expected.html: Added.
• fast/frames/invalid-frameset-compute-edge.html: Added.

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -405 +405 @@
         return;
 
-    int rows = frameSet()->totalRows();
-    int cols = frameSet()->totalCols();
-    for (int r = 0; r < rows; ++r) {
-        for (int c = 0; c < cols; ++c) {
+    size_t rows = m_rows.m_sizes.size();
+    size_t cols = m_cols.m_sizes.size();
+    for (size_t r = 0; r < rows; ++r) {
+        for (size_t c = 0; c < cols; ++c) {
             FrameEdgeInfo edgeInfo;
             if (child->isFrameSet())