summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 19:40:35 +0000
committerjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 19:40:35 +0000
commit61284c600caf28c8472fdbad49811e7fc53a59fd (patch)
treec2c5f499f7a905a08db16d3baca2a723f527450c /content
parent5c1569ed7289c6c5cd3bb501e094312f80602e17 (diff)
downloadchromium_src-61284c600caf28c8472fdbad49811e7fc53a59fd.zip
chromium_src-61284c600caf28c8472fdbad49811e7fc53a59fd.tar.gz
chromium_src-61284c600caf28c8472fdbad49811e7fc53a59fd.tar.bz2
Rename ImmediateInputRouter to InputRouterImpl
With but a single implementation of the InputRouter for the forseeable future, the 'Immediate' prefix of the ImmediateInputRouter is both unnecessary and confusing. Rename appropriately to InputRouterImpl. BUG=302663 Review URL: https://codereview.chromium.org/99473002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/input/input_router_impl.cc (renamed from content/browser/renderer_host/input/immediate_input_router.cc)135
-rw-r--r--content/browser/renderer_host/input/input_router_impl.h (renamed from content/browser/renderer_host/input/immediate_input_router.h)25
-rw-r--r--content/browser/renderer_host/input/input_router_impl_unittest.cc (renamed from content/browser/renderer_host/input/immediate_input_router_unittest.cc)60
-rw-r--r--content/browser/renderer_host/render_widget_host_impl.cc8
-rw-r--r--content/browser/renderer_host/render_widget_host_unittest.cc17
-rw-r--r--content/content_browser.gypi4
-rw-r--r--content/content_tests.gypi2
7 files changed, 120 insertions, 131 deletions
diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/input_router_impl.cc
index 4fa30aa..32f3d89 100644
--- a/content/browser/renderer_host/input/immediate_input_router.cc
+++ b/content/browser/renderer_host/input/input_router_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/renderer_host/input/immediate_input_router.h"
+#include "content/browser/renderer_host/input/input_router_impl.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
@@ -72,10 +72,10 @@ const char* GetEventAckName(InputEventAckState ack_result) {
} // namespace
-ImmediateInputRouter::ImmediateInputRouter(IPC::Sender* sender,
- InputRouterClient* client,
- InputAckHandler* ack_handler,
- int routing_id)
+InputRouterImpl::InputRouterImpl(IPC::Sender* sender,
+ InputRouterClient* client,
+ InputAckHandler* ack_handler,
+ int routing_id)
: sender_(sender),
client_(client),
ack_handler_(ack_handler),
@@ -93,12 +93,11 @@ ImmediateInputRouter::ImmediateInputRouter(IPC::Sender* sender,
DCHECK(ack_handler);
}
-ImmediateInputRouter::~ImmediateInputRouter() {
-}
+InputRouterImpl::~InputRouterImpl() {}
-void ImmediateInputRouter::Flush() {}
+void InputRouterImpl::Flush() {}
-bool ImmediateInputRouter::SendInput(scoped_ptr<IPC::Message> message) {
+bool InputRouterImpl::SendInput(scoped_ptr<IPC::Message> message) {
DCHECK(IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart);
switch (message->type()) {
// Check for types that require an ACK.
@@ -114,7 +113,7 @@ bool ImmediateInputRouter::SendInput(scoped_ptr<IPC::Message> message) {
}
}
-void ImmediateInputRouter::SendMouseEvent(
+void InputRouterImpl::SendMouseEvent(
const MouseEventWithLatencyInfo& mouse_event) {
// Order is important here; we need to convert all MouseEvents before they
// propagate further, e.g., to the tap suppression controller.
@@ -136,7 +135,7 @@ void ImmediateInputRouter::SendMouseEvent(
SendMouseEventImmediately(mouse_event);
}
-void ImmediateInputRouter::SendWheelEvent(
+void InputRouterImpl::SendWheelEvent(
const MouseWheelEventWithLatencyInfo& wheel_event) {
// If there's already a mouse wheel event waiting to be sent to the renderer,
// add the new deltas to that event. Not doing so (e.g., by dropping the old
@@ -160,10 +159,9 @@ void ImmediateInputRouter::SendWheelEvent(
FilterAndSendWebInputEvent(wheel_event.event, wheel_event.latency, false);
}
-void ImmediateInputRouter::SendKeyboardEvent(
- const NativeWebKeyboardEvent& key_event,
- const ui::LatencyInfo& latency_info,
- bool is_keyboard_shortcut) {
+void InputRouterImpl::SendKeyboardEvent(const NativeWebKeyboardEvent& key_event,
+ const ui::LatencyInfo& latency_info,
+ bool is_keyboard_shortcut) {
// Put all WebKeyboardEvent objects in a queue since we can't trust the
// renderer and we need to give something to the HandleKeyboardEvent
// handler.
@@ -176,7 +174,7 @@ void ImmediateInputRouter::SendKeyboardEvent(
FilterAndSendWebInputEvent(key_event, latency_info, is_keyboard_shortcut);
}
-void ImmediateInputRouter::SendGestureEvent(
+void InputRouterImpl::SendGestureEvent(
const GestureEventWithLatencyInfo& gesture_event) {
HandleGestureScroll(gesture_event);
@@ -191,14 +189,14 @@ void ImmediateInputRouter::SendGestureEvent(
FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
}
-void ImmediateInputRouter::SendTouchEvent(
+void InputRouterImpl::SendTouchEvent(
const TouchEventWithLatencyInfo& touch_event) {
touch_event_queue_->QueueEvent(touch_event);
}
// Forwards MouseEvent without passing it through
// TouchpadTapSuppressionController.
-void ImmediateInputRouter::SendMouseEventImmediately(
+void InputRouterImpl::SendMouseEventImmediately(
const MouseEventWithLatencyInfo& mouse_event) {
// Avoid spamming the renderer with mouse move events. It is important
// to note that WM_MOUSEMOVE events are anyways synthetic, but since our
@@ -218,25 +216,24 @@ void ImmediateInputRouter::SendMouseEventImmediately(
FilterAndSendWebInputEvent(mouse_event.event, mouse_event.latency, false);
}
-void ImmediateInputRouter::SendTouchEventImmediately(
+void InputRouterImpl::SendTouchEventImmediately(
const TouchEventWithLatencyInfo& touch_event) {
FilterAndSendWebInputEvent(touch_event.event, touch_event.latency, false);
}
-void ImmediateInputRouter::SendGestureEventImmediately(
+void InputRouterImpl::SendGestureEventImmediately(
const GestureEventWithLatencyInfo& gesture_event) {
HandleGestureScroll(gesture_event);
FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
}
-const NativeWebKeyboardEvent*
- ImmediateInputRouter::GetLastKeyboardEvent() const {
+const NativeWebKeyboardEvent* InputRouterImpl::GetLastKeyboardEvent() const {
if (key_queue_.empty())
return NULL;
return &key_queue_.front();
}
-bool ImmediateInputRouter::ShouldForwardTouchEvent() const {
+bool InputRouterImpl::ShouldForwardTouchEvent() const {
// Always send a touch event if the renderer has a touch-event handler. It is
// possible that a renderer stops listening to touch-events while there are
// still events in the touch-queue. In such cases, the new events should still
@@ -244,10 +241,10 @@ bool ImmediateInputRouter::ShouldForwardTouchEvent() const {
return has_touch_handler_ || !touch_event_queue_->empty();
}
-bool ImmediateInputRouter::OnMessageReceived(const IPC::Message& message) {
+bool InputRouterImpl::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
bool message_is_ok = true;
- IPC_BEGIN_MESSAGE_MAP_EX(ImmediateInputRouter, message, message_is_ok)
+ IPC_BEGIN_MESSAGE_MAP_EX(InputRouterImpl, message, message_is_ok)
IPC_MESSAGE_HANDLER(InputHostMsg_HandleInputEvent_ACK, OnInputEventAck)
IPC_MESSAGE_HANDLER(ViewHostMsg_MoveCaret_ACK, OnMsgMoveCaretAck)
IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnSelectRangeAck)
@@ -262,20 +259,19 @@ bool ImmediateInputRouter::OnMessageReceived(const IPC::Message& message) {
return handled;
}
-void ImmediateInputRouter::OnTouchEventAck(
- const TouchEventWithLatencyInfo& event,
- InputEventAckState ack_result) {
+void InputRouterImpl::OnTouchEventAck(const TouchEventWithLatencyInfo& event,
+ InputEventAckState ack_result) {
ack_handler_->OnTouchEventAck(event, ack_result);
}
-void ImmediateInputRouter::OnGestureEventAck(
+void InputRouterImpl::OnGestureEventAck(
const GestureEventWithLatencyInfo& event,
InputEventAckState ack_result) {
ProcessAckForOverscroll(event.event, ack_result);
ack_handler_->OnGestureEventAck(event, ack_result);
}
-bool ImmediateInputRouter::SendSelectRange(scoped_ptr<IPC::Message> message) {
+bool InputRouterImpl::SendSelectRange(scoped_ptr<IPC::Message> message) {
DCHECK(message->type() == InputMsg_SelectRange::ID);
if (select_range_pending_) {
next_selection_range_ = message.Pass();
@@ -286,7 +282,7 @@ bool ImmediateInputRouter::SendSelectRange(scoped_ptr<IPC::Message> message) {
return Send(message.release());
}
-bool ImmediateInputRouter::SendMoveCaret(scoped_ptr<IPC::Message> message) {
+bool InputRouterImpl::SendMoveCaret(scoped_ptr<IPC::Message> message) {
DCHECK(message->type() == InputMsg_MoveCaret::ID);
if (move_caret_pending_) {
next_move_caret_ = message.Pass();
@@ -297,16 +293,18 @@ bool ImmediateInputRouter::SendMoveCaret(scoped_ptr<IPC::Message> message) {
return Send(message.release());
}
-bool ImmediateInputRouter::Send(IPC::Message* message) {
+bool InputRouterImpl::Send(IPC::Message* message) {
return sender_->Send(message);
}
-void ImmediateInputRouter::FilterAndSendWebInputEvent(
+void InputRouterImpl::FilterAndSendWebInputEvent(
const WebInputEvent& input_event,
const ui::LatencyInfo& latency_info,
bool is_keyboard_shortcut) {
- TRACE_EVENT1("input", "ImmediateInputRouter::FilterAndSendWebInputEvent",
- "type", WebInputEventTraits::GetName(input_event.type));
+ TRACE_EVENT1("input",
+ "InputRouterImpl::FilterAndSendWebInputEvent",
+ "type",
+ WebInputEventTraits::GetName(input_event.type));
// Transmit any pending wheel events on a non-wheel event. This ensures that
// final PhaseEnded wheel event is received, which is necessary to terminate
@@ -327,9 +325,9 @@ void ImmediateInputRouter::FilterAndSendWebInputEvent(
OfferToHandlers(input_event, latency_info, is_keyboard_shortcut);
}
-void ImmediateInputRouter::OfferToHandlers(const WebInputEvent& input_event,
- const ui::LatencyInfo& latency_info,
- bool is_keyboard_shortcut) {
+void InputRouterImpl::OfferToHandlers(const WebInputEvent& input_event,
+ const ui::LatencyInfo& latency_info,
+ bool is_keyboard_shortcut) {
if (OfferToOverscrollController(input_event, latency_info))
return;
@@ -347,7 +345,7 @@ void ImmediateInputRouter::OfferToHandlers(const WebInputEvent& input_event,
}
}
-bool ImmediateInputRouter::OfferToOverscrollController(
+bool InputRouterImpl::OfferToOverscrollController(
const WebInputEvent& input_event,
const ui::LatencyInfo& latency_info) {
OverscrollController* controller = client_->GetOverscrollController();
@@ -382,8 +380,8 @@ bool ImmediateInputRouter::OfferToOverscrollController(
return consumed;
}
-bool ImmediateInputRouter::OfferToClient(const WebInputEvent& input_event,
- const ui::LatencyInfo& latency_info) {
+bool InputRouterImpl::OfferToClient(const WebInputEvent& input_event,
+ const ui::LatencyInfo& latency_info) {
bool consumed = false;
InputEventAckState filter_ack =
@@ -408,7 +406,7 @@ bool ImmediateInputRouter::OfferToClient(const WebInputEvent& input_event,
return consumed;
}
-bool ImmediateInputRouter::OfferToRenderer(const WebInputEvent& input_event,
+bool InputRouterImpl::OfferToRenderer(const WebInputEvent& input_event,
const ui::LatencyInfo& latency_info,
bool is_keyboard_shortcut) {
input_event_start_time_ = TimeTicks::Now();
@@ -420,10 +418,9 @@ bool ImmediateInputRouter::OfferToRenderer(const WebInputEvent& input_event,
return false;
}
-void ImmediateInputRouter::OnInputEventAck(
- WebInputEvent::Type event_type,
- InputEventAckState ack_result,
- const ui::LatencyInfo& latency_info) {
+void InputRouterImpl::OnInputEventAck(WebInputEvent::Type event_type,
+ InputEventAckState ack_result,
+ const ui::LatencyInfo& latency_info) {
// Log the time delta for processing an input event.
TimeDelta delta = TimeTicks::Now() - input_event_start_time_;
UMA_HISTOGRAM_TIMES("MPArch.IIR_InputEventDelta", delta);
@@ -451,19 +448,19 @@ void ImmediateInputRouter::OnInputEventAck(
Details<int>(&type));
}
-void ImmediateInputRouter::OnMsgMoveCaretAck() {
+void InputRouterImpl::OnMsgMoveCaretAck() {
move_caret_pending_ = false;
if (next_move_caret_)
SendMoveCaret(next_move_caret_.Pass());
}
-void ImmediateInputRouter::OnSelectRangeAck() {
+void InputRouterImpl::OnSelectRangeAck() {
select_range_pending_ = false;
if (next_selection_range_)
SendSelectRange(next_selection_range_.Pass());
}
-void ImmediateInputRouter::OnHasTouchEventHandlers(bool has_handlers) {
+void InputRouterImpl::OnHasTouchEventHandlers(bool has_handlers) {
if (has_touch_handler_ == has_handlers)
return;
has_touch_handler_ = has_handlers;
@@ -472,12 +469,12 @@ void ImmediateInputRouter::OnHasTouchEventHandlers(bool has_handlers) {
client_->OnHasTouchEventHandlers(has_handlers);
}
-void ImmediateInputRouter::ProcessInputEventAck(
+void InputRouterImpl::ProcessInputEventAck(
WebInputEvent::Type event_type,
InputEventAckState ack_result,
const ui::LatencyInfo& latency_info,
AckSource ack_source) {
- TRACE_EVENT2("input", "ImmediateInputRouter::ProcessInputEventAck",
+ TRACE_EVENT2("input", "InputRouterImpl::ProcessInputEventAck",
"type", WebInputEventTraits::GetName(event_type),
"ack", GetEventAckName(ack_result));
@@ -506,9 +503,8 @@ void ImmediateInputRouter::ProcessInputEventAck(
}
}
-void ImmediateInputRouter::ProcessKeyboardAck(
- blink::WebInputEvent::Type type,
- InputEventAckState ack_result) {
+void InputRouterImpl::ProcessKeyboardAck(blink::WebInputEvent::Type type,
+ InputEventAckState ack_result) {
if (key_queue_.empty()) {
ack_handler_->OnUnexpectedEventAck(InputAckHandler::UNEXPECTED_ACK);
} else if (key_queue_.front().type != type) {
@@ -521,15 +517,15 @@ void ImmediateInputRouter::ProcessKeyboardAck(
key_queue_.pop_front();
ack_handler_->OnKeyboardEventAck(front_item, ack_result);
- // WARNING: This ImmediateInputRouter can be deallocated at this point
+ // WARNING: This InputRouterImpl can be deallocated at this point
// (i.e. in the case of Ctrl+W, where the call to
- // HandleKeyboardEvent destroys this ImmediateInputRouter).
+ // HandleKeyboardEvent destroys this InputRouterImpl).
// TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async.
}
}
-void ImmediateInputRouter::ProcessMouseAck(blink::WebInputEvent::Type type,
- InputEventAckState ack_result) {
+void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type,
+ InputEventAckState ack_result) {
if (type != WebInputEvent::MouseMove)
return;
@@ -543,8 +539,8 @@ void ImmediateInputRouter::ProcessMouseAck(blink::WebInputEvent::Type type,
}
}
-void ImmediateInputRouter::ProcessWheelAck(InputEventAckState ack_result,
- const ui::LatencyInfo& latency) {
+void InputRouterImpl::ProcessWheelAck(InputEventAckState ack_result,
+ const ui::LatencyInfo& latency) {
ProcessAckForOverscroll(current_wheel_event_.event, ack_result);
// TODO(miletus): Add renderer side latency to each uncoalesced mouse
@@ -564,9 +560,9 @@ void ImmediateInputRouter::ProcessWheelAck(InputEventAckState ack_result,
}
}
-void ImmediateInputRouter::ProcessGestureAck(WebInputEvent::Type type,
- InputEventAckState ack_result,
- const ui::LatencyInfo& latency) {
+void InputRouterImpl::ProcessGestureAck(WebInputEvent::Type type,
+ InputEventAckState ack_result,
+ const ui::LatencyInfo& latency) {
// If |ack_result| originated from the overscroll controller, only
// feed |gesture_event_filter_| the ack if it was expecting one.
if (current_ack_source_ == OVERSCROLL_CONTROLLER &&
@@ -578,16 +574,15 @@ void ImmediateInputRouter::ProcessGestureAck(WebInputEvent::Type type,
gesture_event_filter_->ProcessGestureAck(ack_result, type, latency);
}
-void ImmediateInputRouter::ProcessTouchAck(
+void InputRouterImpl::ProcessTouchAck(
InputEventAckState ack_result,
const ui::LatencyInfo& latency) {
// |touch_event_queue_| will forward to OnTouchEventAck when appropriate.
touch_event_queue_->ProcessTouchAck(ack_result, latency);
}
-void ImmediateInputRouter::ProcessAckForOverscroll(
- const WebInputEvent& event,
- InputEventAckState ack_result) {
+void InputRouterImpl::ProcessAckForOverscroll(const WebInputEvent& event,
+ InputEventAckState ack_result) {
// Acks sent from the overscroll controller need not be fed back into the
// overscroll controller.
if (current_ack_source_ == OVERSCROLL_CONTROLLER)
@@ -601,12 +596,12 @@ void ImmediateInputRouter::ProcessAckForOverscroll(
event, (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result));
}
-void ImmediateInputRouter::HandleGestureScroll(
+void InputRouterImpl::HandleGestureScroll(
const GestureEventWithLatencyInfo& gesture_event) {
touch_event_queue_->OnGestureScrollEvent(gesture_event);
}
-void ImmediateInputRouter::SimulateTouchGestureWithMouse(
+void InputRouterImpl::SimulateTouchGestureWithMouse(
const MouseEventWithLatencyInfo& event) {
const WebMouseEvent& mouse_event = event.event;
int x = mouse_event.x, y = mouse_event.y;
@@ -686,7 +681,7 @@ void ImmediateInputRouter::SimulateTouchGestureWithMouse(
}
}
-bool ImmediateInputRouter::IsInOverscrollGesture() const {
+bool InputRouterImpl::IsInOverscrollGesture() const {
OverscrollController* controller = client_->GetOverscrollController();
return controller && controller->overscroll_mode() != OVERSCROLL_NONE;
}
diff --git a/content/browser/renderer_host/input/immediate_input_router.h b/content/browser/renderer_host/input/input_router_impl.h
index 56e4987..481422a 100644
--- a/content/browser/renderer_host/input/immediate_input_router.h
+++ b/content/browser/renderer_host/input/input_router_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
+#define CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
#include <queue>
@@ -31,19 +31,18 @@ class InputRouterClient;
class OverscrollController;
class RenderWidgetHostImpl;
-// A default implementation for browser input event routing. Input commands are
-// forwarded to the renderer immediately upon receipt.
-class CONTENT_EXPORT ImmediateInputRouter
+// A default implementation for browser input event routing.
+class CONTENT_EXPORT InputRouterImpl
: public NON_EXPORTED_BASE(InputRouter),
public NON_EXPORTED_BASE(GestureEventFilterClient),
public NON_EXPORTED_BASE(TouchEventQueueClient),
public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient) {
public:
- ImmediateInputRouter(IPC::Sender* sender,
- InputRouterClient* client,
- InputAckHandler* ack_handler,
- int routing_id);
- virtual ~ImmediateInputRouter();
+ InputRouterImpl(IPC::Sender* sender,
+ InputRouterClient* client,
+ InputAckHandler* ack_handler,
+ int routing_id);
+ virtual ~InputRouterImpl();
// InputRouter
virtual void Flush() OVERRIDE;
@@ -67,7 +66,7 @@ class CONTENT_EXPORT ImmediateInputRouter
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private:
- friend class ImmediateInputRouterTest;
+ friend class InputRouterImplTest;
friend class MockRenderWidgetHost;
// TouchpadTapSuppressionControllerClient
@@ -242,9 +241,9 @@ private:
scoped_ptr<TouchEventQueue> touch_event_queue_;
scoped_ptr<GestureEventFilter> gesture_event_filter_;
- DISALLOW_COPY_AND_ASSIGN(ImmediateInputRouter);
+ DISALLOW_COPY_AND_ASSIGN(InputRouterImpl);
};
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_
+#endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_IMPL_H_
diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc
index 90e7aca..dd792a7 100644
--- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
@@ -6,8 +6,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "content/browser/renderer_host/input/gesture_event_filter.h"
-#include "content/browser/renderer_host/input/immediate_input_router.h"
#include "content/browser/renderer_host/input/input_router_client.h"
+#include "content/browser/renderer_host/input/input_router_impl.h"
#include "content/browser/renderer_host/input/mock_input_ack_handler.h"
#include "content/browser/renderer_host/input/mock_input_router_client.h"
#include "content/common/content_constants_internal.h"
@@ -105,10 +105,10 @@ bool EventListIsSubset(const ScopedVector<ui::TouchEvent>& subset,
} // namespace
-class ImmediateInputRouterTest : public testing::Test {
+class InputRouterImplTest : public testing::Test {
public:
- ImmediateInputRouterTest() {}
- virtual ~ImmediateInputRouterTest() {}
+ InputRouterImplTest() {}
+ virtual ~InputRouterImplTest() {}
protected:
// testing::Test
@@ -117,12 +117,10 @@ class ImmediateInputRouterTest : public testing::Test {
process_.reset(new MockRenderProcessHost(browser_context_.get()));
client_.reset(new MockInputRouterClient());
ack_handler_.reset(new MockInputAckHandler());
- input_router_.reset(new ImmediateInputRouter(process_.get(),
- client_.get(),
- ack_handler_.get(),
- MSG_ROUTING_NONE));
- input_router_->gesture_event_filter_->
- set_debounce_enabled_for_testing(false);
+ input_router_.reset(new InputRouterImpl(
+ process_.get(), client_.get(), ack_handler_.get(), MSG_ROUTING_NONE));
+ input_router_->gesture_event_filter_->set_debounce_enabled_for_testing(
+ false);
client_->set_input_router(input_router());
ack_handler_->set_input_router(input_router());
}
@@ -258,7 +256,7 @@ class ImmediateInputRouterTest : public testing::Test {
input_router_->OnMessageReceived(*response);
}
- ImmediateInputRouter* input_router() const {
+ InputRouterImpl* input_router() const {
return input_router_.get();
}
@@ -279,7 +277,7 @@ class ImmediateInputRouterTest : public testing::Test {
scoped_ptr<MockRenderProcessHost> process_;
scoped_ptr<MockInputRouterClient> client_;
scoped_ptr<MockInputAckHandler> ack_handler_;
- scoped_ptr<ImmediateInputRouter> input_router_;
+ scoped_ptr<InputRouterImpl> input_router_;
private:
base::MessageLoopForUI message_loop_;
@@ -288,7 +286,7 @@ class ImmediateInputRouterTest : public testing::Test {
scoped_ptr<TestBrowserContext> browser_context_;
};
-TEST_F(ImmediateInputRouterTest, CoalescesRangeSelection) {
+TEST_F(InputRouterImplTest, CoalescesRangeSelection) {
input_router_->SendInput(scoped_ptr<IPC::Message>(
new InputMsg_SelectRange(0, gfx::Point(1, 2), gfx::Point(3, 4))));
ExpectIPCMessageWithArg2<InputMsg_SelectRange>(
@@ -327,7 +325,7 @@ TEST_F(ImmediateInputRouterTest, CoalescesRangeSelection) {
EXPECT_EQ(0u, GetSentMessageCountAndResetSink());
}
-TEST_F(ImmediateInputRouterTest, CoalescesCaretMove) {
+TEST_F(InputRouterImplTest, CoalescesCaretMove) {
input_router_->SendInput(
scoped_ptr<IPC::Message>(new InputMsg_MoveCaret(0, gfx::Point(1, 2))));
ExpectIPCMessageWithArg1<InputMsg_MoveCaret>(
@@ -362,7 +360,7 @@ TEST_F(ImmediateInputRouterTest, CoalescesCaretMove) {
EXPECT_EQ(0u, GetSentMessageCountAndResetSink());
}
-TEST_F(ImmediateInputRouterTest, HandledInputEvent) {
+TEST_F(InputRouterImplTest, HandledInputEvent) {
client_->set_filter_state(INPUT_EVENT_ACK_STATE_CONSUMED);
// Simulate a keyboard event.
@@ -379,7 +377,7 @@ TEST_F(ImmediateInputRouterTest, HandledInputEvent) {
ASSERT_EQ(NULL, input_router_->GetLastKeyboardEvent());
}
-TEST_F(ImmediateInputRouterTest, ClientCanceledKeyboardEvent) {
+TEST_F(InputRouterImplTest, ClientCanceledKeyboardEvent) {
client_->set_filter_state(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
// Simulate a keyboard event that has no consumer.
@@ -399,7 +397,7 @@ TEST_F(ImmediateInputRouterTest, ClientCanceledKeyboardEvent) {
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
}
-TEST_F(ImmediateInputRouterTest, ShortcutKeyboardEvent) {
+TEST_F(InputRouterImplTest, ShortcutKeyboardEvent) {
SimulateKeyboardEvent(WebInputEvent::RawKeyDown, true);
EXPECT_TRUE(GetIsShortcutFromHandleInputEventMessage(
process_->sink().GetMessageAt(0)));
@@ -411,7 +409,7 @@ TEST_F(ImmediateInputRouterTest, ShortcutKeyboardEvent) {
process_->sink().GetMessageAt(0)));
}
-TEST_F(ImmediateInputRouterTest, NoncorrespondingKeyEvents) {
+TEST_F(InputRouterImplTest, NoncorrespondingKeyEvents) {
SimulateKeyboardEvent(WebInputEvent::RawKeyDown, false);
SendInputEventACK(WebInputEvent::KeyUp,
@@ -421,7 +419,7 @@ TEST_F(ImmediateInputRouterTest, NoncorrespondingKeyEvents) {
// Tests ported from RenderWidgetHostTest --------------------------------------
-TEST_F(ImmediateInputRouterTest, HandleKeyEventsWeSent) {
+TEST_F(InputRouterImplTest, HandleKeyEventsWeSent) {
// Simulate a keyboard event.
SimulateKeyboardEvent(WebInputEvent::RawKeyDown, false);
ASSERT_TRUE(input_router_->GetLastKeyboardEvent());
@@ -441,7 +439,7 @@ TEST_F(ImmediateInputRouterTest, HandleKeyEventsWeSent) {
ack_handler_->acked_keyboard_event().type);
}
-TEST_F(ImmediateInputRouterTest, IgnoreKeyEventsWeDidntSend) {
+TEST_F(InputRouterImplTest, IgnoreKeyEventsWeDidntSend) {
// Send a simulated, unrequested key response. We should ignore this.
SendInputEventACK(WebInputEvent::RawKeyDown,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -449,7 +447,7 @@ TEST_F(ImmediateInputRouterTest, IgnoreKeyEventsWeDidntSend) {
EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
}
-TEST_F(ImmediateInputRouterTest, CoalescesWheelEvents) {
+TEST_F(InputRouterImplTest, CoalescesWheelEvents) {
// Simulate wheel events.
SimulateWheelEvent(0, -5, 0, false); // sent directly
SimulateWheelEvent(0, -10, 0, false); // enqueued
@@ -461,7 +459,7 @@ TEST_F(ImmediateInputRouterTest, CoalescesWheelEvents) {
InputMsg_HandleInputEvent::ID));
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
- // Check that the ACK sends the second message via ImmediateInputForwarder
+ // Check that the ACK sends the second message immediately.
SendInputEventACK(WebInputEvent::MouseWheel,
INPUT_EVENT_ACK_STATE_CONSUMED);
// The coalesced events can queue up a delayed ack
@@ -490,7 +488,7 @@ TEST_F(ImmediateInputRouterTest, CoalescesWheelEvents) {
EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
}
-TEST_F(ImmediateInputRouterTest,
+TEST_F(InputRouterImplTest,
CoalescesWheelEventsQueuedPhaseEndIsNotDropped) {
// Send an initial gesture begin and ACK it.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
@@ -529,7 +527,7 @@ TEST_F(ImmediateInputRouterTest,
}
// Tests that touch-events are queued properly.
-TEST_F(ImmediateInputRouterTest, TouchEventQueue) {
+TEST_F(InputRouterImplTest, TouchEventQueue) {
PressTouchPoint(1, 1);
SendTouchEvent();
EXPECT_TRUE(client_->GetAndResetFilterEventCalled());
@@ -563,7 +561,7 @@ TEST_F(ImmediateInputRouterTest, TouchEventQueue) {
// Tests that the touch-queue is emptied if a page stops listening for touch
// events.
-TEST_F(ImmediateInputRouterTest, TouchEventQueueFlush) {
+TEST_F(InputRouterImplTest, TouchEventQueueFlush) {
input_router_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
EXPECT_TRUE(client_->has_touch_handler());
EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
@@ -590,7 +588,7 @@ TEST_F(ImmediateInputRouterTest, TouchEventQueueFlush) {
#if defined(OS_WIN) || defined(USE_AURA)
// Tests that the acked events have correct state. (ui::Events are used only on
// windows and aura)
-TEST_F(ImmediateInputRouterTest, AckedTouchEventState) {
+TEST_F(InputRouterImplTest, AckedTouchEventState) {
input_router_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
EXPECT_TRUE(TouchEventQueueEmpty());
@@ -674,7 +672,7 @@ TEST_F(ImmediateInputRouterTest, AckedTouchEventState) {
}
#endif // defined(OS_WIN) || defined(USE_AURA)
-TEST_F(ImmediateInputRouterTest, UnhandledWheelEvent) {
+TEST_F(InputRouterImplTest, UnhandledWheelEvent) {
// Simulate wheel events.
SimulateWheelEvent(0, -5, 0, false); // sent directly
SimulateWheelEvent(0, -10, 0, false); // enqueued
@@ -702,7 +700,7 @@ TEST_F(ImmediateInputRouterTest, UnhandledWheelEvent) {
EXPECT_EQ(ack_handler_->acked_wheel_event().deltaY, -5);
}
-TEST_F(ImmediateInputRouterTest, TouchTypesIgnoringAck) {
+TEST_F(InputRouterImplTest, TouchTypesIgnoringAck) {
int start_type = static_cast<int>(WebInputEvent::TouchStart);
int end_type = static_cast<int>(WebInputEvent::TouchCancel);
for (int i = start_type; i <= end_type; ++i) {
@@ -729,7 +727,7 @@ TEST_F(ImmediateInputRouterTest, TouchTypesIgnoringAck) {
}
}
-TEST_F(ImmediateInputRouterTest, GestureTypesIgnoringAck) {
+TEST_F(InputRouterImplTest, GestureTypesIgnoringAck) {
int start_type = static_cast<int>(WebInputEvent::GestureScrollBegin);
int end_type = static_cast<int>(WebInputEvent::GesturePinchUpdate);
for (int i = start_type; i <= end_type; ++i) {
@@ -748,7 +746,7 @@ TEST_F(ImmediateInputRouterTest, GestureTypesIgnoringAck) {
// Test that GestureShowPress, GestureTapDown and GestureTapCancel events don't
// wait for ACKs.
-TEST_F(ImmediateInputRouterTest, GestureTypesIgnoringAckInterleaved) {
+TEST_F(InputRouterImplTest, GestureTypesIgnoringAckInterleaved) {
// Interleave a few events that do and do not ignore acks, ensuring that
// ack-ignoring events aren't dispatched until all prior events which observe
// their ack disposition have been dispatched.
@@ -821,7 +819,7 @@ TEST_F(ImmediateInputRouterTest, GestureTypesIgnoringAckInterleaved) {
// Test that GestureShowPress events don't get out of order due to
// ignoring their acks.
-TEST_F(ImmediateInputRouterTest, GestureShowPressIsInOrder) {
+TEST_F(InputRouterImplTest, GestureShowPressIsInOrder) {
SimulateGestureEvent(WebInputEvent::GestureTap,
WebGestureEvent::Touchscreen);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 67b3b1f..337180d 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -30,7 +30,7 @@
#include "content/browser/renderer_host/backing_store.h"
#include "content/browser/renderer_host/backing_store_manager.h"
#include "content/browser/renderer_host/dip_util.h"
-#include "content/browser/renderer_host/input/immediate_input_router.h"
+#include "content/browser/renderer_host/input/input_router_impl.h"
#include "content/browser/renderer_host/input/synthetic_gesture.h"
#include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
#include "content/browser/renderer_host/input/synthetic_gesture_target.h"
@@ -225,8 +225,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
accessibility_mode_ =
BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();
- input_router_.reset(
- new ImmediateInputRouter(process_, this, this, routing_id_));
+ input_router_.reset(new InputRouterImpl(process_, this, this, routing_id_));
#if defined(USE_AURA)
bool overscroll_enabled = CommandLine::ForCurrentProcess()->
@@ -1256,8 +1255,7 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
waiting_for_screen_rects_ack_ = false;
// Reset to ensure that input routing works with a new renderer.
- input_router_.reset(
- new ImmediateInputRouter(process_, this, this, routing_id_));
+ input_router_.reset(new InputRouterImpl(process_, this, this, routing_id_));
if (overscroll_controller_)
overscroll_controller_->Reset();
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 033be80..423c8fc 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -10,7 +10,7 @@
#include "content/browser/browser_thread_impl.h"
#include "content/browser/renderer_host/backing_store.h"
#include "content/browser/renderer_host/input/gesture_event_filter.h"
-#include "content/browser/renderer_host/input/immediate_input_router.h"
+#include "content/browser/renderer_host/input/input_router_impl.h"
#include "content/browser/renderer_host/input/tap_suppression_controller.h"
#include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
#include "content/browser/renderer_host/input/touch_event_queue.h"
@@ -198,8 +198,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
int routing_id)
: RenderWidgetHostImpl(delegate, process, routing_id, false),
unresponsive_timer_fired_(false) {
- immediate_input_router_ =
- static_cast<ImmediateInputRouter*>(input_router_.get());
+ input_router_impl_ = static_cast<InputRouterImpl*>(input_router_.get());
}
// Allow poking at a few private members.
@@ -318,24 +317,24 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
}
const TouchEventQueue* touch_event_queue() const {
- return immediate_input_router_->touch_event_queue_.get();
+ return input_router_impl_->touch_event_queue_.get();
}
const GestureEventFilter* gesture_event_filter() const {
- return immediate_input_router_->gesture_event_filter_.get();
+ return input_router_impl_->gesture_event_filter_.get();
}
GestureEventFilter* gesture_event_filter() {
- return immediate_input_router_->gesture_event_filter_.get();
+ return input_router_impl_->gesture_event_filter_.get();
}
private:
bool unresponsive_timer_fired_;
- // |immediate_input_router_| and |mock_input_router_| are owned by
- // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so
+ // |input_router_impl_| and |mock_input_router_| are owned by
+ // RenderWidgetHostImpl. The handles below are provided for convenience so
// that we don't have to reinterpret_cast it all the time.
- ImmediateInputRouter* immediate_input_router_;
+ InputRouterImpl* input_router_impl_;
MockInputRouter* mock_input_router_;
scoped_ptr<TestOverscrollDelegate> overscroll_delegate_;
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 5770678..a628a7d 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -832,11 +832,11 @@
'browser/renderer_host/ime_adapter_android.h',
'browser/renderer_host/input/gesture_event_filter.cc',
'browser/renderer_host/input/gesture_event_filter.h',
- 'browser/renderer_host/input/immediate_input_router.cc',
- 'browser/renderer_host/input/immediate_input_router.h',
'browser/renderer_host/input/input_ack_handler.h',
'browser/renderer_host/input/input_router.h',
'browser/renderer_host/input/input_router_client.h',
+ 'browser/renderer_host/input/input_router_impl.cc',
+ 'browser/renderer_host/input/input_router_impl.h',
'browser/renderer_host/input/synthetic_gesture.cc',
'browser/renderer_host/input/synthetic_gesture.h',
'browser/renderer_host/input/synthetic_gesture_controller.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 4b65862..29e1816 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -417,7 +417,7 @@
'browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc',
'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
'browser/renderer_host/input/gesture_event_filter_unittest.cc',
- 'browser/renderer_host/input/immediate_input_router_unittest.cc',
+ 'browser/renderer_host/input/input_router_impl_unittest.cc',
'browser/renderer_host/input/mock_input_ack_handler.cc',
'browser/renderer_host/input/mock_input_ack_handler.h',
'browser/renderer_host/input/mock_input_router_client.cc',