Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

Issue 12918021: Merge 145453 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/src/WebNotification.cpp ('k') | Source/WebKit/chromium/src/WebScopedUserGesture.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (revision 146131)
+++ Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (working copy)
@@ -186,7 +186,7 @@
return;
const WebInputEvent* currentInputEvent = WebViewImpl::currentInputEvent();
- UserGestureIndicator gestureIndicator(currentInputEvent && WebInputEvent::isUserGestureEventType(currentInputEvent->type) ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(currentInputEvent && WebInputEvent::isUserGestureEventType(currentInputEvent->type) ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
RefPtr<WebPluginContainerImpl> protector(this);
// The events we pass are defined at:
@@ -445,7 +445,7 @@
}
FrameLoadRequest frameRequest(frame->document()->securityOrigin(), request.toResourceRequest(), target);
- UserGestureIndicator gestureIndicator(request.hasUserGesture() ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(request.hasUserGesture() ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
frame->loader()->loadFrameRequest(frameRequest, false, false, 0, 0, MaybeSendReferrer);
}
« no previous file with comments | « Source/WebKit/chromium/src/WebNotification.cpp ('k') | Source/WebKit/chromium/src/WebScopedUserGesture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698