gn fixes for ui/gl and mac

With this the ui/gl target compiles on mac and fails to link with some skia
thingy.

R=brettw@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/303273009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274110 0039d316-1c4b-4281-b951-d872f2087c98

base/BUILD.gn

@@ -273,6 +273,8 @@ component("base") {
     "mac/scoped_launch_data.h",
     "mac/scoped_mach_port.cc",
     "mac/scoped_mach_port.h",
+    "mac/scoped_mach_vm.cc",
+    "mac/scoped_mach_vm.h",
     "mac/scoped_nsautorelease_pool.h",
     "mac/scoped_nsautorelease_pool.mm",
     "mac/scoped_nsexception_enabler.h",

gpu/config/BUILD.gn

@@ -64,6 +64,8 @@ source_set("config") {
       "//build/config/linux:libpci",
       "//third_party/libXNVCtrl",
     ]
+  } else {
+    sources -= [ "gpu_info_collector_x11.cc" ]
   }
 }
 

third_party/mesa/BUILD.gn

+# Copyright 2014 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.
+
+import("//build/config/ui.gni")
+
+config("mesa_headers_config") {
+  include_dirs = [ "src/include" ]
+  if (use_x11) {
+    defines = [ "MESA_EGL_NO_X11_HEADERS" ]
+  }
+}
+
+source_set("mesa_headers") {
+  direct_dependent_configs = [ ":mesa_headers_config" ]
+}

ui/gfx/BUILD.gn

@@ -73,7 +73,7 @@ component("gfx") {
     "color_analysis.h",
     "color_profile.cc",
     "color_profile.h",
-    "color_profile_mac.cc",
+    "color_profile_mac.mm",
     "color_profile_win.cc",
     "color_utils.cc",
     "color_utils.h",

ui/gl/BUILD.gn

@@ -117,16 +117,14 @@ component("gl") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/common",
+    "//third_party/mesa:mesa_headers",
     "//skia",
-    # TODO(GYP) hook up once this is converted.
-    # Also uncomment forward statement below.
-    #"//third_party/mesa:mesa_headers",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   # TODO(GYP) hook up once this is converted.
-  #forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
+  forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
 
   if (is_win || is_android || is_linux) {
     sources += [