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 2190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2201 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && | 2201 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && |
2202 !(event->flags() & ui::EF_FROM_TOUCH)) { | 2202 !(event->flags() & ui::EF_FROM_TOUCH)) { |
2203 event->ConvertLocationToTarget(window_, window_->parent()); | 2203 event->ConvertLocationToTarget(window_, window_->parent()); |
2204 window_->parent()->delegate()->OnMouseEvent(event); | 2204 window_->parent()->delegate()->OnMouseEvent(event); |
2205 } | 2205 } |
2206 | 2206 |
2207 if (!IsXButtonUpEvent(event)) | 2207 if (!IsXButtonUpEvent(event)) |
2208 event->SetHandled(); | 2208 event->SetHandled(); |
2209 } | 2209 } |
2210 | 2210 |
| 2211 void RenderWidgetHostViewAura::OnAccessibilityMouseEvent( |
| 2212 ui::MouseEvent* event) { |
| 2213 OnMouseEvent(event); |
| 2214 } |
| 2215 |
2211 uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint( | 2216 uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint( |
2212 const gfx::Point& point, | 2217 const gfx::Point& point, |
2213 gfx::Point* transformed_point) { | 2218 gfx::Point* transformed_point) { |
2214 DCHECK(device_scale_factor_ != 0.0f); | 2219 DCHECK(device_scale_factor_ != 0.0f); |
2215 | 2220 |
2216 // The surface hittest happens in device pixels, so we need to convert the | 2221 // The surface hittest happens in device pixels, so we need to convert the |
2217 // |point| from DIPs to pixels before hittesting. | 2222 // |point| from DIPs to pixels before hittesting. |
2218 gfx::Point point_in_pixels = | 2223 gfx::Point point_in_pixels = |
2219 gfx::ConvertPointToPixel(device_scale_factor_, point); | 2224 gfx::ConvertPointToPixel(device_scale_factor_, point); |
2220 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint(point_in_pixels, | 2225 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint(point_in_pixels, |
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3025 | 3030 |
3026 //////////////////////////////////////////////////////////////////////////////// | 3031 //////////////////////////////////////////////////////////////////////////////// |
3027 // RenderWidgetHostViewBase, public: | 3032 // RenderWidgetHostViewBase, public: |
3028 | 3033 |
3029 // static | 3034 // static |
3030 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3035 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
3031 GetScreenInfoForWindow(results, NULL); | 3036 GetScreenInfoForWindow(results, NULL); |
3032 } | 3037 } |
3033 | 3038 |
3034 } // namespace content | 3039 } // namespace content |
OLD | NEW |