| 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 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2142 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && | 2142 if (!is_fullscreen_ && window_->parent() && window_->parent()->delegate() && |
| 2143 !(event->flags() & ui::EF_FROM_TOUCH)) { | 2143 !(event->flags() & ui::EF_FROM_TOUCH)) { |
| 2144 event->ConvertLocationToTarget(window_, window_->parent()); | 2144 event->ConvertLocationToTarget(window_, window_->parent()); |
| 2145 window_->parent()->delegate()->OnMouseEvent(event); | 2145 window_->parent()->delegate()->OnMouseEvent(event); |
| 2146 } | 2146 } |
| 2147 | 2147 |
| 2148 if (!IsXButtonUpEvent(event)) | 2148 if (!IsXButtonUpEvent(event)) |
| 2149 event->SetHandled(); | 2149 event->SetHandled(); |
| 2150 } | 2150 } |
| 2151 | 2151 |
| 2152 uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint( |
| 2153 const gfx::Point& point) { |
| 2154 return cc::SurfaceIdAllocator::NamespaceForId( |
| 2155 delegated_frame_host_->SurfaceIdAtPoint(point)); |
| 2156 } |
| 2157 |
| 2152 void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) { | 2158 void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) { |
| 2153 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnScrollEvent"); | 2159 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnScrollEvent"); |
| 2154 | 2160 |
| 2155 if (event->type() == ui::ET_SCROLL) { | 2161 if (event->type() == ui::ET_SCROLL) { |
| 2156 #if !defined(OS_WIN) | 2162 #if !defined(OS_WIN) |
| 2157 // TODO(ananta) | 2163 // TODO(ananta) |
| 2158 // Investigate if this is true for Windows 8 Metro ASH as well. | 2164 // Investigate if this is true for Windows 8 Metro ASH as well. |
| 2159 if (event->finger_count() != 2) | 2165 if (event->finger_count() != 2) |
| 2160 return; | 2166 return; |
| 2161 #endif | 2167 #endif |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2837 | 2843 |
| 2838 //////////////////////////////////////////////////////////////////////////////// | 2844 //////////////////////////////////////////////////////////////////////////////// |
| 2839 // RenderWidgetHostViewBase, public: | 2845 // RenderWidgetHostViewBase, public: |
| 2840 | 2846 |
| 2841 // static | 2847 // static |
| 2842 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2848 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2843 GetScreenInfoForWindow(results, NULL); | 2849 GetScreenInfoForWindow(results, NULL); |
| 2844 } | 2850 } |
| 2845 | 2851 |
| 2846 } // namespace content | 2852 } // namespace content |
| OLD | NEW |