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

Side by Side Diff: content/browser/gpu/gpu_process_host.cc

Issue 379233005: ozone: Move public files to ui/ozone/public & update public DEPS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | « content/browser/DEPS ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('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 "content/browser/gpu/gpu_process_host.h" 5 #include "content/browser/gpu/gpu_process_host.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 45
46 #if defined(OS_WIN) 46 #if defined(OS_WIN)
47 #include "base/win/windows_version.h" 47 #include "base/win/windows_version.h"
48 #include "content/common/sandbox_win.h" 48 #include "content/common/sandbox_win.h"
49 #include "sandbox/win/src/sandbox_policy.h" 49 #include "sandbox/win/src/sandbox_policy.h"
50 #include "ui/gfx/switches.h" 50 #include "ui/gfx/switches.h"
51 #endif 51 #endif
52 52
53 #if defined(USE_OZONE) 53 #if defined(USE_OZONE)
54 #include "ui/ozone/ozone_switches.h" 54 #include "ui/ozone/public/ozone_switches.h"
55 #endif 55 #endif
56 56
57 #if defined(USE_X11) && !defined(OS_CHROMEOS) 57 #if defined(USE_X11) && !defined(OS_CHROMEOS)
58 #include "ui/gfx/x/x11_switches.h" 58 #include "ui/gfx/x/x11_switches.h"
59 #endif 59 #endif
60 60
61 namespace content { 61 namespace content {
62 62
63 bool GpuProcessHost::gpu_enabled_ = true; 63 bool GpuProcessHost::gpu_enabled_ = true;
64 bool GpuProcessHost::hardware_gpu_enabled_ = true; 64 bool GpuProcessHost::hardware_gpu_enabled_ = true;
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1139 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1140 ClientIdToShaderCacheMap::iterator iter = 1140 ClientIdToShaderCacheMap::iterator iter =
1141 client_id_to_shader_cache_.find(client_id); 1141 client_id_to_shader_cache_.find(client_id);
1142 // If the cache doesn't exist then this is an off the record profile. 1142 // If the cache doesn't exist then this is an off the record profile.
1143 if (iter == client_id_to_shader_cache_.end()) 1143 if (iter == client_id_to_shader_cache_.end())
1144 return; 1144 return;
1145 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1145 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1146 } 1146 }
1147 1147
1148 } // namespace content 1148 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698