Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10454107: Revert 139494 - ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 return is_fullscreen_; 1172 return is_fullscreen_;
1173 } 1173 }
1174 1174
1175 void RenderWidgetHostViewAura::OnActivated() { 1175 void RenderWidgetHostViewAura::OnActivated() {
1176 } 1176 }
1177 1177
1178 void RenderWidgetHostViewAura::OnLostActive() { 1178 void RenderWidgetHostViewAura::OnLostActive() {
1179 } 1179 }
1180 1180
1181 //////////////////////////////////////////////////////////////////////////////// 1181 ////////////////////////////////////////////////////////////////////////////////
1182 // RenderWidgetHostViewAura, ui::CompositorObserver implementation: 1182 // RenderWidgetHostViewAura, ui::CompositorDelegate implementation:
1183 1183
1184 void RenderWidgetHostViewAura::OnCompositingStarted( 1184 void RenderWidgetHostViewAura::OnCompositingStarted(
1185 ui::Compositor* compositor) { 1185 ui::Compositor* compositor) {
1186 locks_pending_draw_.clear(); 1186 locks_pending_draw_.clear();
1187 } 1187 }
1188 1188
1189 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) { 1189 void RenderWidgetHostViewAura::OnCompositingEnded(ui::Compositor* compositor) {
1190 RunCompositingCallbacks(); 1190 RunCompositingCallbacks();
1191 compositor->RemoveObserver(this); 1191 compositor->RemoveObserver(this);
1192 } 1192 }
1193 1193
1194 void RenderWidgetHostViewAura::OnCompositingAborted(
1195 ui::Compositor* compositor) {
1196 }
1197
1198 //////////////////////////////////////////////////////////////////////////////// 1194 ////////////////////////////////////////////////////////////////////////////////
1199 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation: 1195 // RenderWidgetHostViewAura, ImageTransportFactoryObserver implementation:
1200 1196
1201 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) { 1197 void RenderWidgetHostViewAura::OnLostResources(ui::Compositor* compositor) {
1202 image_transport_clients_.clear(); 1198 image_transport_clients_.clear();
1203 current_surface_ = 0; 1199 current_surface_ = 0;
1204 UpdateExternalTexture(); 1200 UpdateExternalTexture();
1205 locks_pending_draw_.clear(); 1201 locks_pending_draw_.clear();
1206 1202
1207 DCHECK(!shared_surface_handle_.is_null()); 1203 DCHECK(!shared_surface_handle_.is_null());
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( 1336 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
1341 RenderWidgetHost* widget) { 1337 RenderWidgetHost* widget) {
1342 return new RenderWidgetHostViewAura(widget); 1338 return new RenderWidgetHostViewAura(widget);
1343 } 1339 }
1344 1340
1345 // static 1341 // static
1346 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( 1342 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
1347 WebKit::WebScreenInfo* results) { 1343 WebKit::WebScreenInfo* results) {
1348 GetScreenInfoForWindow(results, NULL); 1344 GetScreenInfoForWindow(results, NULL);
1349 } 1345 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698