Title: [169066] trunk/Source/WebKit2
- Revision
- 169066
- Author
- [email protected]
- Date
- 2014-05-19 14:17:06 -0700 (Mon, 19 May 2014)
Log Message
[WK2] Add some missing state reset on crash
https://bugs.webkit.org/show_bug.cgi?id=133036
Reviewed by Sam Weinig.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetState):
The missing reset for m_isTrackingTouchEvents would cause the WebPageProxy to send
touch events when it shouldn't. That would only be for an active touch sequence.
The missing reset m_lastVisibleContentRectUpdate would prevent pushing the new UI state
to the new page on reload, that is very bad.
Also moved m_videoFullscreenManager to be in the same order as initialization, and invalidate
the callbacks for dictation.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169065 => 169066)
--- trunk/Source/WebKit2/ChangeLog 2014-05-19 21:09:01 UTC (rev 169065)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-19 21:17:06 UTC (rev 169066)
@@ -1,3 +1,21 @@
+2014-05-19 Benjamin Poulain <[email protected]>
+
+ [WK2] Add some missing state reset on crash
+ https://bugs.webkit.org/show_bug.cgi?id=133036
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState):
+ The missing reset for m_isTrackingTouchEvents would cause the WebPageProxy to send
+ touch events when it shouldn't. That would only be for an active touch sequence.
+
+ The missing reset m_lastVisibleContentRectUpdate would prevent pushing the new UI state
+ to the new page on reload, that is very bad.
+
+ Also moved m_videoFullscreenManager to be in the same order as initialization, and invalidate
+ the callbacks for dictation.
+
2014-05-19 Benjamin Poulain <[email protected]>
[iOS][WK2] Move scale noise filtering to the WebProcess
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169065 => 169066)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-19 21:09:01 UTC (rev 169065)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-19 21:17:06 UTC (rev 169066)
@@ -4138,13 +4138,6 @@
}
#endif
-#if PLATFORM(IOS)
- if (m_videoFullscreenManager) {
- m_videoFullscreenManager->invalidate();
- m_videoFullscreenManager = nullptr;
- }
-#endif
-
#if ENABLE(VIBRATION)
m_vibration->invalidate();
#endif
@@ -4154,6 +4147,10 @@
m_openPanelResultListener = nullptr;
}
+#if ENABLE(TOUCH_EVENTS)
+ m_isTrackingTouchEvents = false;
+#endif
+
#if ENABLE(INPUT_TYPE_COLOR)
if (m_colorPicker) {
m_colorPicker->invalidate();
@@ -4179,6 +4176,15 @@
m_visibleScrollerThumbRect = IntRect();
+#if PLATFORM(IOS)
+ if (m_videoFullscreenManager) {
+ m_videoFullscreenManager->invalidate();
+ m_videoFullscreenManager = nullptr;
+ }
+
+ m_lastVisibleContentRectUpdate = VisibleContentRectUpdateInfo();
+#endif
+
invalidateCallbackMap(m_voidCallbacks);
invalidateCallbackMap(m_dataCallbacks);
invalidateCallbackMap(m_imageCallbacks);
@@ -4198,6 +4204,7 @@
invalidateCallbackMap(m_touchesCallbacks);
invalidateCallbackMap(m_autocorrectionCallbacks);
invalidateCallbackMap(m_autocorrectionContextCallbacks);
+ invalidateCallbackMap(m_dictationContextCallbacks);
#endif
#if PLATFORM(GTK)
invalidateCallbackMap(m_printFinishedCallbacks);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
