| Index: trunk/src/content/common/gpu/image_transport_surface_android.cc
|
| ===================================================================
|
| --- trunk/src/content/common/gpu/image_transport_surface_android.cc (revision 255720)
|
| +++ trunk/src/content/common/gpu/image_transport_surface_android.cc (working copy)
|
| @@ -92,8 +92,11 @@
|
|
|
| GpuChannel* parent_channel =
|
| GetHelper()->manager()->LookupChannel(parent_client_id_);
|
| - if (parent_channel)
|
| - GetHelper()->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
|
| + if (parent_channel) {
|
| + const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
|
| + GetHelper()->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
|
| + }
|
|
|
| return true;
|
| }
|
|
|