Title: [147645] trunk
- Revision
- 147645
- Author
- e...@chromium.org
- Date
- 2013-04-04 11:10:07 -0700 (Thu, 04 Apr 2013)
Log 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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (147644 => 147645)
--- trunk/LayoutTests/ChangeLog 2013-04-04 18:00:52 UTC (rev 147644)
+++ trunk/LayoutTests/ChangeLog 2013-04-04 18:10:07 UTC (rev 147645)
@@ -1,3 +1,15 @@
+2013-04-04 Emil A Eklund <e...@chromium.org>
+
+ 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.
+
2013-04-04 Christophe Dumez <ch.du...@sisa.samsung.com>
[Cairo] Fix canvas drawing of SVG-based patterns and remove NativeImageCairo
Added: trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge-expected.html (0 => 147645)
--- trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge-expected.html (rev 0)
+++ trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge-expected.html 2013-04-04 18:10:07 UTC (rev 147645)
@@ -0,0 +1,7 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<frameset>
+ <frameset id="tCF3">
+ <frame id="tCF4"></frame>
+ </frameset>
+ <frame>
+</html>
Property changes on: trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge-expected.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:eol-style
Added: trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge.html (0 => 147645)
--- trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge.html (rev 0)
+++ trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge.html 2013-04-04 18:10:07 UTC (rev 147645)
@@ -0,0 +1,13 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<frameset>
+ <frameset id="tCF3">
+ <frame id="tCF4"></frame>
+ </frameset>
+ <frame>
+
+ <script>
+ document.body.appendChild(document.getElementById('tCF3'));
+ window.scrollTo(18, 64);
+ document.getElementById('tCF4').setAttribute("noresize", "NORESIZE");
+ </script>>
+</html>
Property changes on: trunk/LayoutTests/fast/frames/invalid-frameset-compute-edge.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (147644 => 147645)
--- trunk/Source/WebCore/ChangeLog 2013-04-04 18:00:52 UTC (rev 147644)
+++ trunk/Source/WebCore/ChangeLog 2013-04-04 18:10:07 UTC (rev 147645)
@@ -1,3 +1,15 @@
+2013-04-04 Emil A Eklund <e...@chromium.org>
+
+ 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):
+
2013-04-04 ChangSeok Oh <changseok...@collabora.com>
[GTK][AC] Invalid clear ClutterContent of ClutterActor
Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (147644 => 147645)
--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2013-04-04 18:00:52 UTC (rev 147644)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2013-04-04 18:10:07 UTC (rev 147645)
@@ -404,10 +404,10 @@
if (!child)
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())
edgeInfo = toRenderFrameSet(child)->edgeInfo();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
