Changeset 169066 in webkit

Timestamp:

May 19, 2014, 2:17:06 PM (12 years ago)

Author:

benjamin@webkit.org

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-19  Benjamin Poulain  <benjamin@webkit.org>
+
+        [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  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4139 +4139 @@
 #endif
 
+#if ENABLE(VIBRATION)
+    m_vibration->invalidate();
+#endif
+
+    if (m_openPanelResultListener) {
+        m_openPanelResultListener->invalidate();
+        m_openPanelResultListener = nullptr;
+    }
+
+#if ENABLE(TOUCH_EVENTS)
+    m_isTrackingTouchEvents = false;
+#endif
+
+#if ENABLE(INPUT_TYPE_COLOR)
+    if (m_colorPicker) {
+        m_colorPicker->invalidate();
+        m_colorPicker = nullptr;
+    }
+#endif
+
+#if ENABLE(GEOLOCATION)
+    m_geolocationPermissionRequestManager.invalidateRequests();
+#endif
+
+    m_notificationPermissionRequestManager.invalidateRequests();
+
+    m_toolTip = String();
+
+    m_mainFrameHasHorizontalScrollbar = false;
+    m_mainFrameHasVerticalScrollbar = false;
+
+    m_mainFrameIsPinnedToLeftSide = true;
+    m_mainFrameIsPinnedToRightSide = true;
+    m_mainFrameIsPinnedToTopSide = true;
+    m_mainFrameIsPinnedToBottomSide = true;
+
+    m_visibleScrollerThumbRect = IntRect();
+
 #if PLATFORM(IOS)
     if (m_videoFullscreenManager) {
@@ -4144 +4182 @@
         m_videoFullscreenManager = nullptr;
     }
-#endif
-
-#if ENABLE(VIBRATION)
-    m_vibration->invalidate();
-#endif
-
-    if (m_openPanelResultListener) {
-        m_openPanelResultListener->invalidate();
-        m_openPanelResultListener = nullptr;
-    }
-
-#if ENABLE(INPUT_TYPE_COLOR)
-    if (m_colorPicker) {
-        m_colorPicker->invalidate();
-        m_colorPicker = nullptr;
-    }
-#endif
-
-#if ENABLE(GEOLOCATION)
-    m_geolocationPermissionRequestManager.invalidateRequests();
-#endif
-
-    m_notificationPermissionRequestManager.invalidateRequests();
-
-    m_toolTip = String();
-
-    m_mainFrameHasHorizontalScrollbar = false;
-    m_mainFrameHasVerticalScrollbar = false;
-
-    m_mainFrameIsPinnedToLeftSide = true;
-    m_mainFrameIsPinnedToRightSide = true;
-    m_mainFrameIsPinnedToTopSide = true;
-    m_mainFrameIsPinnedToBottomSide = true;
-
-    m_visibleScrollerThumbRect = IntRect();
+
+    m_lastVisibleContentRectUpdate = VisibleContentRectUpdateInfo();
+#endif
 
     invalidateCallbackMap(m_voidCallbacks);
@@ -4199 +4205 @@
     invalidateCallbackMap(m_autocorrectionCallbacks);
     invalidateCallbackMap(m_autocorrectionContextCallbacks);
+    invalidateCallbackMap(m_dictationContextCallbacks);
 #endif
 #if PLATFORM(GTK)