Title: [118981] branches/safari-534.57-branch/Source/WebCore
Diff
Modified: branches/safari-534.57-branch/Source/WebCore/ChangeLog (118980 => 118981)
--- branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-05-30 22:08:56 UTC (rev 118980)
+++ branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-05-30 22:18:51 UTC (rev 118981)
@@ -1,3 +1,20 @@
+2012-05-30 Lucas Forschler <[email protected]>
+
+ Merge 108550
+
+ 2012-02-22 Anders Carlsson <[email protected]>
+
+ Crash when marking cached pages for full style recalc
+ https://bugs.webkit.org/show_bug.cgi?id=79276
+ <rdar://problem/10884036>
+
+ Reviewed by Beth Dakin.
+
+ Guard against a null history item.
+
+ * history/BackForwardController.cpp:
+ (WebCore::BackForwardController::markPagesForFullStyleRecalc):
+
2012-04-17 Lucas Forschler <[email protected]>
Merge 109480
Modified: branches/safari-534.57-branch/Source/WebCore/history/BackForwardController.cpp (118980 => 118981)
--- branches/safari-534.57-branch/Source/WebCore/history/BackForwardController.cpp 2012-05-30 22:08:56 UTC (rev 118980)
+++ branches/safari-534.57-branch/Source/WebCore/history/BackForwardController.cpp 2012-05-30 22:18:51 UTC (rev 118981)
@@ -111,7 +111,13 @@
for (int i = first; i <= last; i++) {
if (!i)
continue;
- itemAtIndex(i)->markForFullStyleRecalc();
+
+ // FIXME: itemAtIndex should never return null here, but due to the way the
+ // back/forward list is implemented in WebKit2 it sometimes can, when the
+ // session has been updated in the UI process but the session update message
+ // hasn't yet reached the web process.
+ if (HistoryItem* historyItem = itemAtIndex(i))
+ historyItem->markForFullStyleRecalc();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
