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

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

Issue 1417753007: ui: Revert gfx::BufferUsage::SCANOUT to gfx::BufferUsage::GPU_READ_WRITE change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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_internals_ui.h" 5 #include "content/browser/gpu/gpu_internals_ui.h"
6 6
7 #if defined(OS_LINUX) && defined(USE_X11) 7 #if defined(OS_LINUX) && defined(USE_X11)
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #endif 9 #endif
10 10
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 return "UYVY_422"; 265 return "UYVY_422";
266 } 266 }
267 NOTREACHED(); 267 NOTREACHED();
268 return nullptr; 268 return nullptr;
269 } 269 }
270 270
271 const char* BufferUsageToString(gfx::BufferUsage usage) { 271 const char* BufferUsageToString(gfx::BufferUsage usage) {
272 switch (usage) { 272 switch (usage) {
273 case gfx::BufferUsage::GPU_READ: 273 case gfx::BufferUsage::GPU_READ:
274 return "GPU_READ"; 274 return "GPU_READ";
275 case gfx::BufferUsage::GPU_READ_WRITE: 275 case gfx::BufferUsage::SCANOUT:
276 return "GPU_READ_WRITE"; 276 return "SCANOUT";
277 case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE: 277 case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE:
278 return "GPU_READ_CPU_READ_WRITE"; 278 return "GPU_READ_CPU_READ_WRITE";
279 case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT: 279 case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT:
280 return "GPU_READ_CPU_READ_WRITE_PERSISTENT"; 280 return "GPU_READ_CPU_READ_WRITE_PERSISTENT";
281 } 281 }
282 NOTREACHED(); 282 NOTREACHED();
283 return nullptr; 283 return nullptr;
284 } 284 }
285 285
286 base::DictionaryValue* GpuMemoryBufferInfoAsDictionaryValue() { 286 base::DictionaryValue* GpuMemoryBufferInfoAsDictionaryValue() {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 : WebUIController(web_ui) { 520 : WebUIController(web_ui) {
521 web_ui->AddMessageHandler(new GpuMessageHandler()); 521 web_ui->AddMessageHandler(new GpuMessageHandler());
522 522
523 // Set up the chrome://gpu/ source. 523 // Set up the chrome://gpu/ source.
524 BrowserContext* browser_context = 524 BrowserContext* browser_context =
525 web_ui->GetWebContents()->GetBrowserContext(); 525 web_ui->GetWebContents()->GetBrowserContext();
526 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); 526 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
527 } 527 }
528 528
529 } // namespace content 529 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/browser_gpu_memory_buffer_manager.cc ('k') | content/common/gpu/client/command_buffer_proxy_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698