Add ppapi, improve Windows GN build.

This adds ppapi-related targets except the tests to the GN build.

Did some minor tweaks to the .gypi ppapi lists. Some files were duplicated between the trusted and common lists which causes errors in GN (it doesn't uniquify the lists like GYP). Common is used in every place trusted is, so I just removed the duplicates from the trusted list.

Fixed some warnings in skia and tcmalloc. Added the ability to undefine NOMINMAX on Windows.

Fixed some src/ui Windows compilation issues.

BUG=
R=scottmg@chromium.org

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

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

BUILD.gn

@@ -42,6 +42,7 @@ group("root") {
     "//ipc",
     "//mojo",
     "//net",
+    "//ppapi:ppapi_c",
     #"//sdch",
     "//skia",
     "//third_party/brotli",
@@ -95,6 +96,7 @@ group("root") {
   if (is_android) {
     deps -= [
       "//content/public/common",
+      "//ppapi:ppapi_c",
       "//third_party/libusb",
       #"//third_party/WebKit/Source/platform",
       "//third_party/WebKit/Source/wtf",  # TODO(brettw) re-enable for Android.

base/allocator/BUILD.gn

@@ -178,6 +178,12 @@ if (!is_android) {
       ]
       defines += [ "PERFTOOLS_DLL_DECL=" ]
 
+      configs -= [
+        # Tcmalloc defines this itself, and we don't want duplicate definition
+        # warnings.
+        "//build/config/win:nominmax",
+      ]
+
       direct_dependent_configs = [ ":nocmt" ]
 
       deps += [

build/config/BUILDCONFIG.gn

@@ -323,6 +323,7 @@ _native_compiler_configs = [
 if (is_win) {
   _native_compiler_configs += [
     "//build/config/win:lean_and_mean",
+    "//build/config/win:nominmax",
     "//build/config/win:sdk",
     "//build/config/win:unicode",
   ]

build/config/win/BUILD.gn

@@ -15,7 +15,6 @@ config("sdk") {
     "_WIN32_WINNT=0x0602",
     "_WINDOWS",
     "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-    "NOMINMAX",
     "NTDDI_VERSION=0x06020000",
     "PSAPI_VERSION=1",
     "WIN32",
@@ -129,3 +128,15 @@ config("lean_and_mean") {
     "WIN32_LEAN_AND_MEAN",
   ]
 }
+
+# Nominmax --------------------------------------------------------------------
+
+# Some third party code defines NOMINMAX before including windows.h, which
+# then causes warnings when it's been previously defined on the command line.
+# For such targets, this config can be removed.
+
+config("nominmax") {
+  defines = [
+    "NOMINMAX",
+  ]
+}

content/common/BUILD.gn

@@ -237,9 +237,6 @@ source_set("common") {
   if (!is_win || !use_aura) {
     sources -= [ "cursors/webcursor_aurawin.cc" ]
   }
-  if (!use_aura || !use_x11) {
-    sources -= [ "cursors/webcursor_aurax11.cc" ]
-  }
 
   if (use_seccomp_bpf) {
     defines += [ "USE_SECCOMP_BPF" ]

gpu/ipc/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.
+
+source_set("ipc") {
+  sources = [
+    "gpu_command_buffer_traits.cc",
+    "gpu_command_buffer_traits.h",
+  ]
+
+  configs += [ "//third_party/khronos:khronos_headers" ]
+
+  deps = [
+    "//gpu/command_buffer/common",
+    "//ipc",
+  ]
+}

ppapi/ppapi_sources.gypi

@@ -539,10 +539,8 @@
       'tests/test_browser_font.h',
       'tests/test_buffer.cc',
       'tests/test_buffer.h',
-      'tests/test_c_includes.c',
       'tests/test_char_set.cc',
       'tests/test_char_set.h',
-      'tests/test_cpp_includes.cc',
       'tests/test_crypto.cc',
       'tests/test_crypto.h',
       'tests/test_flash.cc',
@@ -563,14 +561,12 @@
       'tests/test_pdf.h',
       'tests/test_platform_verification_private.cc',
       'tests/test_platform_verification_private.h',
-      'tests/test_struct_sizes.c',
       'tests/test_talk_private.cc',
       'tests/test_talk_private.h',
       'tests/test_tcp_socket_private_trusted.cc',
       'tests/test_tcp_socket_private_trusted.h',
       'tests/test_url_util.cc',
       'tests/test_url_util.h',
-      'tests/test_utils.cc',
       'tests/test_utils.h',
       'tests/test_video_decoder_dev.cc',
       'tests/test_video_decoder_dev.h',

skia/BUILD.gn

@@ -372,6 +372,13 @@ component("skia") {
     ]
   }
 
+  sources -= [
+    # This file is a stub for systems that use pthreads but aren't covered by
+    # one of the more specific pthread files. We don't support any such
+    # systems.
+    "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
+  ]
+
   if (!use_cairo) {
     sources -= [
       "ext/bitmap_platform_device_cairo.cc",
@@ -404,6 +411,14 @@ component("skia") {
     defines = [ "SKIA_IMPLEMENTATION=1" ]
   }
 
+  if (is_win) {
+    configs -= [
+      # Some files define WIN32_LEAN_AND_MEAN and we want to avoid a duplicate
+      # definition warning.
+      "//build/config/win:lean_and_mean",
+    ]
+  }
+
   if (is_linux) {
     configs += [
       "//build/config/linux:fontconfig",

ui/base/BUILD.gn

@@ -251,12 +251,6 @@ component("ui_base") {
     "window_open_disposition.cc",
     "window_open_disposition.h",
     "work_area_watcher_observer.h",
-    "x/selection_owner.cc",
-    "x/selection_owner.h",
-    "x/selection_requestor.cc",
-    "x/selection_requestor.h",
-    "x/selection_utils.cc",
-    "x/selection_utils.h",
     "x/x11_menu_list.cc",
     "x/x11_menu_list.h",
     "x/x11_util.cc",
@@ -294,6 +288,17 @@ component("ui_base") {
     ]
   }
 
+  if (use_x11 && use_aura) {
+    sources += [
+      "x/selection_owner.cc",
+      "x/selection_owner.h",
+      "x/selection_requestor.cc",
+      "x/selection_requestor.h",
+      "x/selection_utils.cc",
+      "x/selection_utils.h",
+    ]
+  }
+
   if (use_aura) {
     deps += [
       "//ui/events",
@@ -303,12 +308,6 @@ component("ui_base") {
       "cursor/cursor.cc",
       "cursor/cursor.h",
       "dragdrop/drag_utils_aura.cc",
-      "x/selection_owner.cc",
-      "x/selection_owner.h",
-      "x/selection_requestor.cc",
-      "x/selection_requestor.h",
-      "x/selection_utils.cc",
-      "x/selection_utils.h",
     ]
   }
   if (!use_x11) {
@@ -319,6 +318,12 @@ component("ui_base") {
     ]
   }
 
+  if (!use_ozone) {
+    sources -= [
+      "touch/touch_device_ozone.cc",
+    ]
+  }
+
   if (!use_aura || !is_linux) {
     sources -= [
       "resource/resource_bundle_auralinux.cc",