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

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

Issue 1963263002: Fix Mac resize, delete more Mac code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #endif 69 #endif
70 70
71 #if defined(USE_OZONE) 71 #if defined(USE_OZONE)
72 #include "ui/ozone/public/ozone_switches.h" 72 #include "ui/ozone/public/ozone_switches.h"
73 #endif 73 #endif
74 74
75 #if defined(USE_X11) && !defined(OS_CHROMEOS) 75 #if defined(USE_X11) && !defined(OS_CHROMEOS)
76 #include "ui/gfx/x/x11_switches.h" // nogncheck 76 #include "ui/gfx/x/x11_switches.h" // nogncheck
77 #endif 77 #endif
78 78
79 #if defined(OS_MACOSX)
80 #include "content/browser/renderer_host/render_widget_resize_helper_mac.h"
81 #endif
82
83 #if defined(OS_MACOSX) || defined(OS_ANDROID) 79 #if defined(OS_MACOSX) || defined(OS_ANDROID)
84 #include "content/browser/gpu/gpu_surface_tracker.h" 80 #include "content/browser/gpu/gpu_surface_tracker.h"
85 #endif 81 #endif
86 82
87 namespace content { 83 namespace content {
88 84
89 bool GpuProcessHost::gpu_enabled_ = true; 85 bool GpuProcessHost::gpu_enabled_ = true;
90 bool GpuProcessHost::hardware_gpu_enabled_ = true; 86 bool GpuProcessHost::hardware_gpu_enabled_ = true;
91 int GpuProcessHost::gpu_crash_count_ = 0; 87 int GpuProcessHost::gpu_crash_count_ = 0;
92 int GpuProcessHost::gpu_recent_crash_count_ = 0; 88 int GpuProcessHost::gpu_recent_crash_count_ = 0;
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1171 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1176 ClientIdToShaderCacheMap::iterator iter = 1172 ClientIdToShaderCacheMap::iterator iter =
1177 client_id_to_shader_cache_.find(client_id); 1173 client_id_to_shader_cache_.find(client_id);
1178 // If the cache doesn't exist then this is an off the record profile. 1174 // If the cache doesn't exist then this is an off the record profile.
1179 if (iter == client_id_to_shader_cache_.end()) 1175 if (iter == client_id_to_shader_cache_.end())
1180 return; 1176 return;
1181 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1177 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1182 } 1178 }
1183 1179
1184 } // namespace content 1180 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698