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

Side by Side Diff: content/common/gpu/gpu_channel.cc

Issue 25666014: Remove the ENABLE_GPU #define and enable_gpu gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_memory_manager_client.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) 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 #if defined(OS_WIN) 5 #if defined(OS_WIN)
6 #include <windows.h> 6 #include <windows.h>
7 #endif 7 #endif
8 8
9 #include "content/common/gpu/gpu_channel.h" 9 #include "content/common/gpu/gpu_channel.h"
10 10
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 int32 surface_id, 610 int32 surface_id,
611 const GPUCreateCommandBufferConfig& init_params, 611 const GPUCreateCommandBufferConfig& init_params,
612 int32* route_id) { 612 int32* route_id) {
613 TRACE_EVENT1("gpu", 613 TRACE_EVENT1("gpu",
614 "GpuChannel::CreateViewCommandBuffer", 614 "GpuChannel::CreateViewCommandBuffer",
615 "surface_id", 615 "surface_id",
616 surface_id); 616 surface_id);
617 617
618 *route_id = MSG_ROUTING_NONE; 618 *route_id = MSG_ROUTING_NONE;
619 619
620 #if defined(ENABLE_GPU)
621
622 GpuCommandBufferStub* share_group = stubs_.Lookup(init_params.share_group_id); 620 GpuCommandBufferStub* share_group = stubs_.Lookup(init_params.share_group_id);
623 621
624 // Virtualize compositor contexts on OS X to prevent performance regressions 622 // Virtualize compositor contexts on OS X to prevent performance regressions
625 // when enabling FCM. 623 // when enabling FCM.
626 // http://crbug.com/180463 624 // http://crbug.com/180463
627 bool use_virtualized_gl_context = false; 625 bool use_virtualized_gl_context = false;
628 #if defined(OS_MACOSX) 626 #if defined(OS_MACOSX)
629 use_virtualized_gl_context = true; 627 use_virtualized_gl_context = true;
630 #endif 628 #endif
631 629
(...skipping 11 matching lines...) Expand all
643 use_virtualized_gl_context, 641 use_virtualized_gl_context,
644 *route_id, 642 *route_id,
645 surface_id, 643 surface_id,
646 watchdog_, 644 watchdog_,
647 software_, 645 software_,
648 init_params.active_url)); 646 init_params.active_url));
649 if (preempted_flag_.get()) 647 if (preempted_flag_.get())
650 stub->SetPreemptByFlag(preempted_flag_); 648 stub->SetPreemptByFlag(preempted_flag_);
651 router_.AddRoute(*route_id, stub.get()); 649 router_.AddRoute(*route_id, stub.get());
652 stubs_.AddWithID(stub.release(), *route_id); 650 stubs_.AddWithID(stub.release(), *route_id);
653 #endif // ENABLE_GPU
654 } 651 }
655 652
656 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) { 653 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) {
657 return stubs_.Lookup(route_id); 654 return stubs_.Lookup(route_id);
658 } 655 }
659 656
660 void GpuChannel::CreateImage( 657 void GpuChannel::CreateImage(
661 gfx::PluginWindowHandle window, 658 gfx::PluginWindowHandle window,
662 int32 image_id, 659 int32 image_id,
663 gfx::Size* size) { 660 gfx::Size* size) {
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 982
986 void GpuChannel::AddFilter(IPC::ChannelProxy::MessageFilter* filter) { 983 void GpuChannel::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
987 channel_->AddFilter(filter); 984 channel_->AddFilter(filter);
988 } 985 }
989 986
990 void GpuChannel::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) { 987 void GpuChannel::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) {
991 channel_->RemoveFilter(filter); 988 channel_->RemoveFilter(filter);
992 } 989 }
993 990
994 } // namespace content 991 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_memory_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698