Changeset 205498 in webkit

Timestamp:

Sep 6, 2016, 11:55:12 AM (9 years ago)

Author:

Simon Fraser

Message:

Use TemporaryChange<> to maintain m_userIsInteracting
​https://bugs.webkit.org/show_bug.cgi?id=161497

Reviewed by Tim Horton.

Replace some error-prone manual set/clear of m_userIsInteracting with
TemporaryChange<>.

No behavior change.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mouseEvent):
(WebKit::WebPage::keyEvent):
(WebKit::WebPage::dispatchTouchEvent):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Use TemporaryChange<> to maintain m_userIsInteracting
+        https://bugs.webkit.org/show_bug.cgi?id=161497
+
+        Reviewed by Tim Horton.
+
+        Replace some error-prone manual set/clear of m_userIsInteracting with
+        TemporaryChange<>.
+
+        No behavior change.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::mouseEvent):
+        (WebKit::WebPage::keyEvent):
+        (WebKit::WebPage::dispatchTouchEvent):
+
 2016-09-06  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2218 +2218 @@
 void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
 {
-    m_userIsInteracting = true;
+    TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
 
     m_page->pageThrottler().didReceiveUserInput();
@@ -2236 +2236 @@
     if (!shouldHandleEvent) {
         send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), false));
-        m_userIsInteracting = false;
         return;
     }
@@ -2262 +2261 @@
 
     send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
-    m_userIsInteracting = false;
 }
 
@@ -2298 +2296 @@
 void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
 {
-    m_userIsInteracting = true;
+    TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
 
     m_page->pageThrottler().didReceiveUserInput();
@@ -2310 +2308 @@
 
     send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled));
-
-    m_userIsInteracting = false;
 }
 
@@ -2362 +2358 @@
 void WebPage::dispatchTouchEvent(const WebTouchEvent& touchEvent, bool& handled)
 {
-    m_userIsInteracting = true;
+    TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
 
     m_lastInteractionLocation = touchEvent.position();
     CurrentEvent currentEvent(touchEvent);
     handled = handleTouchEvent(touchEvent, m_page.get());
-
-    m_userIsInteracting = false;
 }