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_base.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/accessibility/browser_accessibility_manager.h" | 9 #include "content/browser/accessibility/browser_accessibility_manager.h" |
10 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
11 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" | 11 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" |
12 #include "content/browser/renderer_host/render_process_host_impl.h" | 12 #include "content/browser/renderer_host/render_process_host_impl.h" |
13 #include "content/browser/renderer_host/render_widget_host_impl.h" | 13 #include "content/browser/renderer_host/render_widget_host_impl.h" |
14 #include "content/common/content_switches_internal.h" | 14 #include "content/common/content_switches_internal.h" |
15 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" | 15 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" |
16 #include "ui/gfx/display.h" | 16 #include "ui/gfx/display.h" |
17 #include "ui/gfx/geometry/point_conversions.h" | |
17 #include "ui/gfx/geometry/size_conversions.h" | 18 #include "ui/gfx/geometry/size_conversions.h" |
18 #include "ui/gfx/geometry/size_f.h" | 19 #include "ui/gfx/geometry/size_f.h" |
19 #include "ui/gfx/screen.h" | 20 #include "ui/gfx/screen.h" |
20 | 21 |
21 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
22 #include "base/command_line.h" | 23 #include "base/command_line.h" |
23 #include "base/message_loop/message_loop.h" | 24 #include "base/message_loop/message_loop.h" |
24 #include "base/win/wrapped_window_proc.h" | 25 #include "base/win/wrapped_window_proc.h" |
25 #include "content/browser/plugin_process_host.h" | 26 #include "content/browser/plugin_process_host.h" |
26 #include "content/browser/plugin_service_impl.h" | 27 #include "content/browser/plugin_service_impl.h" |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
675 return 0; | 676 return 0; |
676 } | 677 } |
677 | 678 |
678 uint32_t RenderWidgetHostViewBase::SurfaceIdNamespaceAtPoint( | 679 uint32_t RenderWidgetHostViewBase::SurfaceIdNamespaceAtPoint( |
679 const gfx::Point& point, | 680 const gfx::Point& point, |
680 gfx::Point* transformed_point) { | 681 gfx::Point* transformed_point) { |
681 NOTREACHED(); | 682 NOTREACHED(); |
682 return 0; | 683 return 0; |
683 } | 684 } |
684 | 685 |
685 void RenderWidgetHostViewBase::TransformPointToRootCoordSpace( | 686 gfx::Point RenderWidgetHostViewBase::TransformPointToRootCoordSpace( |
686 const gfx::Point& point, | 687 const gfx::Point& point) { |
687 gfx::Point* transformed_point) { | 688 return point; |
688 *transformed_point = point; | 689 } |
690 | |
691 gfx::PointF RenderWidgetHostViewBase::TransformPointToRootCoordSpaceF( | |
692 const gfx::PointF& point) { | |
693 return (gfx::PointF)TransformPointToRootCoordSpace( | |
Charlie Reis
2016/01/22 23:04:54
This should be a C++ style cast (static_cast), rig
kenrb
2016/01/25 22:41:40
Thanks for catching that, it wasn't supposed to be
Charlie Reis
2016/01/26 04:51:24
Ah, that makes much more sense! LGTM.
| |
694 gfx::ToRoundedPoint(point)); | |
689 } | 695 } |
690 | 696 |
691 void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace( | 697 void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace( |
692 const gfx::Point& point, | 698 const gfx::Point& point, |
693 cc::SurfaceId original_surface, | 699 cc::SurfaceId original_surface, |
694 gfx::Point* transformed_point) { | 700 gfx::Point* transformed_point) { |
695 *transformed_point = point; | 701 *transformed_point = point; |
696 } | 702 } |
697 | 703 |
698 } // namespace content | 704 } // namespace content |
OLD | NEW |