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 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1151 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame( | 1151 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame( |
1152 src_subrect, target, callback); | 1152 src_subrect, target, callback); |
1153 } | 1153 } |
1154 | 1154 |
1155 bool RenderWidgetHostViewAura::CanCopyToVideoFrame() const { | 1155 bool RenderWidgetHostViewAura::CanCopyToVideoFrame() const { |
1156 return delegated_frame_host_->CanCopyToVideoFrame(); | 1156 return delegated_frame_host_->CanCopyToVideoFrame(); |
1157 } | 1157 } |
1158 | 1158 |
1159 void RenderWidgetHostViewAura::BeginFrameSubscription( | 1159 void RenderWidgetHostViewAura::BeginFrameSubscription( |
1160 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) { | 1160 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) { |
1161 delegated_frame_host_->BeginFrameSubscription(subscriber.Pass()); | 1161 delegated_frame_host_->BeginFrameSubscription(std::move(subscriber)); |
1162 } | 1162 } |
1163 | 1163 |
1164 void RenderWidgetHostViewAura::EndFrameSubscription() { | 1164 void RenderWidgetHostViewAura::EndFrameSubscription() { |
1165 delegated_frame_host_->EndFrameSubscription(); | 1165 delegated_frame_host_->EndFrameSubscription(); |
1166 } | 1166 } |
1167 | 1167 |
1168 #if defined(OS_WIN) | 1168 #if defined(OS_WIN) |
1169 bool RenderWidgetHostViewAura::UsesNativeWindowFrame() const { | 1169 bool RenderWidgetHostViewAura::UsesNativeWindowFrame() const { |
1170 return (legacy_render_widget_host_HWND_ != NULL); | 1170 return (legacy_render_widget_host_HWND_ != NULL); |
1171 } | 1171 } |
(...skipping 1854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3026 | 3026 |
3027 //////////////////////////////////////////////////////////////////////////////// | 3027 //////////////////////////////////////////////////////////////////////////////// |
3028 // RenderWidgetHostViewBase, public: | 3028 // RenderWidgetHostViewBase, public: |
3029 | 3029 |
3030 // static | 3030 // static |
3031 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3031 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
3032 GetScreenInfoForWindow(results, NULL); | 3032 GetScreenInfoForWindow(results, NULL); |
3033 } | 3033 } |
3034 | 3034 |
3035 } // namespace content | 3035 } // namespace content |
OLD | NEW |