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

Side by Side Diff: ui/compositor/compositor.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tidy Created 8 years, 2 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 "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 bool Compositor::IsThreaded() const { 288 bool Compositor::IsThreaded() const {
289 return g_compositor_thread != NULL; 289 return g_compositor_thread != NULL;
290 } 290 }
291 291
292 void Compositor::OnSwapBuffersPosted() { 292 void Compositor::OnSwapBuffersPosted() {
293 swap_posted_ = true; 293 swap_posted_ = true;
294 } 294 }
295 295
296 void Compositor::OnSwapBuffersComplete() { 296 void Compositor::OnSwapBuffersComplete() {
297 DCHECK(swap_posted_); 297 //DCHECK(swap_posted_);
298 swap_posted_ = false; 298 swap_posted_ = false;
299 NotifyEnd(); 299 NotifyEnd();
300 } 300 }
301 301
302 void Compositor::OnSwapBuffersAborted() { 302 void Compositor::OnSwapBuffersAborted() {
303 if (swap_posted_) { 303 if (swap_posted_) {
304 swap_posted_ = false; 304 swap_posted_ = false;
305 NotifyEnd(); 305 NotifyEnd();
306 } 306 }
307 FOR_EACH_OBSERVER(CompositorObserver, 307 FOR_EACH_OBSERVER(CompositorObserver,
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 433
434 COMPOSITOR_EXPORT void DisableTestCompositor() { 434 COMPOSITOR_EXPORT void DisableTestCompositor() {
435 test_compositor_enabled = false; 435 test_compositor_enabled = false;
436 } 436 }
437 437
438 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 438 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
439 return test_compositor_enabled; 439 return test_compositor_enabled;
440 } 440 }
441 441
442 } // namespace ui 442 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698