| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/memory/shared_memory.h" | 9 #include "base/memory/shared_memory.h" |
| 10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 } | 93 } |
| 94 void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override { | 94 void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override { |
| 95 send_touch_event_not_cancelled_ = | 95 send_touch_event_not_cancelled_ = |
| 96 client_->FilterInputEvent(touch_event.event, touch_event.latency) == | 96 client_->FilterInputEvent(touch_event.event, touch_event.latency) == |
| 97 INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 97 INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 98 } | 98 } |
| 99 const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override { | 99 const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override { |
| 100 NOTREACHED(); | 100 NOTREACHED(); |
| 101 return NULL; | 101 return NULL; |
| 102 } | 102 } |
| 103 bool ShouldForwardTouchEvent() const override { return true; } | |
| 104 void OnViewUpdated(int view_flags) override {} | 103 void OnViewUpdated(int view_flags) override {} |
| 105 bool HasPendingEvents() const override { return false; } | 104 bool HasPendingEvents() const override { return false; } |
| 106 | 105 |
| 107 // IPC::Listener | 106 // IPC::Listener |
| 108 bool OnMessageReceived(const IPC::Message& message) override { | 107 bool OnMessageReceived(const IPC::Message& message) override { |
| 109 message_received_ = true; | 108 message_received_ = true; |
| 110 return false; | 109 return false; |
| 111 } | 110 } |
| 112 | 111 |
| 113 bool flush_called_; | 112 bool flush_called_; |
| (...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1469 // Having an initial size set means that the size information had been sent | 1468 // Having an initial size set means that the size information had been sent |
| 1470 // with the reqiest to new up the RenderView and so subsequent WasResized | 1469 // with the reqiest to new up the RenderView and so subsequent WasResized |
| 1471 // calls should not result in new IPC (unless the size has actually changed). | 1470 // calls should not result in new IPC (unless the size has actually changed). |
| 1472 host_->WasResized(); | 1471 host_->WasResized(); |
| 1473 EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID)); | 1472 EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID)); |
| 1474 EXPECT_EQ(initial_size_, host_->old_resize_params_->new_size); | 1473 EXPECT_EQ(initial_size_, host_->old_resize_params_->new_size); |
| 1475 EXPECT_TRUE(host_->resize_ack_pending_); | 1474 EXPECT_TRUE(host_->resize_ack_pending_); |
| 1476 } | 1475 } |
| 1477 | 1476 |
| 1478 } // namespace content | 1477 } // namespace content |
| OLD | NEW |