| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1180 return is_fullscreen_; | 1180 return is_fullscreen_; |
| 1181 } | 1181 } |
| 1182 | 1182 |
| 1183 void RenderWidgetHostViewAura::OnActivated() { | 1183 void RenderWidgetHostViewAura::OnActivated() { |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 void RenderWidgetHostViewAura::OnLostActive() { | 1186 void RenderWidgetHostViewAura::OnLostActive() { |
| 1187 } | 1187 } |
| 1188 | 1188 |
| 1189 //////////////////////////////////////////////////////////////////////////////// | 1189 //////////////////////////////////////////////////////////////////////////////// |
| 1190 // RenderWidgetHostViewAura, ui::CompositorDelegate implementation: | 1190 // RenderWidgetHostViewAura, ui::CompositorObserver implementation: |
| 1191 | 1191 |
| 1192 void RenderWidgetHostViewAura::OnCompositingStarted( | 1192 void RenderWidgetHostViewAura::OnCompositingStarted( |
| 1193 ui::Compositor* compositor) { | 1193 ui::Compositor* compositor) { |
| 1194 locks_pending_draw_.clear(); | 1194 locks_pending_draw_.clear(); |
| 1195 } | 1195 } |
| 1196 | 1196 |
| 1197 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) { | 1197 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) { |
| 1198 RunCompositingCallbacks(); | 1198 RunCompositingCallbacks(); |
| 1199 compositor->RemoveObserver(this); | 1199 compositor->RemoveObserver(this); |
| 1200 } | 1200 } |
| 1201 | 1201 |
| 1202 void RenderWidgetHostViewAura::OnCompositingAborted( |
| 1203 ui::Compositor* compositor) { |
| 1204 } |
| 1205 |
| 1202 //////////////////////////////////////////////////////////////////////////////// | 1206 //////////////////////////////////////////////////////////////////////////////// |
| 1203 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation: | 1207 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation: |
| 1204 | 1208 |
| 1205 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) { | 1209 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) { |
| 1206 image_transport_clients_.clear(); | 1210 image_transport_clients_.clear(); |
| 1207 current_surface_ = 0; | 1211 current_surface_ = 0; |
| 1208 UpdateExternalTexture(); | 1212 UpdateExternalTexture(); |
| 1209 locks_pending_draw_.clear(); | 1213 locks_pending_draw_.clear(); |
| 1210 | 1214 |
| 1211 DCHECK(!shared_surface_handle_.is_null()); | 1215 DCHECK(!shared_surface_handle_.is_null()); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1344 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1348 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
| 1345 RenderWidgetHost* widget) { | 1349 RenderWidgetHost* widget) { |
| 1346 return new RenderWidgetHostViewAura(widget); | 1350 return new RenderWidgetHostViewAura(widget); |
| 1347 } | 1351 } |
| 1348 | 1352 |
| 1349 // static | 1353 // static |
| 1350 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1354 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
| 1351 WebKit::WebScreenInfo* results) { | 1355 WebKit::WebScreenInfo* results) { |
| 1352 GetScreenInfoForWindow(results, NULL); | 1356 GetScreenInfoForWindow(results, NULL); |
| 1353 } | 1357 } |
| OLD | NEW |