Title: [238580] trunk/Source/WebKit
Revision
238580
Author
[email protected]
Date
2018-11-27 15:20:25 -0800 (Tue, 27 Nov 2018)

Log Message

WKNavigation.AutomaticViewReloadAfterWebProcessCrash asserts after r238538
https://bugs.webkit.org/show_bug.cgi?id=192038
<rdar://problem/46288457>

Reviewed by Wenson Hsieh.

* UIProcess/WebPageProxy.cpp:
(WebKit::m_resetRecentCrashCountTimer):
(WebKit::WebPageProxy::finishAttachingToWebProcess):
(WebKit::WebPageProxy::resetState):
(WebKit::m_editableImageController): Deleted.
Properly invalidate m_editableImageController when resetting WebPageProxy.
Otherwise, the MessageReceiverMaps get invalidated, then later when
EditableImageController goes away we assert trying to remove the receiver.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (238579 => 238580)


--- trunk/Source/WebKit/ChangeLog	2018-11-27 22:40:51 UTC (rev 238579)
+++ trunk/Source/WebKit/ChangeLog	2018-11-27 23:20:25 UTC (rev 238580)
@@ -1,3 +1,20 @@
+2018-11-27  Tim Horton  <[email protected]>
+
+        WKNavigation.AutomaticViewReloadAfterWebProcessCrash asserts after r238538
+        https://bugs.webkit.org/show_bug.cgi?id=192038
+        <rdar://problem/46288457>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::m_resetRecentCrashCountTimer):
+        (WebKit::WebPageProxy::finishAttachingToWebProcess):
+        (WebKit::WebPageProxy::resetState):
+        (WebKit::m_editableImageController): Deleted.
+        Properly invalidate m_editableImageController when resetting WebPageProxy.
+        Otherwise, the MessageReceiverMaps get invalidated, then later when
+        EditableImageController goes away we assert trying to remove the receiver.
+
 2018-11-27  Jiewen Tan  <[email protected]>
 
         (r238246) [ MacOS Debug ] Layout Test http/wpt/webauthn/ctap-hid-failure.https.html is Crashing

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (238579 => 238580)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-11-27 22:40:51 UTC (rev 238579)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-11-27 23:20:25 UTC (rev 238580)
@@ -837,6 +837,10 @@
     m_credentialsMessenger = std::make_unique<WebAuthenticatorCoordinatorProxy>(*this);
 #endif
 
+#if HAVE(PENCILKIT)
+    m_editableImageController = std::make_unique<EditableImageController>(*this);
+#endif
+
     initializeWebPage(shouldDelayAttachingDrawingArea);
 
     m_inspector->updateForNewPageProcess(this);
@@ -6361,6 +6365,10 @@
     m_credentialsMessenger = nullptr;
 #endif
 
+#if HAVE(PENCILKIT)
+    m_editableImageController = nullptr;
+#endif
+
     CallbackBase::Error error;
     switch (resetStateReason) {
     case ResetStateReason::NavigationSwap:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to