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 "content/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
6 | 6 |
7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
986 message = process_host_->sink().GetMessageAt(0); | 986 message = process_host_->sink().GetMessageAt(0); |
987 break; | 987 break; |
988 case 2: | 988 case 2: |
989 message = process_host_->sink().GetMessageAt(1); | 989 message = process_host_->sink().GetMessageAt(1); |
990 break; | 990 break; |
991 default: | 991 default: |
992 NOTREACHED(); | 992 NOTREACHED(); |
993 break; | 993 break; |
994 } | 994 } |
995 DCHECK(message); | 995 DCHECK(message); |
996 base::Tuple<IPC::WebInputEventPointer, ui::LatencyInfo> data; | 996 base::Tuple<IPC::WebInputEventPointer, ui::LatencyInfo, |
| 997 InputEventDispatchType> |
| 998 data; |
997 InputMsg_HandleInputEvent::Read(message, &data); | 999 InputMsg_HandleInputEvent::Read(message, &data); |
998 IPC::WebInputEventPointer ipc_event = base::get<0>(data); | 1000 IPC::WebInputEventPointer ipc_event = base::get<0>(data); |
999 const blink::WebGestureEvent* gesture_event = | 1001 const blink::WebGestureEvent* gesture_event = |
1000 static_cast<const blink::WebGestureEvent*>(ipc_event); | 1002 static_cast<const blink::WebGestureEvent*>(ipc_event); |
1001 return gesture_event->data.pinchUpdate.zoomDisabled; | 1003 return gesture_event->data.pinchUpdate.zoomDisabled; |
1002 } | 1004 } |
1003 | 1005 |
1004 MockRenderProcessHost* process_host_; | 1006 MockRenderProcessHost* process_host_; |
1005 }; | 1007 }; |
1006 | 1008 |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1120 EXPECT_EQ(1U, process_host_->sink().message_count()); | 1122 EXPECT_EQ(1U, process_host_->sink().message_count()); |
1121 process_host_->sink().ClearMessages(); | 1123 process_host_->sink().ClearMessages(); |
1122 } | 1124 } |
1123 | 1125 |
1124 // Clean up. | 1126 // Clean up. |
1125 host->ShutdownAndDestroyWidget(true); | 1127 host->ShutdownAndDestroyWidget(true); |
1126 } | 1128 } |
1127 | 1129 |
1128 | 1130 |
1129 } // namespace content | 1131 } // namespace content |
OLD | NEW |