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