Title: [182133] trunk/Source/WebKit2
- Revision
- 182133
- Author
- simon.fra...@apple.com
- Date
- 2015-03-29 21:17:45 -0700 (Sun, 29 Mar 2015)
Log Message
Fix iOS scrollperf crash after a web process crash
https://bugs.webkit.org/show_bug.cgi?id=143110
Reviewed by Dean Jackson.
When we destroy the drawing area after a web process crash, we also need to destroy
the scrollingPerformanceData which has a reference to the drawing area.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetState):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182132 => 182133)
--- trunk/Source/WebKit2/ChangeLog 2015-03-30 04:13:45 UTC (rev 182132)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-30 04:17:45 UTC (rev 182133)
@@ -1,5 +1,18 @@
2015-03-29 Simon Fraser <simon.fra...@apple.com>
+ Fix iOS scrollperf crash after a web process crash
+ https://bugs.webkit.org/show_bug.cgi?id=143110
+
+ Reviewed by Dean Jackson.
+
+ When we destroy the drawing area after a web process crash, we also need to destroy
+ the scrollingPerformanceData which has a reference to the drawing area.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState):
+
+2015-03-29 Simon Fraser <simon.fra...@apple.com>
+
Convert arguments to ScrollingCoordinator functions to references
https://bugs.webkit.org/show_bug.cgi?id=143198
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182132 => 182133)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-30 04:13:45 UTC (rev 182132)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-30 04:17:45 UTC (rev 182133)
@@ -4656,6 +4656,9 @@
void WebPageProxy::resetState(ResetStateReason resetStateReason)
{
m_mainFrame = nullptr;
+#if PLATFORM(COCOA)
+ m_scrollingPerformanceData = nullptr;
+#endif
m_drawingArea = nullptr;
if (m_inspector) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
