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

Side by Side Diff: chrome/browser/ui/webui/gpu_internals_ui.cc

Issue 9965096: Revert 130298 - Revert 130258 - Make it possible to blacklist gpu's based on the Windows experience… (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 8 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 "chrome/browser/ui/webui/gpu_internals_ui.h" 5 #include "chrome/browser/ui/webui/gpu_internals_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 base::SysInfo::OperatingSystemVersion()); 199 base::SysInfo::OperatingSystemVersion());
200 dict->SetString("angle_revision", base::UintToString(BUILD_REVISION)); 200 dict->SetString("angle_revision", base::UintToString(BUILD_REVISION));
201 #if defined(USE_SKIA) 201 #if defined(USE_SKIA)
202 dict->SetString("graphics_backend", "Skia"); 202 dict->SetString("graphics_backend", "Skia");
203 #else 203 #else
204 dict->SetString("graphics_backend", "Core Graphics"); 204 dict->SetString("graphics_backend", "Core Graphics");
205 #endif 205 #endif
206 dict->SetString("blacklist_version", 206 dict->SetString("blacklist_version",
207 GpuDataManager::GetInstance()->GetBlacklistVersion()); 207 GpuDataManager::GetInstance()->GetBlacklistVersion());
208 208
209 GpuPerformanceStats stats =
210 GpuDataManager::GetInstance()->GetPerformanceStats();
211 dict->Set("performance", stats.ToValue());
212
213 return dict; 209 return dict;
214 } 210 }
215 211
216 Value* GpuMessageHandler::OnRequestLogMessages(const ListValue*) { 212 Value* GpuMessageHandler::OnRequestLogMessages(const ListValue*) {
217 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 213 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
218 214
219 return gpu_data_manager_->log_messages().DeepCopy(); 215 return gpu_data_manager_->log_messages().DeepCopy();
220 } 216 }
221 217
222 void GpuMessageHandler::OnGpuInfoUpdate() { 218 void GpuMessageHandler::OnGpuInfoUpdate() {
(...skipping 21 matching lines...) Expand all
244 //////////////////////////////////////////////////////////////////////////////// 240 ////////////////////////////////////////////////////////////////////////////////
245 241
246 GpuInternalsUI::GpuInternalsUI(content::WebUI* web_ui) 242 GpuInternalsUI::GpuInternalsUI(content::WebUI* web_ui)
247 : WebUIController(web_ui) { 243 : WebUIController(web_ui) {
248 web_ui->AddMessageHandler(new GpuMessageHandler()); 244 web_ui->AddMessageHandler(new GpuMessageHandler());
249 245
250 // Set up the chrome://gpu-internals/ source. 246 // Set up the chrome://gpu-internals/ source.
251 Profile* profile = Profile::FromWebUI(web_ui); 247 Profile* profile = Profile::FromWebUI(web_ui);
252 profile->GetChromeURLDataManager()->AddDataSource(CreateGpuHTMLSource()); 248 profile->GetChromeURLDataManager()->AddDataSource(CreateGpuHTMLSource());
253 } 249 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/gpu_internals/info_view.js ('k') | content/browser/gpu/gpu_blacklist.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698