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 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2136 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && | 2136 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && |
2137 !(event->flags() & ui::EF_FROM_TOUCH)) { | 2137 !(event->flags() & ui::EF_FROM_TOUCH)) { |
2138 event->ConvertLocationToTarget(window_, window_->parent()); | 2138 event->ConvertLocationToTarget(window_, window_->parent()); |
2139 window_->parent()->delegate()->OnMouseEvent(event); | 2139 window_->parent()->delegate()->OnMouseEvent(event); |
2140 } | 2140 } |
2141 | 2141 |
2142 if (!IsXButtonUpEvent(event)) | 2142 if (!IsXButtonUpEvent(event)) |
2143 event->SetHandled(); | 2143 event->SetHandled(); |
2144 } | 2144 } |
2145 | 2145 |
| 2146 uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint( |
| 2147 const gfx::Point& point, |
| 2148 gfx::Point* transformed_point) { |
| 2149 return cc::SurfaceIdAllocator::NamespaceForId( |
| 2150 delegated_frame_host_->SurfaceIdAtPoint(point, transformed_point)); |
| 2151 } |
| 2152 |
2146 void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) { | 2153 void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) { |
2147 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnScrollEvent"); | 2154 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnScrollEvent"); |
2148 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event)) | 2155 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event)) |
2149 return; | 2156 return; |
2150 | 2157 |
2151 if (event->type() == ui::ET_SCROLL) { | 2158 if (event->type() == ui::ET_SCROLL) { |
2152 #if !defined(OS_WIN) | 2159 #if !defined(OS_WIN) |
2153 // TODO(ananta) | 2160 // TODO(ananta) |
2154 // Investigate if this is true for Windows 8 Metro ASH as well. | 2161 // Investigate if this is true for Windows 8 Metro ASH as well. |
2155 if (event->finger_count() != 2) | 2162 if (event->finger_count() != 2) |
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2771 | 2778 |
2772 //////////////////////////////////////////////////////////////////////////////// | 2779 //////////////////////////////////////////////////////////////////////////////// |
2773 // RenderWidgetHostViewBase, public: | 2780 // RenderWidgetHostViewBase, public: |
2774 | 2781 |
2775 // static | 2782 // static |
2776 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2783 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2777 GetScreenInfoForWindow(results, NULL); | 2784 GetScreenInfoForWindow(results, NULL); |
2778 } | 2785 } |
2779 | 2786 |
2780 } // namespace content | 2787 } // namespace content |
OLD | NEW |