| 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 3065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3076 } | 3076 } |
| 3077 | 3077 |
| 3078 void RenderWidgetHostViewAura::UnlockCompositingSurface() { | 3078 void RenderWidgetHostViewAura::UnlockCompositingSurface() { |
| 3079 NOTIMPLEMENTED(); | 3079 NOTIMPLEMENTED(); |
| 3080 } | 3080 } |
| 3081 | 3081 |
| 3082 uint32_t RenderWidgetHostViewAura::GetSurfaceIdNamespace() { | 3082 uint32_t RenderWidgetHostViewAura::GetSurfaceIdNamespace() { |
| 3083 return delegated_frame_host_->GetSurfaceIdNamespace(); | 3083 return delegated_frame_host_->GetSurfaceIdNamespace(); |
| 3084 } | 3084 } |
| 3085 | 3085 |
| 3086 cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const { |
| 3087 return delegated_frame_host_->SurfaceIdForTesting(); |
| 3088 } |
| 3089 |
| 3086 //////////////////////////////////////////////////////////////////////////////// | 3090 //////////////////////////////////////////////////////////////////////////////// |
| 3087 // RenderWidgetHostViewBase, public: | 3091 // RenderWidgetHostViewBase, public: |
| 3088 | 3092 |
| 3089 // static | 3093 // static |
| 3090 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3094 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3091 GetScreenInfoForWindow(results, NULL); | 3095 GetScreenInfoForWindow(results, NULL); |
| 3092 } | 3096 } |
| 3093 | 3097 |
| 3094 } // namespace content | 3098 } // namespace content |
| OLD | NEW |