Title: [86896] branches/safari-534.36-branch/Source/WebKit2
Diff
Modified: branches/safari-534.36-branch/Source/WebKit2/ChangeLog (86895 => 86896)
--- branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:10:29 UTC (rev 86895)
+++ branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 22:10:44 UTC (rev 86896)
@@ -1,5 +1,19 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86783.
+
+ 2011-05-18 Jon Lee <[email protected]>
+
+ Reviewed by Simon Fraser.
+
+ Crash in injected bundle client
+ https://bugs.webkit.org/show_bug.cgi?id=61086
+
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ (WebKit::InjectedBundlePageUIClient::shouldRubberBandInDirection): Check for existence of method in client prior to calling.
+
+2011-05-19 Lucas Forschler <[email protected]
+
Merged r86738.
2011-05-17 Jeremy Noble <[email protected]>
Modified: branches/safari-534.36-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (86895 => 86896)
--- branches/safari-534.36-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2011-05-19 22:10:29 UTC (rev 86895)
+++ branches/safari-534.36-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2011-05-19 22:10:44 UTC (rev 86896)
@@ -117,6 +117,8 @@
bool InjectedBundlePageUIClient::shouldRubberBandInDirection(WebPage* page, WKScrollDirection direction) const
{
+ if (!m_client.shouldRubberBandInDirection)
+ return true;
return m_client.shouldRubberBandInDirection(toAPI(page), direction, m_client.clientInfo);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
