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 2744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2755 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters( | 2755 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters( |
2756 const base::TimeTicks& timebase, | 2756 const base::TimeTicks& timebase, |
2757 const base::TimeDelta& interval) { | 2757 const base::TimeDelta& interval) { |
2758 host_->UpdateVSyncParameters(timebase, interval); | 2758 host_->UpdateVSyncParameters(timebase, interval); |
2759 } | 2759 } |
2760 | 2760 |
2761 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() { | 2761 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() { |
2762 ui::GestureRecognizer::Get()->CancelActiveTouches(window_); | 2762 ui::GestureRecognizer::Get()->CancelActiveTouches(window_); |
2763 } | 2763 } |
2764 | 2764 |
| 2765 uint32_t RenderWidgetHostViewAura::GetSurfaceIdNamespace() { |
| 2766 return delegated_frame_host_->GetSurfaceIdNamespace(); |
| 2767 } |
| 2768 |
2765 //////////////////////////////////////////////////////////////////////////////// | 2769 //////////////////////////////////////////////////////////////////////////////// |
2766 // RenderWidgetHostViewBase, public: | 2770 // RenderWidgetHostViewBase, public: |
2767 | 2771 |
2768 // static | 2772 // static |
2769 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2773 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2770 GetScreenInfoForWindow(results, NULL); | 2774 GetScreenInfoForWindow(results, NULL); |
2771 } | 2775 } |
2772 | 2776 |
2773 } // namespace content | 2777 } // namespace content |
OLD | NEW |