| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "content/common/input/synthetic_web_input_event_builders.h" | 9 #include "content/common/input/synthetic_web_input_event_builders.h" |
| 10 #include "content/common/input_messages.h" | 10 #include "content/common/input_messages.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 void SendInputEvent(const blink::WebInputEvent& event) { | 45 void SendInputEvent(const blink::WebInputEvent& event) { |
| 46 OnHandleInputEvent(&event, ui::LatencyInfo(), false); | 46 OnHandleInputEvent(&event, ui::LatencyInfo(), false); |
| 47 } | 47 } |
| 48 | 48 |
| 49 IPC::TestSink* sink() { return &sink_; } | 49 IPC::TestSink* sink() { return &sink_; } |
| 50 | 50 |
| 51 protected: | 51 protected: |
| 52 virtual ~TouchableRenderWidget() {} | 52 virtual ~TouchableRenderWidget() {} |
| 53 | 53 |
| 54 // Overridden from RenderWidget: | 54 // Overridden from RenderWidget: |
| 55 virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const OVERRIDE { | 55 virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const override { |
| 56 for (std::vector<gfx::Rect>::const_iterator iter = rects_.begin(); | 56 for (std::vector<gfx::Rect>::const_iterator iter = rects_.begin(); |
| 57 iter != rects_.end(); ++iter) { | 57 iter != rects_.end(); ++iter) { |
| 58 if ((*iter).Contains(point)) | 58 if ((*iter).Contains(point)) |
| 59 return true; | 59 return true; |
| 60 } | 60 } |
| 61 return false; | 61 return false; |
| 62 } | 62 } |
| 63 | 63 |
| 64 virtual bool Send(IPC::Message* msg) OVERRIDE { | 64 virtual bool Send(IPC::Message* msg) override { |
| 65 sink_.OnMessageReceived(*msg); | 65 sink_.OnMessageReceived(*msg); |
| 66 delete msg; | 66 delete msg; |
| 67 return true; | 67 return true; |
| 68 } | 68 } |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 std::vector<gfx::Rect> rects_; | 71 std::vector<gfx::Rect> rects_; |
| 72 IPC::TestSink sink_; | 72 IPC::TestSink sink_; |
| 73 | 73 |
| 74 DISALLOW_COPY_AND_ASSIGN(TouchableRenderWidget); | 74 DISALLOW_COPY_AND_ASSIGN(TouchableRenderWidget); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 ASSERT_EQ(1u, widget->sink()->message_count()); | 137 ASSERT_EQ(1u, widget->sink()->message_count()); |
| 138 message = widget->sink()->GetMessageAt(0); | 138 message = widget->sink()->GetMessageAt(0); |
| 139 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); | 139 EXPECT_EQ(InputHostMsg_HandleInputEvent_ACK::ID, message->type()); |
| 140 InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms); | 140 InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms); |
| 141 ack_state = params.a.state; | 141 ack_state = params.a.state; |
| 142 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state); | 142 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ack_state); |
| 143 widget->sink()->ClearMessages(); | 143 widget->sink()->ClearMessages(); |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace content | 146 } // namespace content |
| OLD | NEW |