| 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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 | 481 |
| 482 void RenderWidgetHostViewChildFrame::ProcessMouseEvent( | 482 void RenderWidgetHostViewChildFrame::ProcessMouseEvent( |
| 483 const blink::WebMouseEvent& event, | 483 const blink::WebMouseEvent& event, |
| 484 const ui::LatencyInfo& latency) { | 484 const ui::LatencyInfo& latency) { |
| 485 host_->ForwardMouseEventWithLatencyInfo(event, latency); | 485 host_->ForwardMouseEventWithLatencyInfo(event, latency); |
| 486 } | 486 } |
| 487 | 487 |
| 488 void RenderWidgetHostViewChildFrame::ProcessMouseWheelEvent( | 488 void RenderWidgetHostViewChildFrame::ProcessMouseWheelEvent( |
| 489 const blink::WebMouseWheelEvent& event, | 489 const blink::WebMouseWheelEvent& event, |
| 490 const ui::LatencyInfo& latency) { | 490 const ui::LatencyInfo& latency) { |
| 491 if (event.delta_x != 0 || event.delta_y != 0) | 491 if (event.delta_x != 0 || event.delta_y != 0 || |
| 492 event.phase == blink::WebMouseWheelEvent::kPhaseEnded || |
| 493 event.phase == blink::WebMouseWheelEvent::kPhaseCancelled || |
| 494 event.momentum_phase == blink::WebMouseWheelEvent::kPhaseEnded || |
| 495 event.momentum_phase == blink::WebMouseWheelEvent::kPhaseCancelled) |
| 492 host_->ForwardWheelEventWithLatencyInfo(event, latency); | 496 host_->ForwardWheelEventWithLatencyInfo(event, latency); |
| 493 } | 497 } |
| 494 | 498 |
| 495 void RenderWidgetHostViewChildFrame::ProcessTouchEvent( | 499 void RenderWidgetHostViewChildFrame::ProcessTouchEvent( |
| 496 const blink::WebTouchEvent& event, | 500 const blink::WebTouchEvent& event, |
| 497 const ui::LatencyInfo& latency) { | 501 const ui::LatencyInfo& latency) { |
| 498 if (event.GetType() == blink::WebInputEvent::kTouchStart && | 502 if (event.GetType() == blink::WebInputEvent::kTouchStart && |
| 499 frame_connector_ && !frame_connector_->HasFocus()) { | 503 frame_connector_ && !frame_connector_->HasFocus()) { |
| 500 frame_connector_->FocusRootView(); | 504 frame_connector_->FocusRootView(); |
| 501 } | 505 } |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 frame_sink_id_); | 719 frame_sink_id_); |
| 716 } | 720 } |
| 717 support_.reset(); | 721 support_.reset(); |
| 718 } | 722 } |
| 719 | 723 |
| 720 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { | 724 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { |
| 721 return false; | 725 return false; |
| 722 } | 726 } |
| 723 | 727 |
| 724 } // namespace content | 728 } // namespace content |
| OLD | NEW |