Title: [111962] releases/WebKitGTK/webkit-1.8/Source/WebKit2
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog (111961 => 111962)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-03-24 01:13:46 UTC (rev 111961)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-03-24 01:25:20 UTC (rev 111962)
@@ -1,3 +1,16 @@
+2012-03-23 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-07 Carlos Garcia Campos <[email protected]>
[GTK] Fix several documentation issues in WebKit2 GTK+ API
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (111961 => 111962)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-24 01:13:46 UTC (rev 111961)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-24 01:25:20 UTC (rev 111962)
@@ -3036,7 +3036,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
