Attachment #355781 for bug #192038

View Details Raw Unified Return to Bug 192038



2018-11-27  Tim Horton  <timothy_horton@apple.com>

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

        Reviewed by NOBODY (OOPS!).

        * 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  Alexey Proskuryakov  <ap@apple.com>

        Modernize the check for async _saveCookies existence

Lines 837-842 void WebPageProxy::finishAttachingToWebProcess(ShouldDelayAttachingDrawingArea s a/Source/WebKit/UIProcess/WebPageProxy.cpp_sec1
- a/Source/WebKit/UIProcess/WebPageProxy.cpp +8 lines
837	m_credentialsMessenger = std::make_unique<WebAuthenticatorCoordinatorProxy>(*this);	837	m_credentialsMessenger = std::make_unique<WebAuthenticatorCoordinatorProxy>(*this);
838	#endif	838	#endif
839		839
		840	#if HAVE(PENCILKIT)
		841	m_editableImageController = std::make_unique<EditableImageController>(*this);
		842	#endif
		843
840	initializeWebPage(shouldDelayAttachingDrawingArea);	844	initializeWebPage(shouldDelayAttachingDrawingArea);
841		845
842	m_inspector->updateForNewPageProcess(this);	846	m_inspector->updateForNewPageProcess(this);
Lines 6361-6366 void WebPageProxy::resetState(ResetStateReason resetStateReason) a/Source/WebKit/UIProcess/WebPageProxy.cpp_sec2
6361	m_credentialsMessenger = nullptr;	6365	m_credentialsMessenger = nullptr;
6362	#endif	6366	#endif
6363		6367
		6368	#if HAVE(PENCILKIT)
		6369	m_editableImageController = nullptr;
		6370	#endif
		6371
6364	CallbackBase::Error error;	6372	CallbackBase::Error error;
6365	switch (resetStateReason) {	6373	switch (resetStateReason) {
6366	case ResetStateReason::NavigationSwap:	6374	case ResetStateReason::NavigationSwap:

Return to Bug 192038

Lines 1-3 a/Source/WebKit/ChangeLog_sec1
- a/Source/WebKit/ChangeLog +17 lines
		1	2018-11-27 Tim Horton <timothy_horton@apple.com>
		2
		3	WKNavigation.AutomaticViewReloadAfterWebProcessCrash asserts after r238538
		4	https://bugs.webkit.org/show_bug.cgi?id=192038
		5	<rdar://problem/46288457>
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	* UIProcess/WebPageProxy.cpp:
		10	(WebKit::m_resetRecentCrashCountTimer):
		11	(WebKit::WebPageProxy::finishAttachingToWebProcess):
		12	(WebKit::WebPageProxy::resetState):
		13	(WebKit::m_editableImageController): Deleted.
		14	Properly invalidate m_editableImageController when resetting WebPageProxy.
		15	Otherwise, the MessageReceiverMaps get invalidated, then later when
		16	EditableImageController goes away we assert trying to remove the receiver.
		17
1	2018-11-27 Alexey Proskuryakov <ap@apple.com>	18	2018-11-27 Alexey Proskuryakov <ap@apple.com>
2		19
3	Modernize the check for async _saveCookies existence	20	Modernize the check for async _saveCookies existence