Title: [104076] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104075 => 104076)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 22:30:41 UTC (rev 104075)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 22:34:52 UTC (rev 104076)
@@ -1,5 +1,18 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95926
+
+ 2011-09-25 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree
+
+ Reviewed by Sam Weinig.
+
+ * fast/dynamic/subtree-unrooted-expected.txt: Added.
+ * fast/dynamic/subtree-unrooted.html: Added.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95924
2011-09-24 Abhishek Arya <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt (from rev 95926, trunk/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt) (0 => 104076)
--- branches/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted-expected.txt 2012-01-04 22:34:52 UTC (rev 104076)
@@ -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/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted.html (from rev 95926, trunk/LayoutTests/fast/dynamic/subtree-unrooted.html) (0 => 104076)
--- branches/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/dynamic/subtree-unrooted.html 2012-01-04 22:34:52 UTC (rev 104076)
@@ -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/safari-534.54-branch/Source/WebCore/ChangeLog (104075 => 104076)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:30:41 UTC (rev 104075)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:34:52 UTC (rev 104076)
@@ -1,5 +1,21 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95926
+
+ 2011-09-25 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10156263> ASSERT in WebCore::FrameView::scheduleRelayoutOfSubtree
+
+ Reviewed by Sam Weinig.
+
+ Test: fast/dynamic/subtree-unrooted.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::scheduleRelayout): Replaced the check that the renderer is parented,
+ which was added in r21162, with a check that it is “rooted”.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95924
2011-09-24 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp (104075 => 104076)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-04 22:30:41 UTC (rev 104075)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-04 22:34:52 UTC (rev 104076)
@@ -2220,10 +2220,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
