Revert of Pass initial size and GPU preference via context attributes

gpu/ipc/service/gpu_channel_unittest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include "base/memory/shared_memory.h"
 #include "base/test/test_message_loop.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "gpu/ipc/service/gpu_channel.h"
@@ skipping 196 matching lines @@
   GpuChannel* channel =
       CreateChannel(kClientId, allow_view_command_buffers, false);
   ASSERT_TRUE(channel);
 
   SurfaceHandle surface_handle = kFakeSurfaceHandle;
   DCHECK_NE(surface_handle, kNullSurfaceHandle);
 
   int32_t kRouteId = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = surface_handle;
+  init_params.size = gfx::Size();
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = 0;
   init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   ASSERT_TRUE(stub);
 }
 
 TEST_F(GpuChannelTest, CreateViewCommandBufferDisallowed) {
   int32_t kClientId = 1;
   bool allow_view_command_buffers = false;
   GpuChannel* channel =
       CreateChannel(kClientId, allow_view_command_buffers, false);
   ASSERT_TRUE(channel);
 
   SurfaceHandle surface_handle = kFakeSurfaceHandle;
   DCHECK_NE(surface_handle, kNullSurfaceHandle);
 
   int32_t kRouteId = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = surface_handle;
+  init_params.size = gfx::Size();
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = 0;
   init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_FALSE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   EXPECT_FALSE(stub);
 }
 
 TEST_F(GpuChannelTest, CreateOffscreenCommandBuffer) {
   int32_t kClientId = 1;
   GpuChannel* channel = CreateChannel(kClientId, true, false);
   ASSERT_TRUE(channel);
 
   int32_t kRouteId = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = kNullSurfaceHandle;
+  init_params.size = gfx::Size(1, 1);
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = 0;
   init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   EXPECT_TRUE(stub);
 }
 
 TEST_F(GpuChannelTest, IncompatibleStreamIds) {
   int32_t kClientId = 1;
   GpuChannel* channel = CreateChannel(kClientId, true, false);
   ASSERT_TRUE(channel);
 
   // Create first context.
   int32_t kRouteId1 = 1;
   int32_t kStreamId1 = 1;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = kNullSurfaceHandle;
+  init_params.size = gfx::Size(1, 1);
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId1;
   init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId1, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId1);
   EXPECT_TRUE(stub);
 
   // Create second context in same share group but different stream.
   int32_t kRouteId2 = 2;
   int32_t kStreamId2 = 2;
 
   init_params.share_group_id = kRouteId1;
   init_params.stream_id = kStreamId2;
   init_params.stream_priority = GpuStreamPriority::NORMAL;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId2, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_FALSE(result);
 
   stub = channel->LookupCommandBuffer(kRouteId2);
   EXPECT_FALSE(stub);
 }
 
 TEST_F(GpuChannelTest, StreamLifetime) {
   int32_t kClientId = 1;
   GpuChannel* channel = CreateChannel(kClientId, true, false);
   ASSERT_TRUE(channel);
 
   // Create first context.
   int32_t kRouteId1 = 1;
   int32_t kStreamId1 = 1;
   GpuStreamPriority kStreamPriority1 = GpuStreamPriority::NORMAL;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = kNullSurfaceHandle;
+  init_params.size = gfx::Size(1, 1);
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId1;
   init_params.stream_priority = kStreamPriority1;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId1, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId1);
   EXPECT_TRUE(stub);
 
   HandleMessage(channel, new GpuChannelMsg_DestroyCommandBuffer(kRouteId1));
   stub = channel->LookupCommandBuffer(kRouteId1);
   EXPECT_FALSE(stub);
 
   // Create second context in same share group but different stream.
   int32_t kRouteId2 = 2;
   int32_t kStreamId2 = 2;
   GpuStreamPriority kStreamPriority2 = GpuStreamPriority::LOW;
 
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId2;
   init_params.stream_priority = kStreamPriority2;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId2, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   stub = channel->LookupCommandBuffer(kRouteId2);
   EXPECT_TRUE(stub);
 }
 
 TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) {
   int32_t kClientId = 1;
   bool allow_real_time_streams = false;
   GpuChannel* channel = CreateChannel(kClientId, true, allow_real_time_streams);
   ASSERT_TRUE(channel);
 
   // Create first context.
   int32_t kRouteId = 1;
   int32_t kStreamId = 1;
   GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = kNullSurfaceHandle;
+  init_params.size = gfx::Size(1, 1);
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId;
   init_params.stream_priority = kStreamPriority;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_FALSE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   EXPECT_FALSE(stub);
 }
 
 TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
   int32_t kClientId = 1;
   bool allow_real_time_streams = true;
   GpuChannel* channel = CreateChannel(kClientId, true, allow_real_time_streams);
   ASSERT_TRUE(channel);
 
   // Create first context.
   int32_t kRouteId = 1;
   int32_t kStreamId = 1;
   GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = kNullSurfaceHandle;
+  init_params.size = gfx::Size(1, 1);
   init_params.share_group_id = MSG_ROUTING_NONE;
   init_params.stream_id = kStreamId;
   init_params.stream_priority = kStreamPriority;
   init_params.attribs = gles2::ContextCreationAttribHelper();
   init_params.active_url = GURL();
+  init_params.gpu_preference = gl::PreferIntegratedGpu;
   bool result = false;
   gpu::Capabilities capabilities;
   HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                              init_params, kRouteId, GetSharedHandle(), &result,
                              &capabilities));
   EXPECT_TRUE(result);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   EXPECT_TRUE(stub);
 }
 
 TEST_F(GpuChannelTest, CreateFailsIfSharedContextIsLost) {
   int32_t kClientId = 1;
   GpuChannel* channel = CreateChannel(kClientId, false, false);
   ASSERT_TRUE(channel);
 
   // Create first context, we will share this one.
   int32_t kSharedRouteId = 1;
   {
     SCOPED_TRACE("kSharedRouteId");
     GPUCreateCommandBufferConfig init_params;
     init_params.surface_handle = kNullSurfaceHandle;
+    init_params.size = gfx::Size(1, 1);
     init_params.share_group_id = MSG_ROUTING_NONE;
     init_params.stream_id = 0;
     init_params.stream_priority = GpuStreamPriority::NORMAL;
     init_params.attribs = gles2::ContextCreationAttribHelper();
     init_params.active_url = GURL();
+    init_params.gpu_preference = gl::PreferIntegratedGpu;
     bool result = false;
     gpu::Capabilities capabilities;
     HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                                init_params, kSharedRouteId, GetSharedHandle(),
                                &result, &capabilities));
     EXPECT_TRUE(result);
   }
   EXPECT_TRUE(channel->LookupCommandBuffer(kSharedRouteId));
 
   // This context shares with the first one, this should be possible.
   int32_t kFriendlyRouteId = 2;
   {
     SCOPED_TRACE("kFriendlyRouteId");
     GPUCreateCommandBufferConfig init_params;
     init_params.surface_handle = kNullSurfaceHandle;
+    init_params.size = gfx::Size(1, 1);
     init_params.share_group_id = kSharedRouteId;
     init_params.stream_id = 0;
     init_params.stream_priority = GpuStreamPriority::NORMAL;
     init_params.attribs = gles2::ContextCreationAttribHelper();
     init_params.active_url = GURL();
+    init_params.gpu_preference = gl::PreferIntegratedGpu;
     bool result = false;
     gpu::Capabilities capabilities;
     HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                                init_params, kFriendlyRouteId, GetSharedHandle(),
                                &result, &capabilities));
     EXPECT_TRUE(result);
   }
   EXPECT_TRUE(channel->LookupCommandBuffer(kFriendlyRouteId));
 
   // The shared context is lost.
   channel->LookupCommandBuffer(kSharedRouteId)->MarkContextLost();
 
   // Meanwhile another context is being made pointing to the shared one. This
   // should fail.
   int32_t kAnotherRouteId = 3;
   {
     SCOPED_TRACE("kAnotherRouteId");
     GPUCreateCommandBufferConfig init_params;
     init_params.surface_handle = kNullSurfaceHandle;
+    init_params.size = gfx::Size(1, 1);
     init_params.share_group_id = kSharedRouteId;
     init_params.stream_id = 0;
     init_params.stream_priority = GpuStreamPriority::NORMAL;
     init_params.attribs = gles2::ContextCreationAttribHelper();
     init_params.active_url = GURL();
+    init_params.gpu_preference = gl::PreferIntegratedGpu;
     bool result = false;
     gpu::Capabilities capabilities;
     HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
                                init_params, kAnotherRouteId, GetSharedHandle(),
                                &result, &capabilities));
     EXPECT_FALSE(result);
   }
   EXPECT_FALSE(channel->LookupCommandBuffer(kAnotherRouteId));
 
   // The lost context is still around though (to verify the failure happened due
   // to the shared context being lost, not due to it being deleted).
   EXPECT_TRUE(channel->LookupCommandBuffer(kSharedRouteId));
 
   // Destroy the command buffers we initialized before destoying GL.
   HandleMessage(channel,
                 new GpuChannelMsg_DestroyCommandBuffer(kFriendlyRouteId));
   HandleMessage(channel,
                 new GpuChannelMsg_DestroyCommandBuffer(kSharedRouteId));
 }
 
 }  // namespace gpu