Title: [96117] branches/chromium/874
- Revision
- 96117
- Author
- infe...@chromium.org
- Date
- 2011-09-27 09:21:37 -0700 (Tue, 27 Sep 2011)
Log Message
Merge 95926 - <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree
BUG=97952
Review URL: http://codereview.chromium.org/8052011
Modified Paths
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt (from rev 95926, trunk/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt) (0 => 96117)
--- branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt 2011-09-27 16:21:37 UTC (rev 96117)
@@ -0,0 +1,5 @@
+Test for <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree at developer.gnome.org.
+
+The test passes if, in a debug build, it does not cause an assertion failure.
+
+
Copied: branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted.html (from rev 95926, trunk/LayoutTests/fast/dynamic/subtree-unrooted.html) (0 => 96117)
--- branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted.html (rev 0)
+++ branches/chromium/874/LayoutTests/fast/dynamic/subtree-unrooted.html 2011-09-27 16:21:37 UTC (rev 96117)
@@ -0,0 +1,24 @@
+<style>
+ #target:before {
+ content: ' ';
+ display: block;
+ overflow: hidden;
+ width: 0;
+ height: 0;
+ }
+</style>
+<body>
+ <p>
+ Test for <i><a href=""
+ ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree at developer.gnome.org</i>.
+ </p>
+ <p>
+ The test passes if, in a debug build, it does not cause an assertion failure.
+ </p>
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ document.body.offsetTop;
+ </script>
+ <div id="target"></div>
+</body>
Modified: branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp (96116 => 96117)
--- branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp 2011-09-27 16:12:20 UTC (rev 96116)
+++ branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp 2011-09-27 16:21:37 UTC (rev 96117)
@@ -2249,10 +2249,12 @@
FrameView* view = toRenderView(this)->frameView();
if (view)
view->scheduleRelayout();
- } else if (parent()) {
- FrameView* v = view() ? view()->frameView() : 0;
- if (v)
- v->scheduleRelayoutOfSubtree(this);
+ } else {
+ RenderView* renderView;
+ if (isRooted(&renderView)) {
+ if (FrameView* frameView = renderView->frameView())
+ frameView->scheduleRelayoutOfSubtree(this);
+ }
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
