Title: [205725] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 205725
- Author
- [email protected]
- Date
- 2016-09-09 02:29:32 -0700 (Fri, 09 Sep 2016)
Log Message
Merge r205498 - 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: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (205724 => 205725)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-09 09:27:57 UTC (rev 205724)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-09 09:29:32 UTC (rev 205725)
@@ -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 Carlos Garcia Campos <[email protected]>
[GTK][Wayland] evince-browser-plugin prevents viewing PDFs
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (205724 => 205725)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-09 09:27:57 UTC (rev 205724)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-09 09:29:32 UTC (rev 205725)
@@ -2198,7 +2198,7 @@
void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
{
- m_userIsInteracting = true;
+ TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
m_page->pageThrottler().didReceiveUserInput();
@@ -2216,7 +2216,6 @@
if (!shouldHandleEvent) {
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), false));
- m_userIsInteracting = false;
return;
}
@@ -2242,7 +2241,6 @@
}
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
- m_userIsInteracting = false;
}
static bool handleWheelEvent(const WebWheelEvent& wheelEvent, Page* page)
@@ -2278,7 +2276,7 @@
void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
{
- m_userIsInteracting = true;
+ TemporaryChange<bool> userIsInteractingChange { m_userIsInteracting, true };
m_page->pageThrottler().didReceiveUserInput();
@@ -2290,8 +2288,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)
@@ -2342,13 +2338,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
