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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 12570005: Update user gesture related code to the new WebKit API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates 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 | « content/renderer/render_view_mouse_lock_dispatcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index b2eacb0313e385b52bf1b0515f75a03f2aaa7c0b..35f29b23ac4aa04122236233bfdcf95cfe016e6d 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -63,6 +63,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintScalingOption.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureIndicator.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkRect.h"
@@ -134,6 +135,7 @@ using WebKit::WebPrintScalingOption;
using WebKit::WebScopedUserGesture;
using WebKit::WebString;
using WebKit::WebURLRequest;
+using WebKit::WebUserGestureIndicator;
using WebKit::WebView;
namespace webkit {
@@ -777,8 +779,7 @@ bool PluginInstance::HandleInputEvent(const WebKit::WebInputEvent& event,
// Allow the user gesture to be pending after the plugin handles the
// event. This allows out-of-process plugins to respond to the user
// gesture after processing has finished here.
- WebFrame* frame = container_->element().document().frame();
- if (frame->isProcessingUserGesture()) {
+ if (WebUserGestureIndicator::isProcessingUserGesture()) {
pending_user_gesture_ =
::ppapi::EventTimeToPPTimeTicks(event.timeStampSeconds);
}
« no previous file with comments | « content/renderer/render_view_mouse_lock_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698