diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
| commit | 3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea (patch) | |
| tree | 84794a37e500c230cb702d38aed4f3363afe755f /content/browser/gpu/gpu_process_host.cc | |
| parent | 97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (diff) | |
| download | chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.zip chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.gz chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.bz2 | |
Aura under Linux is enabled with:
'use_aura': 1,
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7850026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_process_host.cc')
| -rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 85d6b5f..49c2572 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -59,7 +59,7 @@ static const int kGpuMaxCrashCount = 3; int g_last_host_id = 0; -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA) class ReleasePermanentXIDDispatcher: public Task { public: @@ -95,7 +95,7 @@ void SendGpuProcessMessage(int renderer_id, } // anonymous namespace -#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) // Used to put a lock on surfaces so that the window to which the GPU // process is drawing to doesn't disappear while it is drawing when // a tab is closed. @@ -120,7 +120,7 @@ GpuProcessHost::SurfaceRef::~SurfaceRef() { FROM_HERE, new ReleasePermanentXIDDispatcher(surface_)); } -#endif // defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#endif // defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) // This class creates a GPU thread (instead of a GPU process), when running // with --in-process-gpu or --single-process. @@ -371,7 +371,7 @@ void GpuProcessHost::CreateViewCommandBuffer( DCHECK(CalledOnValidThread()); linked_ptr<CreateCommandBufferCallback> wrapped_callback(callback); -#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) ViewID view_id(renderer_id, render_view_id); // There should only be one such command buffer (for the compositor). In @@ -384,13 +384,13 @@ void GpuProcessHost::CreateViewCommandBuffer( surface_ref = (*it).second; else surface_ref.reset(new SurfaceRef(compositing_surface)); -#endif // defined(TOOLKIT_USES_GTK) && defined(TOUCH_UI) +#endif // defined(TOOLKIT_USES_GTK) && defined(TOUCH_UI) && !defined(USE_AURA) if (compositing_surface != gfx::kNullPluginWindow && Send(new GpuMsg_CreateViewCommandBuffer( compositing_surface, render_view_id, renderer_id, init_params))) { create_command_buffer_requests_.push(wrapped_callback); -#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) surface_refs_.insert(std::pair<ViewID, linked_ptr<SurfaceRef> >( view_id, surface_ref)); #endif @@ -443,12 +443,12 @@ void GpuProcessHost::OnCommandBufferCreated(const int32 route_id) { void GpuProcessHost::OnDestroyCommandBuffer( gfx::PluginWindowHandle window, int32 renderer_id, int32 render_view_id) { -#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) ViewID view_id(renderer_id, render_view_id); SurfaceRefMap::iterator it = surface_refs_.find(view_id); if (it != surface_refs_.end()) surface_refs_.erase(it); -#endif // defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) +#endif // defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) && !defined(USE_AURA) } void GpuProcessHost::OnGraphicsInfoCollected(const GPUInfo& gpu_info) { |