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

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

Issue 16046003: Move webkit/gpu into webkit/common/gpu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in content/common/gpu/client/gl_helper_* Created 7 years, 7 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
« no previous file with comments | « ui/compositor/DEPS ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <deque> 8 #include <deque>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 14 matching lines...) Expand all
25 #include "third_party/skia/include/core/SkBitmap.h" 25 #include "third_party/skia/include/core/SkBitmap.h"
26 #include "ui/compositor/compositor_observer.h" 26 #include "ui/compositor/compositor_observer.h"
27 #include "ui/compositor/compositor_switches.h" 27 #include "ui/compositor/compositor_switches.h"
28 #include "ui/compositor/dip_util.h" 28 #include "ui/compositor/dip_util.h"
29 #include "ui/compositor/layer.h" 29 #include "ui/compositor/layer.h"
30 #include "ui/compositor/test_web_graphics_context_3d.h" 30 #include "ui/compositor/test_web_graphics_context_3d.h"
31 #include "ui/gl/gl_context.h" 31 #include "ui/gl/gl_context.h"
32 #include "ui/gl/gl_implementation.h" 32 #include "ui/gl/gl_implementation.h"
33 #include "ui/gl/gl_surface.h" 33 #include "ui/gl/gl_surface.h"
34 #include "ui/gl/gl_switches.h" 34 #include "ui/gl/gl_switches.h"
35 #include "webkit/gpu/grcontext_for_webgraphicscontext3d.h" 35 #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
36 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" 36 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "base/chromeos/chromeos_version.h" 39 #include "base/chromeos/chromeos_version.h"
40 #endif 40 #endif
41 41
42 namespace { 42 namespace {
43 43
44 const double kDefaultRefreshRate = 60.0; 44 const double kDefaultRefreshRate = 60.0;
45 const double kTestRefreshRate = 200.0; 45 const double kTestRefreshRate = 200.0;
46 46
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 COMPOSITOR_EXPORT void DisableTestCompositor() { 815 COMPOSITOR_EXPORT void DisableTestCompositor() {
816 ResetImplicitFactory(); 816 ResetImplicitFactory();
817 g_test_compositor_enabled = false; 817 g_test_compositor_enabled = false;
818 } 818 }
819 819
820 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 820 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
821 return g_test_compositor_enabled; 821 return g_test_compositor_enabled;
822 } 822 }
823 823
824 } // namespace ui 824 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/DEPS ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698