| 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_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1957 gfx::ConvertPointToPixel(device_scale_factor_, point); | 1957 gfx::ConvertPointToPixel(device_scale_factor_, point); |
| 1958 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint( | 1958 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint( |
| 1959 delegate, point_in_pixels, transformed_point); | 1959 delegate, point_in_pixels, transformed_point); |
| 1960 *transformed_point = | 1960 *transformed_point = |
| 1961 gfx::ConvertPointToDIP(device_scale_factor_, *transformed_point); | 1961 gfx::ConvertPointToDIP(device_scale_factor_, *transformed_point); |
| 1962 | 1962 |
| 1963 // It is possible that the renderer has not yet produced a surface, in which | 1963 // It is possible that the renderer has not yet produced a surface, in which |
| 1964 // case we return our current namespace. | 1964 // case we return our current namespace. |
| 1965 if (id.is_null()) | 1965 if (id.is_null()) |
| 1966 return GetSurfaceIdNamespace(); | 1966 return GetSurfaceIdNamespace(); |
| 1967 return cc::SurfaceIdAllocator::NamespaceForId(id); | 1967 return id.id_namespace(); |
| 1968 } | 1968 } |
| 1969 | 1969 |
| 1970 void RenderWidgetHostViewAura::ProcessMouseEvent( | 1970 void RenderWidgetHostViewAura::ProcessMouseEvent( |
| 1971 const blink::WebMouseEvent& event) { | 1971 const blink::WebMouseEvent& event) { |
| 1972 host_->ForwardMouseEvent(event); | 1972 host_->ForwardMouseEvent(event); |
| 1973 } | 1973 } |
| 1974 | 1974 |
| 1975 void RenderWidgetHostViewAura::ProcessMouseWheelEvent( | 1975 void RenderWidgetHostViewAura::ProcessMouseWheelEvent( |
| 1976 const blink::WebMouseWheelEvent& event) { | 1976 const blink::WebMouseWheelEvent& event) { |
| 1977 host_->ForwardWheelEvent(event); | 1977 host_->ForwardWheelEvent(event); |
| (...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2869 | 2869 |
| 2870 //////////////////////////////////////////////////////////////////////////////// | 2870 //////////////////////////////////////////////////////////////////////////////// |
| 2871 // RenderWidgetHostViewBase, public: | 2871 // RenderWidgetHostViewBase, public: |
| 2872 | 2872 |
| 2873 // static | 2873 // static |
| 2874 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2874 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2875 GetScreenInfoForWindow(results, NULL); | 2875 GetScreenInfoForWindow(results, NULL); |
| 2876 } | 2876 } |
| 2877 | 2877 |
| 2878 } // namespace content | 2878 } // namespace content |
| OLD | NEW |