diff --git a/AUTHORS b/AUTHORS index 0c29cc85c01a54..ce3d7cffb35f9f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -384,7 +384,6 @@ Jihoon Chung Jihun Brent Kim Jin Yang Jincheol Jo -Jinglong Zuo Jingwei Liu Jingyi Wei Jinho Bang diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 8d904ad9bec29b..48d934d02fe75e 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4544,10 +4544,6 @@ void RenderFrameImpl::ShowContextMenu(const blink::WebContextMenuData& data) { } void RenderFrameImpl::ShowDeferredContextMenu(const ContextMenuParams& params) { - // TODO (amaralp): Remove this once selection menu race conditions are fixed. - if (selection_text_.empty() && !params.selection_text.empty()) - return; - Send(new FrameHostMsg_ContextMenu(routing_id_, params)); } diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index bc8a28925f562f..d7262fed15a1ab 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -96,7 +96,6 @@ #include "third_party/blink/public/platform/web_gesture_device.h" #include "third_party/blink/public/platform/web_gesture_event.h" #include "third_party/blink/public/platform/web_input_event.h" -#include #endif #if defined(OS_WIN) @@ -1552,55 +1551,6 @@ TEST_F(RenderViewImplTest, AndroidContextMenuSelectionOrdering) { ExecuteJavaScriptAndReturnIntValue(check_did_select, &did_select)); EXPECT_EQ(1, did_select); } - -TEST_F(RenderViewImplTest, AndroidContextMenuSelectionCleared) { - // Load an HTML page consisting of an input field. - LoadHTML("" - "" - " " - "" - "" - "" - ""); - - WebGestureEvent gesture_event(WebInputEvent::kGestureTap, - WebInputEvent::kNoModifiers, - ui::EventTimeForNow()); - gesture_event.SetPositionInWidget(gfx::PointF(20, 20)); - - SendWebGestureEvent(gesture_event); - - frame()->GetWebFrame()->ExecuteCommand("SelectAll"); - - blink::WebKeyboardEvent event(blink::WebKeyboardEvent::kRawKeyDown, - blink::WebInputEvent::kNoModifiers, - ui::EventTimeForNow()); - event.windows_key_code = ui::VKEY_BACK; - event.native_key_code = AKEYCODE_DEL; - SendWebKeyboardEvent(event); - - scoped_refptr message_loop_runner = - new content::MessageLoopRunner; - blink::scheduler::GetSingleThreadTaskRunnerForTesting()->PostTask( - FROM_HERE, message_loop_runner->QuitClosure()); - - EXPECT_FALSE(render_thread_->sink().GetUniqueMessageMatching( - FrameHostMsg_ContextMenu::ID)); - - message_loop_runner->Run(); - - EXPECT_FALSE(render_thread_->sink().GetUniqueMessageMatching( - FrameHostMsg_ContextMenu::ID)); - - // Check whether text selection is cleared. - blink::WebInputMethodController* controller = - frame()->GetWebFrame()->GetInputMethodController(); - blink::WebTextInputInfo info = controller->TextInputInfo(); - EXPECT_EQ(0, info.selection_start); - EXPECT_EQ(0, info.selection_end); -} - - #endif TEST_F(RenderViewImplTest, TestBackForward) {