Title: [205498] trunk/Source/WebKit2
- Revision
- 205498
- Author
- [email protected]
- Date
- 2016-09-06 11:55:12 -0700 (Tue, 06 Sep 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205497 => 205498)
--- trunk/Source/WebKit2/ChangeLog 2016-09-06 18:55:02 UTC (rev 205497)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 18:55:12 UTC (rev 205498)
@@ -1,3 +1,20 @@
+2016-09-01 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
Remove SwipeTransitionStyle; only Overlap has ever been used
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (205497 => 205498)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-06 18:55:02 UTC (rev 205497)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-06 18:55:12 UTC (rev 205498)
@@ -2217,7 +2217,7 @@
void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
{
- m_userIsInteracting = true;
+ TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
m_page->pageThrottler().didReceiveUserInput();
@@ -2235,7 +2235,6 @@
if (!shouldHandleEvent) {
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), false));
- m_userIsInteracting = false;
return;
}
@@ -2261,7 +2260,6 @@
}
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
- m_userIsInteracting = false;
}
static bool handleWheelEvent(const WebWheelEvent& wheelEvent, Page* page)
@@ -2297,7 +2295,7 @@
void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
{
- m_userIsInteracting = true;
+ TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
m_page->pageThrottler().didReceiveUserInput();
@@ -2309,8 +2307,6 @@
handled = performDefaultBehaviorForKeyEvent(keyboardEvent);
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled));
-
- m_userIsInteracting = false;
}
void WebPage::validateCommand(const String& commandName, uint64_t callbackID)
@@ -2361,13 +2357,11 @@
#if ENABLE(IOS_TOUCH_EVENTS)
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;
}
void WebPage::touchEventSync(const WebTouchEvent& touchEvent, bool& handled)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
