Organize typemaps in Blink

This CL organizes the typemaps in Blink GN build. Previously, we dump
typemaps in Blink to third_party/WebKit/Source/platform/mojo/blink_typemaps.gni,
even though some of them are used by third_party/WebKit/public/. This is wrong
and inconsistent with GYP build. So I added a new typemaps.gni in WebKit/public
to collect them separately.

TBR=pdr@chromium.org

BUG=629566

Review-Url: https://codereview.chromium.org/2172333002
Cr-Commit-Position: refs/heads/master@{#407277}

mojo/public/tools/bindings/blink_bindings_configuration.gni

@@ -9,6 +9,7 @@ for_blink = true
 _typemap_imports = [
   "//mojo/public/cpp/bindings/tests/blink_typemaps.gni",
   "//third_party/WebKit/Source/platform/mojo/blink_typemaps.gni",
+  "//third_party/WebKit/public/blink_typemaps.gni",
 ]
 _typemaps = []
 

third_party/WebKit/Source/platform/mojo/blink_typemaps.gni

@@ -5,6 +5,4 @@
 typemaps = [
   "//third_party/WebKit/Source/platform/mojo/KURL.typemap",
   "//third_party/WebKit/Source/platform/mojo/SecurityOrigin.typemap",
-  "//cc/ipc/surface_id.typemap",
-  "//cc/ipc/surface_sequence.typemap",
 ]

third_party/WebKit/public/blink.gyp

@@ -54,6 +54,10 @@
         'blink_android_mojo_sources': [
             'platform/modules/payments/payment_request.mojom',
         ],
+        'blink_typemap_sources': [
+            '<(DEPTH)/cc/ipc/surface_id.typemap',
+            '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+        ],
     },
     'targets': [
         {
@@ -118,9 +122,8 @@
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
                     '../Source/platform/mojo/SecurityOrigin.typemap',
+                    '<@(blink_typemap_sources)',
                 ],
                 'for_blink': 'true',
                 'use_new_wrapper_types': 'false',
@@ -143,10 +146,9 @@
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                  '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+                    '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
                     '<(DEPTH)/url/mojo/origin.typemap',
+                    '<@(blink_typemap_sources)',
                 ],
                 'use_new_wrapper_types': 'false',
             },

third_party/WebKit/public/blink_typemaps.gni

+# Copyright 2016 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.
+
+typemaps = [
+  "//cc/ipc/surface_id.typemap",
+  "//cc/ipc/surface_sequence.typemap",
+]