Title: [188723] trunk/Source/WebCore
- Revision
- 188723
- Author
- [email protected]
- Date
- 2015-08-20 18:03:23 -0700 (Thu, 20 Aug 2015)
Log Message
Unreviewed, rolling out r188712.
https://bugs.webkit.org/show_bug.cgi?id=148274
broke allllll the tests (Requested by thorton on #webkit).
Reverted changeset:
"WK1 can re-enter layout during FrameView destruction and
crash"
https://bugs.webkit.org/show_bug.cgi?id=148237
http://trac.webkit.org/changeset/188712
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188722 => 188723)
--- trunk/Source/WebCore/ChangeLog 2015-08-21 00:47:16 UTC (rev 188722)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 01:03:23 UTC (rev 188723)
@@ -1,3 +1,17 @@
+2015-08-20 Tim Horton <[email protected]>
+
+ Unreviewed, rolling out r188712.
+ https://bugs.webkit.org/show_bug.cgi?id=148274
+
+ broke allllll the tests (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "WK1 can re-enter layout during FrameView destruction and
+ crash"
+ https://bugs.webkit.org/show_bug.cgi?id=148237
+ http://trac.webkit.org/changeset/188712
+
2015-08-20 Commit Queue <[email protected]>
Unreviewed, rolling out r188717 and r188719.
Modified: trunk/Source/WebCore/page/FrameView.cpp (188722 => 188723)
--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-21 00:47:16 UTC (rev 188722)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-21 01:03:23 UTC (rev 188723)
@@ -267,14 +267,8 @@
m_postLayoutTasksTimer.stop();
removeFromAXObjectCache();
+ resetScrollbars();
- // FIXME: This is a safe fix for rdar://problem/22356782. We won't resetScrollbars() for a FrameView that is in
- // the PageCache because resetting scrollbars can re-enter layout for the Frame's new FrameView, which leads to
- // updating pages in the page cache, which leads to a crash because we're in the process of destroying something
- // in the page cache. We should not be able to get into this mess at all.
- if (frame().view() == this)
- resetScrollbars();
-
// Custom scrollbars should already be destroyed at this point
ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar());
ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
