diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 07:04:31 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 07:04:31 +0000 |
| commit | f73feaf7fed34e62c31bf5a86436c561290ec9ed (patch) | |
| tree | 5d87fb7386f76b779aff1bcb49e848db2b15411b /webkit | |
| parent | bf01714253b7e6d10c7092f0e1dbde157a733d66 (diff) | |
| download | chromium_src-f73feaf7fed34e62c31bf5a86436c561290ec9ed.zip chromium_src-f73feaf7fed34e62c31bf5a86436c561290ec9ed.tar.gz chromium_src-f73feaf7fed34e62c31bf5a86436c561290ec9ed.tar.bz2 | |
Ppapi: remove the code for closing pending user gesture.
The code is a no-op currently. We set a timeout for user gesture at the renderer side, instead of relying on well-behaved plugins sending back messages to close user gesture.
TEST=None
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11664014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 10 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.h | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index c326528..0b15838 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1765,8 +1765,7 @@ bool PluginInstance::IsFullPagePlugin() const { bool PluginInstance::IsProcessingUserGesture() { PP_TimeTicks now = ::ppapi::TimeTicksToPPTimeTicks(base::TimeTicks::Now()); - // Give a lot of slack so tests won't be flaky. Well behaved plugins will - // close the user gesture. + // Give a lot of slack so tests won't be flaky. const PP_TimeTicks kUserGestureDurationInSeconds = 10.0; return (now - pending_user_gesture_ < kUserGestureDurationInSeconds); } @@ -1872,13 +1871,6 @@ ContentDecryptorDelegate* PluginInstance::GetContentDecryptorDelegate() { return content_decryptor_delegate_.get(); } -void PluginInstance::ClosePendingUserGesture(PP_Instance instance, - PP_TimeTicks timestamp) { - // Do nothing so that the pending user gesture will stay open for - // kUserGestureDurationInSeconds. - // TODO(yzshen): remove the code for closing pending user gesture. -} - PP_Bool PluginInstance::BindGraphics(PP_Instance instance, PP_Resource device) { TRACE_EVENT0("ppapi", "PluginInstance::BindGraphics"); diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index f58850e..da6d4a5 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -381,8 +381,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : uint32_t event_classes) OVERRIDE; virtual void ClearInputEventRequest(PP_Instance instance, uint32_t event_classes) OVERRIDE; - virtual void ClosePendingUserGesture(PP_Instance instance, - PP_TimeTicks timestamp); virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE; virtual void ZoomLimitsChanged(PP_Instance instance, double minimum_factor, |