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

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

Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp bustage Created 7 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
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 18 matching lines...) Expand all
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/content_browser_client.h" 30 #include "content/public/browser/content_browser_client.h"
31 #include "content/public/browser/render_process_host.h" 31 #include "content/public/browser/render_process_host.h"
32 #include "content/public/browser/render_widget_host_view.h" 32 #include "content/public/browser/render_widget_host_view.h"
33 #include "content/public/common/content_client.h" 33 #include "content/public/common/content_client.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "content/public/common/result_codes.h" 35 #include "content/public/common/result_codes.h"
36 #include "gpu/command_buffer/service/gpu_switches.h" 36 #include "gpu/command_buffer/service/gpu_switches.h"
37 #include "ipc/ipc_channel_handle.h" 37 #include "ipc/ipc_channel_handle.h"
38 #include "ipc/ipc_switches.h" 38 #include "ipc/ipc_switches.h"
39 #include "ui/base/latency_info.h" 39 #include "ui/events/latency_info.h"
40 #include "ui/gl/gl_switches.h" 40 #include "ui/gl/gl_switches.h"
41 41
42 42
43 #if defined(OS_WIN) 43 #if defined(OS_WIN)
44 #include "base/win/windows_version.h" 44 #include "base/win/windows_version.h"
45 #include "content/common/sandbox_win.h" 45 #include "content/common/sandbox_win.h"
46 #include "content/public/common/sandboxed_process_launcher_delegate.h" 46 #include "content/public/common/sandboxed_process_launcher_delegate.h"
47 #include "sandbox/win/src/sandbox_policy.h" 47 #include "sandbox/win/src/sandbox_policy.h"
48 #include "ui/surface/accelerated_surface_win.h" 48 #include "ui/surface/accelerated_surface_win.h"
49 #endif 49 #endif
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1250 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1251 ClientIdToShaderCacheMap::iterator iter = 1251 ClientIdToShaderCacheMap::iterator iter =
1252 client_id_to_shader_cache_.find(client_id); 1252 client_id_to_shader_cache_.find(client_id);
1253 // If the cache doesn't exist then this is an off the record profile. 1253 // If the cache doesn't exist then this is an off the record profile.
1254 if (iter == client_id_to_shader_cache_.end()) 1254 if (iter == client_id_to_shader_cache_.end())
1255 return; 1255 return;
1256 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1256 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1257 } 1257 }
1258 1258
1259 } // namespace content 1259 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698