Title: [110888] trunk/Source/WebKit2
- Revision
- 110888
- Author
- [email protected]
- Date
- 2012-03-15 14:33:44 -0700 (Thu, 15 Mar 2012)
Log Message
REGRESSION(r107168?): Assertion failures under pageContainsAnyHorizontalScrollbars causing multiple "crashes" on the Lion Intel Debug WebKit2 testers
https://bugs.webkit.org/show_bug.cgi?id=81162
<rdar://problem/11050423>
Reviewed by Beth Dakin and Jessie Berlin.
Downgrade the ASSERT to a simple if check since scrollableArea->isOnActivePage() can return false when layout happens during page transitions.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::pageContainsAnyHorizontalScrollbars):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (110887 => 110888)
--- trunk/Source/WebKit2/ChangeLog 2012-03-15 21:30:18 UTC (rev 110887)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-15 21:33:44 UTC (rev 110888)
@@ -1,3 +1,16 @@
+2012-03-15 Anders Carlsson <[email protected]>
+
+ REGRESSION(r107168?): Assertion failures under pageContainsAnyHorizontalScrollbars causing multiple "crashes" on the Lion Intel Debug WebKit2 testers
+ https://bugs.webkit.org/show_bug.cgi?id=81162
+ <rdar://problem/11050423>
+
+ Reviewed by Beth Dakin and Jessie Berlin.
+
+ Downgrade the ASSERT to a simple if check since scrollableArea->isOnActivePage() can return false when layout happens during page transitions.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::pageContainsAnyHorizontalScrollbars):
+
2012-03-15 David Hyatt <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=81258
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (110887 => 110888)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-15 21:30:18 UTC (rev 110887)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-15 21:33:44 UTC (rev 110888)
@@ -3069,7 +3069,8 @@
for (HashSet<ScrollableArea*>::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
ScrollableArea* scrollableArea = *it;
- ASSERT(scrollableArea->isOnActivePage());
+ if (!scrollableArea->isOnActivePage())
+ continue;
if (hasEnabledHorizontalScrollbar(scrollableArea))
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
