Merge 146513 - Don't close pending user gesture when PluginInstance receives ACKs for input events.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 1664 matching lines @@
       underline.thick = true;
     underlines.push_back(underline);
   }
 
   delegate()->SimulateImeSetComposition(
       utf16_text, underlines, offsets[0], offsets[1]);
 }
 
 void PluginInstance::ClosePendingUserGesture(PP_Instance instance,
                                              PP_TimeTicks timestamp) {
-  // Close the pending user gesture if the plugin had a chance to respond.
-  // Don't close the pending user gesture if the timestamps are equal since
-  // there may be multiple input events with the same timestamp.
-  if (timestamp > pending_user_gesture_)
-    pending_user_gesture_ = 0.0;
+  // 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) {
   // The Graphics3D instance can't be destroyed until we call
   // setBackingTextureId.
   scoped_refptr< ::ppapi::Resource> old_graphics = bound_graphics_;
   if (bound_graphics_.get()) {
     if (GetBoundGraphics2D()) {
       GetBoundGraphics2D()->BindToInstance(NULL);
@@ skipping 452 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit