| 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 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1171 return is_fullscreen_; | 1171 return is_fullscreen_; |
| 1172 } | 1172 } |
| 1173 | 1173 |
| 1174 void RenderWidgetHostViewAura::OnActivated() { | 1174 void RenderWidgetHostViewAura::OnActivated() { |
| 1175 } | 1175 } |
| 1176 | 1176 |
| 1177 void RenderWidgetHostViewAura::OnLostActive() { | 1177 void RenderWidgetHostViewAura::OnLostActive() { |
| 1178 } | 1178 } |
| 1179 | 1179 |
| 1180 //////////////////////////////////////////////////////////////////////////////// | 1180 //////////////////////////////////////////////////////////////////////////////// |
| 1181 // RenderWidgetHostViewAura, ui::CompositorDelegate implementation: | 1181 // RenderWidgetHostViewAura, ui::CompositorObserver implementation: |
| 1182 | 1182 |
| 1183 void RenderWidgetHostViewAura::OnCompositingStarted( | 1183 void RenderWidgetHostViewAura::OnCompositingStarted( |
| 1184 ui::Compositor* compositor) { | 1184 ui::Compositor* compositor) { |
| 1185 locks_pending_draw_.clear(); | 1185 locks_pending_draw_.clear(); |
| 1186 } | 1186 } |
| 1187 | 1187 |
| 1188 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) { | 1188 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) { |
| 1189 RunCompositingCallbacks(); | 1189 RunCompositingCallbacks(); |
| 1190 compositor->RemoveObserver(this); | 1190 compositor->RemoveObserver(this); |
| 1191 } | 1191 } |
| 1192 | 1192 |
| 1193 void RenderWidgetHostViewAura::OnCompositingAborted( |
| 1194 ui::Compositor* compositor) { |
| 1195 } |
| 1196 |
| 1193 //////////////////////////////////////////////////////////////////////////////// | 1197 //////////////////////////////////////////////////////////////////////////////// |
| 1194 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation: | 1198 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation: |
| 1195 | 1199 |
| 1196 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) { | 1200 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) { |
| 1197 image_transport_clients_.clear(); | 1201 image_transport_clients_.clear(); |
| 1198 current_surface_ = 0; | 1202 current_surface_ = 0; |
| 1199 UpdateExternalTexture(); | 1203 UpdateExternalTexture(); |
| 1200 locks_pending_draw_.clear(); | 1204 locks_pending_draw_.clear(); |
| 1201 | 1205 |
| 1202 DCHECK(!shared_surface_handle_.is_null()); | 1206 DCHECK(!shared_surface_handle_.is_null()); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1335 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1339 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
| 1336 RenderWidgetHost* widget) { | 1340 RenderWidgetHost* widget) { |
| 1337 return new RenderWidgetHostViewAura(widget); | 1341 return new RenderWidgetHostViewAura(widget); |
| 1338 } | 1342 } |
| 1339 | 1343 |
| 1340 // static | 1344 // static |
| 1341 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1345 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
| 1342 WebKit::WebScreenInfo* results) { | 1346 WebKit::WebScreenInfo* results) { |
| 1343 GetScreenInfoForWindow(results, NULL); | 1347 GetScreenInfoForWindow(results, NULL); |
| 1344 } | 1348 } |
| OLD | NEW |