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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/plugin_process_host.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_ui_shim.h" 5 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/id_map.h" 11 #include "base/id_map.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/process_util.h" 13 #include "base/process_util.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/debug/trace_event.h" 15 #include "base/debug/trace_event.h"
16 #include "content/browser/gpu/gpu_data_manager_impl.h" 16 #include "content/browser/gpu/gpu_data_manager_impl.h"
17 #include "content/browser/gpu/gpu_process_host.h" 17 #include "content/browser/gpu/gpu_process_host.h"
18 #include "content/browser/gpu/gpu_surface_tracker.h" 18 #include "content/browser/gpu/gpu_surface_tracker.h"
19 #include "content/browser/renderer_host/render_process_host_impl.h" 19 #include "content/browser/renderer_host/render_process_host_impl.h"
20 #include "content/browser/renderer_host/render_view_host_impl.h" 20 #include "content/browser/renderer_host/render_view_host_impl.h"
21 #include "content/common/gpu/gpu_messages.h" 21 #include "content/common/gpu/gpu_messages.h"
22 #include "content/port/browser/render_widget_host_view_port.h" 22 #include "content/port/browser/render_widget_host_view_port.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "ui/gfx/gl/gl_switches.h" 24 #include "ui/gl/gl_switches.h"
25 25
26 #if defined(TOOLKIT_GTK) 26 #if defined(TOOLKIT_GTK)
27 // These two #includes need to come after gpu_messages.h. 27 // These two #includes need to come after gpu_messages.h.
28 #include "ui/base/x/x11_util.h" 28 #include "ui/base/x/x11_util.h"
29 #include "ui/gfx/size.h" 29 #include "ui/gfx/size.h"
30 #include <gdk/gdk.h> // NOLINT 30 #include <gdk/gdk.h> // NOLINT
31 #include <gdk/gdkx.h> // NOLINT 31 #include <gdk/gdkx.h> // NOLINT
32 #endif 32 #endif
33 33
34 using content::BrowserThread; 34 using content::BrowserThread;
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease( 388 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
389 const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) { 389 const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
390 RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID( 390 RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
391 params.surface_id); 391 params.surface_id);
392 if (!view) 392 if (!view)
393 return; 393 return;
394 view->AcceleratedSurfaceRelease(params.identifier); 394 view->AcceleratedSurfaceRelease(params.identifier);
395 } 395 }
396 396
397 #endif 397 #endif
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698