| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 uint32_t RenderWidgetHostViewChildFrame::GetSurfaceIdNamespace() { | 487 uint32_t RenderWidgetHostViewChildFrame::GetSurfaceIdNamespace() { |
| 488 return id_allocator_->id_namespace(); | 488 return id_allocator_->id_namespace(); |
| 489 } | 489 } |
| 490 | 490 |
| 491 void RenderWidgetHostViewChildFrame::ProcessKeyboardEvent( | 491 void RenderWidgetHostViewChildFrame::ProcessKeyboardEvent( |
| 492 const NativeWebKeyboardEvent& event) { | 492 const NativeWebKeyboardEvent& event) { |
| 493 host_->ForwardKeyboardEvent(event); | 493 host_->ForwardKeyboardEvent(event); |
| 494 } | 494 } |
| 495 | 495 |
| 496 void RenderWidgetHostViewChildFrame::ProcessMouseEvent( | 496 void RenderWidgetHostViewChildFrame::ProcessMouseEvent( |
| 497 const blink::WebMouseEvent& event) { | 497 const blink::WebMouseEvent& event, |
| 498 host_->ForwardMouseEvent(event); | 498 const ui::LatencyInfo& latency) { |
| 499 host_->ForwardMouseEventWithLatencyInfo(event, latency); |
| 499 } | 500 } |
| 500 | 501 |
| 501 void RenderWidgetHostViewChildFrame::ProcessMouseWheelEvent( | 502 void RenderWidgetHostViewChildFrame::ProcessMouseWheelEvent( |
| 502 const blink::WebMouseWheelEvent& event) { | 503 const blink::WebMouseWheelEvent& event, |
| 504 const ui::LatencyInfo& latency) { |
| 503 if (event.deltaX != 0 || event.deltaY != 0) | 505 if (event.deltaX != 0 || event.deltaY != 0) |
| 504 host_->ForwardWheelEvent(event); | 506 host_->ForwardWheelEventWithLatencyInfo(event, latency); |
| 505 } | 507 } |
| 506 | 508 |
| 507 void RenderWidgetHostViewChildFrame::ProcessTouchEvent( | 509 void RenderWidgetHostViewChildFrame::ProcessTouchEvent( |
| 508 const blink::WebTouchEvent& event, | 510 const blink::WebTouchEvent& event, |
| 509 const ui::LatencyInfo& latency) { | 511 const ui::LatencyInfo& latency) { |
| 510 if (event.type == blink::WebInputEvent::TouchStart && | 512 if (event.type == blink::WebInputEvent::TouchStart && |
| 511 frame_connector_ && !frame_connector_->HasFocus()) { | 513 frame_connector_ && !frame_connector_->HasFocus()) { |
| 512 frame_connector_->FocusRootView(); | 514 frame_connector_->FocusRootView(); |
| 513 } | 515 } |
| 514 | 516 |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 | 688 |
| 687 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { | 689 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { |
| 688 return true; | 690 return true; |
| 689 } | 691 } |
| 690 | 692 |
| 691 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 693 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
| 692 return surface_id_; | 694 return surface_id_; |
| 693 }; | 695 }; |
| 694 | 696 |
| 695 } // namespace content | 697 } // namespace content |
| OLD | NEW |