Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/client/BUILD.gn

 # Copyright (c) 2013 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.
 
 source_set("client") {
   sources = [
     "cmd_buffer_helper.cc",
     "cmd_buffer_helper.h",
     "fenced_allocator.cc",
     "fenced_allocator.h",
     "gpu_control.h",
     "mapped_memory.cc",
     "mapped_memory.h",
     "ring_buffer.cc",
     "ring_buffer.h",
     "transfer_buffer.cc",
     "transfer_buffer.h",
   ]
 
   defines = [ "GPU_IMPLEMENTATION" ]
 
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]  # size_t to int truncation.
+  }
 
   all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
     "//gpu/command_buffer/common",
   ]
 }
 
 group("gles2_cmd_helper") {
   if (is_component_build) {
@@ skipping 13 matching lines @@
     "//gpu",
   ]
   sources = [
     "gles2_cmd_helper.cc",
     "gles2_cmd_helper.h",
     "gles2_cmd_helper_autogen.h",
   ]
 
   defines = [ "GPU_IMPLEMENTATION" ]
 
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]  # size_t to int truncation.
+  }
 
   deps = [
     ":client",
   ]
 }
 
 gles2_c_lib_source_files = [
   "gles2_c_lib.cc",
   "gles2_c_lib_autogen.h",
   "gles2_c_lib_export.h",
@@ skipping 49 matching lines @@
   ]
   deps = [
     "//ui/gfx",
   ]
 }
 
 # Library emulates GLES2 using command_buffers.
 component("gles2_implementation") {
   sources = gles2_implementation_source_files
 
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
   defines = [ "GLES2_IMPL_IMPLEMENTATION" ]
   all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
 
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]  # size_t to int truncation.
+  }
+
   deps = [
     ":gles2_cmd_helper",
     ":gles2_interface",
     "//base",
     "//gpu/command_buffer/common",
     "//ui/gfx/geometry",
   ]
 }
 
 component("gl_in_process_context") {
@@ skipping 14 matching lines @@
     "//base/third_party/dynamic_annotations",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }
 
 component("gles2_c_lib") {
   sources = gles2_c_lib_source_files
   defines = [ "GLES2_C_LIB_IMPLEMENTATION" ]
 
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]  # size_t to int truncation.
+  }
 
   deps = [
     ":client",
     ":gles2_interface",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/common",
   ]
 }