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

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

Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/host_zoom_map.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/debug/trace_event.h"
9 #include "base/id_map.h" 10 #include "base/id_map.h"
11 #include "base/lazy_instance.h"
10 #include "base/process_util.h" 12 #include "base/process_util.h"
11 #include "base/debug/trace_event.h"
12 #include "base/lazy_instance.h"
13 #include "content/browser/browser_thread.h"
14 #include "content/browser/gpu/gpu_data_manager.h" 13 #include "content/browser/gpu/gpu_data_manager.h"
15 #include "content/browser/gpu/gpu_process_host.h" 14 #include "content/browser/gpu/gpu_process_host.h"
16 #include "content/browser/renderer_host/render_process_host.h" 15 #include "content/browser/renderer_host/render_process_host.h"
17 #include "content/browser/renderer_host/render_view_host.h" 16 #include "content/browser/renderer_host/render_view_host.h"
18 #include "content/browser/renderer_host/render_widget_host_view.h" 17 #include "content/browser/renderer_host/render_widget_host_view.h"
19 #include "content/common/gpu/gpu_messages.h" 18 #include "content/common/gpu/gpu_messages.h"
19 #include "content/public/browser/browser_thread.h"
20 20
21 #if defined(TOOLKIT_USES_GTK) 21 #if defined(TOOLKIT_USES_GTK)
22 // These two #includes need to come after gpu_messages.h. 22 // These two #includes need to come after gpu_messages.h.
23 #include "ui/base/x/x11_util.h"
24 #include "ui/gfx/size.h"
23 #include <gdk/gdkwindow.h> // NOLINT 25 #include <gdk/gdkwindow.h> // NOLINT
24 #include <gdk/gdkx.h> // NOLINT 26 #include <gdk/gdkx.h> // NOLINT
25 #include "ui/base/x/x11_util.h"
26 #include "ui/gfx/size.h"
27 #endif 27 #endif
28 28
29 namespace { 29 namespace {
30 30
31 // One of the linux specific headers defines this as a macro. 31 // One of the linux specific headers defines this as a macro.
32 #ifdef DestroyAll 32 #ifdef DestroyAll
33 #undef DestroyAll 33 #undef DestroyAll
34 #endif 34 #endif
35 35
36 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id( 36 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id(
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 params.render_view_id); 358 params.render_view_id);
359 if (!host) 359 if (!host)
360 return; 360 return;
361 RenderWidgetHostView* view = host->view(); 361 RenderWidgetHostView* view = host->view();
362 if (!view) 362 if (!view)
363 return; 363 return;
364 view->AcceleratedSurfaceRelease(params.identifier); 364 view->AcceleratedSurfaceRelease(params.identifier);
365 } 365 }
366 366
367 #endif 367 #endif
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/host_zoom_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698