| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 0c85cfa42d2fa68afdd45f6a2140816c5e57d98e..e1f1b919f22def986a939921fa1ec1097f361eab 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -764,6 +764,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
|
| renderer_accessibility_(NULL),
|
| media_player_delegate_(NULL),
|
| is_using_lofi_(false),
|
| + is_pasting_(false),
|
| weak_factory_(this) {
|
| std::pair<RoutingIDFrameMap::iterator, bool> result =
|
| g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
|
| @@ -1420,6 +1421,7 @@ void RenderFrameImpl::OnCopy() {
|
|
|
| void RenderFrameImpl::OnPaste() {
|
| base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
|
| + base::AutoReset<bool> handling_paste(&is_pasting_, true);
|
| frame_->executeCommand(WebString::fromUTF8("Paste"), GetFocusedElement());
|
| }
|
|
|
| @@ -1683,10 +1685,7 @@ void RenderFrameImpl::OnExtendSelectionAndDelete(int before, int after) {
|
| if (!GetRenderWidget()->ShouldHandleImeEvent())
|
| return;
|
|
|
| - DCHECK(!WebUserGestureIndicator::isProcessingUserGesture());
|
| -
|
| ImeEventGuard guard(GetRenderWidget());
|
| - blink::WebScopedUserGesture gesture_indicator;
|
| frame_->extendSelectionAndDelete(before, after);
|
| }
|
|
|
| @@ -2091,6 +2090,10 @@ bool RenderFrameImpl::IsUsingLoFi() const {
|
| return is_using_lofi_;
|
| }
|
|
|
| +bool RenderFrameImpl::IsPasting() const {
|
| + return is_pasting_;
|
| +}
|
| +
|
| // blink::WebFrameClient implementation ----------------------------------------
|
|
|
| blink::WebPlugin* RenderFrameImpl::createPlugin(
|
|
|