Revert of Move more of webcore_remaining into GN build files. (patchset #2...

Revert of Move more of webcore_remaining into GN build files. (patchset #2 id:20001 of https://codereview.chromium.org/2301383003/ )

Reason for revert:
Trying to get https://codereview.chromium.org/2308953002/ to apply

Original issue's description:
> Move more of webcore_remaining into GN build files.
>
> This makes more GN build files for various subdirectories of core and adds the
> file lists from the .gypi to those files.
>
> Since there are now so many places requring WebCOre boilerplate, this adds a
> new template for defining core components that automatically does most setup.
> This also cleans up the existing callers.
>
> Committed: https://crrev.com/988d6c9ee633bd2eea254a108908abd7be7351b2
> Cr-Commit-Position: refs/heads/master@{#416344}

TBR=dpranke@chromium.org,dglazkov@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

third_party/WebKit/Source/core/BUILD.gn

@@ -150,21 +150,13 @@ component("core") {
   ]
   deps = [
     ":remaining",
-    "//third_party/WebKit/Source/core/animation",
-    "//third_party/WebKit/Source/core/clipboard",
-    "//third_party/WebKit/Source/core/css",
+    ":rendering",
     "//third_party/WebKit/Source/core/dom",
-    "//third_party/WebKit/Source/core/editing",
     "//third_party/WebKit/Source/core/events",
-    "//third_party/WebKit/Source/core/fetch",
-    "//third_party/WebKit/Source/core/fileapi",
-    "//third_party/WebKit/Source/core/frame",
     "//third_party/WebKit/Source/core/html",
     "//third_party/WebKit/Source/core/input",
-    "//third_party/WebKit/Source/core/layout",
     "//third_party/WebKit/Source/core/layout/svg",
     "//third_party/WebKit/Source/core/observer",
-    "//third_party/WebKit/Source/core/style:rendering",
     "//third_party/WebKit/Source/core/style:svg",
     "//third_party/WebKit/Source/core/svg",
   ]
@@ -192,6 +184,7 @@ target(core_link_large_target_type, "remaining") {
   # the path starts with "rendering/" or not. We should tweak the .gypis a bit
   # to separate out the rendering files.
   sources = rebase_path(webcore_non_rendering_files, ".", "//")
+  sources += rebase_path(webcore_rendering_files, ".", "//")
 
   configs -= core_config_remove
   configs += core_config_add + [
@@ -207,14 +200,45 @@ target(core_link_large_target_type, "remaining") {
     ":prerequisites",
   ]
 
+  if (is_win) {
+    cflags += [ "/wd4334" ]
+    sources -= [ "layout/LayoutThemeFontProviderDefault.cpp" ]
+  } else {  # !is_win
+    sources -= [
+      "layout/LayoutThemeFontProviderWin.cpp",
+      "layout/LayoutThemeWin.cpp",
+      "layout/LayoutThemeWin.h",
+    ]
+  }
+
+  if (!is_linux) {
+    sources -= [
+      "layout/LayoutThemeLinux.cpp",
+      "layout/LayoutThemeLinux.h",
+    ]
+  }
+
+  if (!is_android) {
+    sources -= [
+      "layout/LayoutThemeAndroid.cpp",
+      "layout/LayoutThemeAndroid.h",
+    ]
+  }
+
   if (is_mac) {
     libs += [
       "AppKit.framework",
       "Carbon.framework",
     ]
+  } else {  # !is_mac
+    sources -= [ "editing/commands/SmartReplaceCF.cpp" ]
   }
 }
 
+source_set("rendering") {
+  # The files that go here are currently in "remaining".
+}
+
 source_set("testing") {
   configs += [
     "//third_party/WebKit/Source:inside_blink",

third_party/WebKit/Source/core/animation/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("animation") {
-  split_count = 5
-
-  sources = [
-    "Animation.cpp",
-    "Animation.h",
-    "AnimationClock.cpp",
-    "AnimationClock.h",
-    "AnimationEffectReadOnly.cpp",
-    "AnimationEffectReadOnly.h",
-    "AnimationEffectTiming.cpp",
-    "AnimationEffectTiming.h",
-    "AnimationInputHelpers.cpp",
-    "AnimationInputHelpers.h",
-    "AnimationStack.cpp",
-    "AnimationStack.h",
-    "AnimationTimeline.cpp",
-    "AnimationTimeline.h",
-    "BasicShapeInterpolationFunctions.cpp",
-    "BasicShapeInterpolationFunctions.h",
-    "BorderImageLengthBoxPropertyFunctions.h",
-    "CSSBasicShapeInterpolationType.cpp",
-    "CSSBasicShapeInterpolationType.h",
-    "CSSBorderImageLengthBoxInterpolationType.cpp",
-    "CSSBorderImageLengthBoxInterpolationType.h",
-    "CSSClipInterpolationType.cpp",
-    "CSSClipInterpolationType.h",
-    "CSSColorInterpolationType.cpp",
-    "CSSColorInterpolationType.h",
-    "CSSFilterListInterpolationType.cpp",
-    "CSSFilterListInterpolationType.h",
-    "CSSFontSizeInterpolationType.cpp",
-    "CSSFontSizeInterpolationType.h",
-    "CSSFontWeightInterpolationType.cpp",
-    "CSSFontWeightInterpolationType.h",
-    "CSSImageInterpolationType.cpp",
-    "CSSImageInterpolationType.h",
-    "CSSImageListInterpolationType.cpp",
-    "CSSImageListInterpolationType.h",
-    "CSSImageSliceInterpolationType.cpp",
-    "CSSImageSliceInterpolationType.h",
-    "CSSInterpolationType.cpp",
-    "CSSInterpolationType.h",
-    "CSSLengthInterpolationType.cpp",
-    "CSSLengthInterpolationType.h",
-    "CSSLengthListInterpolationType.cpp",
-    "CSSLengthListInterpolationType.h",
-    "CSSLengthPairInterpolationType.h",
-    "CSSMotionRotationInterpolationType.cpp",
-    "CSSMotionRotationInterpolationType.h",
-    "CSSNumberInterpolationType.cpp",
-    "CSSNumberInterpolationType.h",
-    "CSSPaintInterpolationType.cpp",
-    "CSSPaintInterpolationType.h",
-    "CSSPathInterpolationType.cpp",
-    "CSSPathInterpolationType.h",
-    "CSSPositionAxisListInterpolationType.cpp",
-    "CSSPositionAxisListInterpolationType.h",
-    "CSSPositionInterpolationType.h",
-    "CSSRotateInterpolationType.cpp",
-    "CSSRotateInterpolationType.h",
-    "CSSScaleInterpolationType.cpp",
-    "CSSScaleInterpolationType.h",
-    "CSSShadowListInterpolationType.cpp",
-    "CSSShadowListInterpolationType.h",
-    "CSSSizeListInterpolationType.h",
-    "CSSTextIndentInterpolationType.cpp",
-    "CSSTextIndentInterpolationType.h",
-    "CSSTransformInterpolationType.cpp",
-    "CSSTransformInterpolationType.h",
-    "CSSTransformOriginInterpolationType.h",
-    "CSSTranslateInterpolationType.cpp",
-    "CSSTranslateInterpolationType.h",
-    "CSSValueInterpolationType.cpp",
-    "CSSValueInterpolationType.h",
-    "CSSVisibilityInterpolationType.cpp",
-    "CSSVisibilityInterpolationType.h",
-    "ColorPropertyFunctions.cpp",
-    "ColorPropertyFunctions.h",
-    "CompositorAnimations.cpp",
-    "CompositorAnimations.h",
-    "CompositorPendingAnimations.cpp",
-    "CompositorPendingAnimations.h",
-    "CustomCompositorAnimationManager.cpp",
-    "CustomCompositorAnimationManager.h",
-    "CustomCompositorAnimations.cpp",
-    "CustomCompositorAnimations.h",
-    "DocumentAnimation.h",
-    "DocumentAnimations.cpp",
-    "DocumentAnimations.h",
-    "DocumentTimeline.h",
-    "EffectInput.cpp",
-    "EffectInput.h",
-    "EffectModel.h",
-    "ElementAnimation.h",
-    "ElementAnimations.cpp",
-    "ElementAnimations.h",
-    "FilterInterpolationFunctions.cpp",
-    "FilterInterpolationFunctions.h",
-    "FilterListPropertyFunctions.h",
-    "ImageListPropertyFunctions.h",
-    "ImagePropertyFunctions.h",
-    "ImageSlicePropertyFunctions.h",
-    "InertEffect.cpp",
-    "InertEffect.h",
-    "InterpolableValue.cpp",
-    "InterpolableValue.h",
-    "Interpolation.cpp",
-    "Interpolation.h",
-    "InterpolationEffect.cpp",
-    "InterpolationEffect.h",
-    "InterpolationType.h",
-    "InterpolationValue.h",
-    "InvalidatableInterpolation.cpp",
-    "InvalidatableInterpolation.h",
-    "Keyframe.cpp",
-    "Keyframe.h",
-    "KeyframeEffect.cpp",
-    "KeyframeEffect.h",
-    "KeyframeEffectModel.cpp",
-    "KeyframeEffectModel.h",
-    "LegacyStyleInterpolation.h",
-    "LengthListPropertyFunctions.cpp",
-    "LengthListPropertyFunctions.h",
-    "LengthPropertyFunctions.cpp",
-    "LengthPropertyFunctions.h",
-    "LengthUnitsChecker.h",
-    "ListInterpolationFunctions.cpp",
-    "ListInterpolationFunctions.h",
-    "NonInterpolableValue.h",
-    "NumberAttributeFunctions.h",
-    "NumberPropertyFunctions.cpp",
-    "NumberPropertyFunctions.h",
-    "PaintPropertyFunctions.cpp",
-    "PaintPropertyFunctions.h",
-    "PairwiseInterpolationValue.h",
-    "PathInterpolationFunctions.cpp",
-    "PathInterpolationFunctions.h",
-    "PrimitiveInterpolation.h",
-    "PropertyHandle.cpp",
-    "PropertyHandle.h",
-    "PropertyInterpolationTypesMapping.cpp",
-    "PropertyInterpolationTypesMapping.h",
-    "SVGAngleInterpolationType.cpp",
-    "SVGAngleInterpolationType.h",
-    "SVGIntegerInterpolationType.cpp",
-    "SVGIntegerInterpolationType.h",
-    "SVGIntegerOptionalIntegerInterpolationType.cpp",
-    "SVGIntegerOptionalIntegerInterpolationType.h",
-    "SVGInterpolationType.cpp",
-    "SVGInterpolationType.h",
-    "SVGLengthInterpolationType.cpp",
-    "SVGLengthInterpolationType.h",
-    "SVGLengthListInterpolationType.cpp",
-    "SVGLengthListInterpolationType.h",
-    "SVGNumberInterpolationType.cpp",
-    "SVGNumberInterpolationType.h",
-    "SVGNumberListInterpolationType.cpp",
-    "SVGNumberListInterpolationType.h",
-    "SVGNumberOptionalNumberInterpolationType.cpp",
-    "SVGNumberOptionalNumberInterpolationType.h",
-    "SVGPathInterpolationType.cpp",
-    "SVGPathInterpolationType.h",
-    "SVGPathSegInterpolationFunctions.cpp",
-    "SVGPathSegInterpolationFunctions.h",
-    "SVGPointListInterpolationType.cpp",
-    "SVGPointListInterpolationType.h",
-    "SVGRectInterpolationType.cpp",
-    "SVGRectInterpolationType.h",
-    "SVGTransformListInterpolationType.cpp",
-    "SVGTransformListInterpolationType.h",
-    "SVGValueInterpolationType.cpp",
-    "SVGValueInterpolationType.h",
-    "SampledEffect.cpp",
-    "SampledEffect.h",
-    "ShadowInterpolationFunctions.cpp",
-    "ShadowInterpolationFunctions.h",
-    "StringKeyframe.cpp",
-    "StringKeyframe.h",
-    "StyleInterpolation.h",
-    "Timing.cpp",
-    "Timing.h",
-    "TimingCalculations.h",
-    "TimingInput.cpp",
-    "TimingInput.h",
-    "TypedInterpolationValue.h",
-    "UnderlyingValueOwner.cpp",
-    "UnderlyingValueOwner.h",
-    "animatable/AnimatableClipPathOperation.cpp",
-    "animatable/AnimatableClipPathOperation.h",
-    "animatable/AnimatableColor.cpp",
-    "animatable/AnimatableColor.h",
-    "animatable/AnimatableDouble.cpp",
-    "animatable/AnimatableDouble.h",
-    "animatable/AnimatableDoubleAndBool.cpp",
-    "animatable/AnimatableDoubleAndBool.h",
-    "animatable/AnimatableFilterOperations.cpp",
-    "animatable/AnimatableFilterOperations.h",
-    "animatable/AnimatableImage.cpp",
-    "animatable/AnimatableImage.h",
-    "animatable/AnimatableLength.cpp",
-    "animatable/AnimatableLength.h",
-    "animatable/AnimatableLengthBox.cpp",
-    "animatable/AnimatableLengthBox.h",
-    "animatable/AnimatableLengthBoxAndBool.cpp",
-    "animatable/AnimatableLengthBoxAndBool.h",
-    "animatable/AnimatableLengthPoint.cpp",
-    "animatable/AnimatableLengthPoint.h",
-    "animatable/AnimatableLengthPoint3D.cpp",
-    "animatable/AnimatableLengthPoint3D.h",
-    "animatable/AnimatableLengthSize.cpp",
-    "animatable/AnimatableLengthSize.h",
-    "animatable/AnimatableNeutral.h",
-    "animatable/AnimatablePath.cpp",
-    "animatable/AnimatablePath.h",
-    "animatable/AnimatableRepeatable.cpp",
-    "animatable/AnimatableRepeatable.h",
-    "animatable/AnimatableSVGPaint.cpp",
-    "animatable/AnimatableSVGPaint.h",
-    "animatable/AnimatableShadow.cpp",
-    "animatable/AnimatableShadow.h",
-    "animatable/AnimatableShapeValue.cpp",
-    "animatable/AnimatableShapeValue.h",
-    "animatable/AnimatableStrokeDasharrayList.cpp",
-    "animatable/AnimatableStrokeDasharrayList.h",
-    "animatable/AnimatableTransform.cpp",
-    "animatable/AnimatableTransform.h",
-    "animatable/AnimatableUnknown.h",
-    "animatable/AnimatableValue.cpp",
-    "animatable/AnimatableValue.h",
-    "animatable/AnimatableValueKeyframe.cpp",
-    "animatable/AnimatableValueKeyframe.h",
-    "animatable/AnimatableVisibility.cpp",
-    "animatable/AnimatableVisibility.h",
-    "css/CSSAnimatableValueFactory.cpp",
-    "css/CSSAnimatableValueFactory.h",
-    "css/CSSAnimationData.cpp",
-    "css/CSSAnimationData.h",
-    "css/CSSAnimationUpdate.h",
-    "css/CSSAnimations.cpp",
-    "css/CSSAnimations.h",
-    "css/CSSTimingData.cpp",
-    "css/CSSTimingData.h",
-    "css/CSSTransitionData.cpp",
-    "css/CSSTransitionData.h",
-  ]
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/clipboard/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("clipboard") {
-  sources = [
-    "DataObject.cpp",
-    "DataObject.h",
-    "DataObjectItem.cpp",
-    "DataObjectItem.h",
-    "DataTransfer.cpp",
-    "DataTransfer.h",
-    "DataTransferItem.cpp",
-    "DataTransferItem.h",
-    "DataTransferItemList.cpp",
-    "DataTransferItemList.h",
-    "DraggedIsolatedFileSystem.cpp",
-    "DraggedIsolatedFileSystem.h",
-    "Pasteboard.cpp",
-    "Pasteboard.h",
-  ]
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/core.gni

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/split_static_library.gni")
 import("//third_party/WebKit/Source/config.gni")
 
 blink_core_output_dir = "$root_gen_dir/blink/core"
@@ -47,75 +46,6 @@ if (is_component_build) {
   core_link_small_target_type = "static_library"
 }
 
-# Use this to generate a static library or source set that gets linked into
-# "core". This will either be a source_set (component build), a static library
-# (split_count undefined) or a split static library (split_count defined).
-#
-# Special values. All unlisted values are forwarded to the underlying library.
-#
-#   configs
-#      Normal meaning. The set_defaults call below will make the default value
-#      of configs in the calling code take into account the core_config_add and
-#      core_config_remove lists above. So you don't need to manually take these
-#      into account: just modify the configs as normal for target-specific
-#      overrides (or don't touch it).
-#
-#   split_count
-#      If defined, non-component builds will generate this number of static
-#      libraries by splitting the sources. This is for use on Windows where the
-#      maximum static library size is 2GB, and 64-bit builds with full symbols
-#      can exceed this if there are many sources.
-#
-#   deps
-#      Normal meaning but "core:prerequisites" target is always added. Callers
-#      shouldn'y list prerequisites as a dependency.
-#
-#   visibility
-#      Normal meaning if defined. If undefined, defaults to everything in core.
-template("blink_core_sources") {
-  if (is_component_build) {
-    target_type = "source_set"
-
-    # This assert avoids an unused variable warning.
-    assert(!defined(invoker.split_count) || invoker.split_count != 0)
-  } else if (!defined(invoker.split_count)) {
-    target_type = "static_library"
-  } else {
-    target_type = "split_static_library"
-  }
-
-  target(target_type, target_name) {
-    # The visibility will get overridden by forward_variables_from below if the
-    # invoker defined it.
-    visibility = [ "//third_party/WebKit/Source/core/*" ]
-
-    if (target_type == "split_static_library") {
-      split_count = invoker.split_count
-    }
-
-    deps = [
-      "//third_party/WebKit/Source/core:prerequisites",
-    ]
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
-
-    # Take everything else not handled above from the invoker.
-    forward_variables_from(invoker,
-                           "*",
-                           [
-                             "deps",
-                             "split_count",
-                           ])
-  }
-}
-set_defaults("blink_core_sources") {
-  # This sets the default list of configs when the blink_core_sources target
-  # is defined. The default_compiler_configs comes from BUILDCONFIG.gn and
-  # is the list normally applied to static libraries and source sets.
-  configs = default_compiler_configs - core_config_remove + core_config_add
-}
-
 # This file is the GN version of core.gypi. We rebase most paths to be absolute
 # so these lists can be used by BUILD files in different directories without
 # worrying about the base directory.
@@ -153,6 +83,8 @@ core_typedefs_enums_only_idl_files =
 
 webcore_non_rendering_files =
     get_path_info(_gypi.webcore_non_rendering_files, "abspath")
+webcore_rendering_files =
+    get_path_info(_gypi.webcore_rendering_files, "abspath")
 webcore_testing_idl_files =
     get_path_info(_gypi.webcore_testing_idl_files, "abspath")
 webcore_testing_idl_with_modules_dependency_files =

third_party/WebKit/Source/core/dom/BUILD.gn

@@ -2,10 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/split_static_library.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("dom") {
-  split_count = 5
+target(core_link_large_target_type, "dom") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
+  if (core_link_large_target_type == "split_static_library") {
+    split_count = 5
+  }
 
   sources = [
     "AXObjectCache.cpp",
@@ -387,8 +392,14 @@ blink_core_sources("dom") {
     "shadow/SlotScopedTraversal.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/editing/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("editing") {
-  split_count = 5
-  sources = [
-    "CaretBase.cpp",
-    "CaretBase.h",
-    "CompositionUnderline.h",
-    "DOMSelection.cpp",
-    "DOMSelection.h",
-    "DragCaretController.cpp",
-    "DragCaretController.h",
-    "EditingBehavior.cpp",
-    "EditingBehavior.h",
-    "EditingStrategy.cpp",
-    "EditingStrategy.h",
-    "EditingStyle.cpp",
-    "EditingUtilities.cpp",
-    "EditingUtilities.h",
-    "Editor.cpp",
-    "EditorKeyBindings.cpp",
-    "EphemeralRange.cpp",
-    "EphemeralRange.h",
-    "FrameCaret.cpp",
-    "FrameCaret.h",
-    "FrameSelection.cpp",
-    "GranularityStrategy.cpp",
-    "InputMethodController.cpp",
-    "InputMethodController.h",
-    "PendingSelection.cpp",
-    "PendingSelection.h",
-    "PlainTextRange.cpp",
-    "PlainTextRange.h",
-    "Position.cpp",
-    "Position.h",
-    "PositionIterator.cpp",
-    "PositionIterator.h",
-    "PositionWithAffinity.cpp",
-    "PositionWithAffinity.h",
-    "RelocatablePosition.cpp",
-    "RelocatablePosition.h",
-    "RenderedPosition.cpp",
-    "RenderedPosition.h",
-    "SelectionAdjuster.cpp",
-    "SelectionAdjuster.h",
-    "SelectionController.cpp",
-    "SelectionController.h",
-    "SelectionEditor.cpp",
-    "SelectionEditor.h",
-    "SelectionModifier.cpp",
-    "SelectionModifier.h",
-    "SelectionType.h",
-    "SurroundingText.cpp",
-    "SurroundingText.h",
-    "TextAffinity.cpp",
-    "TextAffinity.h",
-    "VisiblePosition.cpp",
-    "VisibleSelection.cpp",
-    "VisibleUnits.cpp",
-    "commands/AppendNodeCommand.cpp",
-    "commands/AppendNodeCommand.h",
-    "commands/ApplyBlockElementCommand.cpp",
-    "commands/ApplyBlockElementCommand.h",
-    "commands/ApplyStyleCommand.cpp",
-    "commands/ApplyStyleCommand.h",
-    "commands/BreakBlockquoteCommand.cpp",
-    "commands/BreakBlockquoteCommand.h",
-    "commands/CompositeEditCommand.cpp",
-    "commands/CompositeEditCommand.h",
-    "commands/CreateLinkCommand.cpp",
-    "commands/CreateLinkCommand.h",
-    "commands/DeleteFromTextNodeCommand.cpp",
-    "commands/DeleteFromTextNodeCommand.h",
-    "commands/DeleteSelectionCommand.cpp",
-    "commands/DeleteSelectionCommand.h",
-    "commands/EditCommand.cpp",
-    "commands/EditCommand.h",
-    "commands/EditingState.cpp",
-    "commands/EditingState.h",
-    "commands/EditorCommand.cpp",
-    "commands/FormatBlockCommand.cpp",
-    "commands/FormatBlockCommand.h",
-    "commands/IndentOutdentCommand.cpp",
-    "commands/IndentOutdentCommand.h",
-    "commands/InsertIntoTextNodeCommand.cpp",
-    "commands/InsertIntoTextNodeCommand.h",
-    "commands/InsertLineBreakCommand.cpp",
-    "commands/InsertLineBreakCommand.h",
-    "commands/InsertListCommand.cpp",
-    "commands/InsertListCommand.h",
-    "commands/InsertNodeBeforeCommand.cpp",
-    "commands/InsertNodeBeforeCommand.h",
-    "commands/InsertParagraphSeparatorCommand.cpp",
-    "commands/InsertParagraphSeparatorCommand.h",
-    "commands/InsertTextCommand.cpp",
-    "commands/InsertTextCommand.h",
-    "commands/MergeIdenticalElementsCommand.cpp",
-    "commands/MergeIdenticalElementsCommand.h",
-    "commands/MoveSelectionCommand.cpp",
-    "commands/MoveSelectionCommand.h",
-    "commands/RemoveCSSPropertyCommand.cpp",
-    "commands/RemoveCSSPropertyCommand.h",
-    "commands/RemoveFormatCommand.cpp",
-    "commands/RemoveFormatCommand.h",
-    "commands/RemoveNodeCommand.cpp",
-    "commands/RemoveNodeCommand.h",
-    "commands/RemoveNodePreservingChildrenCommand.cpp",
-    "commands/RemoveNodePreservingChildrenCommand.h",
-    "commands/ReplaceNodeWithSpanCommand.cpp",
-    "commands/ReplaceNodeWithSpanCommand.h",
-    "commands/ReplaceSelectionCommand.cpp",
-    "commands/ReplaceSelectionCommand.h",
-    "commands/SetNodeAttributeCommand.cpp",
-    "commands/SetNodeAttributeCommand.h",
-    "commands/SimplifyMarkupCommand.cpp",
-    "commands/SimplifyMarkupCommand.h",
-    "commands/SmartReplace.h",
-    "commands/SmartReplaceICU.cpp",
-    "commands/SplitElementCommand.cpp",
-    "commands/SplitElementCommand.h",
-    "commands/SplitTextNodeCommand.cpp",
-    "commands/SplitTextNodeCommand.h",
-    "commands/SplitTextNodeContainingElementCommand.cpp",
-    "commands/SplitTextNodeContainingElementCommand.h",
-    "commands/TypingCommand.cpp",
-    "commands/TypingCommand.h",
-    "commands/UndoStack.cpp",
-    "commands/UndoStack.h",
-    "commands/UndoStep.h",
-    "commands/UnlinkCommand.cpp",
-    "commands/UnlinkCommand.h",
-    "commands/WrapContentsInDummySpanCommand.cpp",
-    "commands/WrapContentsInDummySpanCommand.h",
-    "iterators/BackwardsCharacterIterator.cpp",
-    "iterators/BackwardsTextBuffer.cpp",
-    "iterators/BackwardsTextBuffer.h",
-    "iterators/BitStack.cpp",
-    "iterators/CharacterIterator.cpp",
-    "iterators/ForwardsTextBuffer.cpp",
-    "iterators/ForwardsTextBuffer.h",
-    "iterators/FullyClippedStateStack.cpp",
-    "iterators/SearchBuffer.cpp",
-    "iterators/SearchBuffer.h",
-    "iterators/SimplifiedBackwardsTextIterator.cpp",
-    "iterators/TextBufferBase.cpp",
-    "iterators/TextBufferBase.h",
-    "iterators/TextIterator.cpp",
-    "iterators/TextIterator.h",
-    "iterators/TextIteratorTextState.cpp",
-    "iterators/TextIteratorTextState.h",
-    "iterators/WordAwareIterator.cpp",
-    "markers/DocumentMarker.cpp",
-    "markers/DocumentMarker.h",
-    "markers/DocumentMarkerController.cpp",
-    "markers/DocumentMarkerController.h",
-    "markers/RenderedDocumentMarker.h",
-    "serializers/HTMLInterchange.cpp",
-    "serializers/HTMLInterchange.h",
-    "serializers/MarkupAccumulator.cpp",
-    "serializers/MarkupAccumulator.h",
-    "serializers/MarkupFormatter.cpp",
-    "serializers/MarkupFormatter.h",
-    "serializers/Serialization.cpp",
-    "serializers/Serialization.h",
-    "serializers/StyledMarkupAccumulator.cpp",
-    "serializers/StyledMarkupAccumulator.h",
-    "serializers/StyledMarkupSerializer.cpp",
-    "serializers/StyledMarkupSerializer.h",
-    "serializers/TextOffset.cpp",
-    "serializers/TextOffset.h",
-    "spellcheck/SpellCheckRequester.cpp",
-    "spellcheck/SpellCheckRequester.h",
-    "spellcheck/SpellChecker.cpp",
-    "spellcheck/SpellChecker.h",
-    "spellcheck/TextCheckingParagraph.cpp",
-    "spellcheck/TextCheckingParagraph.h",
-    "state_machines/BackspaceStateMachine.cpp",
-    "state_machines/BackspaceStateMachine.h",
-    "state_machines/BackwardGraphemeBoundaryStateMachine.cpp",
-    "state_machines/BackwardGraphemeBoundaryStateMachine.h",
-    "state_machines/ForwardGraphemeBoundaryStateMachine.cpp",
-    "state_machines/ForwardGraphemeBoundaryStateMachine.h",
-    "state_machines/StateMachineUtil.cpp",
-    "state_machines/StateMachineUtil.h",
-    "state_machines/TextSegmentationMachineState.cpp",
-    "state_machines/TextSegmentationMachineState.h",
-  ]
-
-  if (is_mac) {
-    sources += [ "commands/SmartReplaceCF.cpp" ]
-  }
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/events/BUILD.gn

@@ -4,7 +4,9 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("events") {
+target(core_link_small_target_type, "events") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
   sources = [
     "AddEventListenerOptionsResolved.cpp",
     "AddEventListenerOptionsResolved.h",
@@ -105,8 +107,14 @@ blink_core_sources("events") {
     "WindowEventContext.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/fetch/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("fetch") {
-  sources = [
-    "AccessControlStatus.h",
-    "CSSStyleSheetResource.cpp",
-    "CSSStyleSheetResource.h",
-    "CachedMetadata.cpp",
-    "CachedMetadata.h",
-    "CachedMetadataHandler.h",
-    "ClientHintsPreferences.cpp",
-    "ClientHintsPreferences.h",
-    "CrossOriginAccessControl.cpp",
-    "CrossOriginAccessControl.h",
-    "DocumentResource.cpp",
-    "DocumentResource.h",
-    "DocumentResourceReference.h",
-    "FetchContext.cpp",
-    "FetchContext.h",
-    "FetchInitiatorInfo.h",
-    "FetchRequest.cpp",
-    "FetchRequest.h",
-    "FetchUtils.cpp",
-    "FetchUtils.h",
-    "FontResource.cpp",
-    "FontResource.h",
-    "ImageResource.cpp",
-    "ImageResource.h",
-    "IntegrityMetadata.cpp",
-    "IntegrityMetadata.h",
-    "LinkFetchResource.cpp",
-    "LinkFetchResource.h",
-    "MemoryCache.cpp",
-    "MemoryCache.h",
-    "MultipartImageResourceParser.cpp",
-    "MultipartImageResourceParser.h",
-    "RawResource.cpp",
-    "RawResource.h",
-    "Resource.cpp",
-    "Resource.h",
-    "ResourceClientWalker.h",
-    "ResourceFetcher.cpp",
-    "ResourceFetcher.h",
-    "ResourceLoader.cpp",
-    "ResourceLoader.h",
-    "ResourceLoaderOptions.h",
-    "ResourceLoadingLog.h",
-    "ScriptResource.cpp",
-    "ScriptResource.h",
-    "SubstituteData.h",
-    "TextResource.cpp",
-    "TextResource.h",
-    "UniqueIdentifier.cpp",
-    "UniqueIdentifier.h",
-    "XSLStyleSheetResource.cpp",
-    "XSLStyleSheetResource.h",
-  ]
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/fileapi/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("fileapi") {
-  sources = [
-    "Blob.cpp",
-    "Blob.h",
-    "BlobCallback.h",
-    "File.cpp",
-    "File.h",
-    "FileError.cpp",
-    "FileError.h",
-    "FileList.cpp",
-    "FileList.h",
-    "FileReader.cpp",
-    "FileReader.h",
-    "FileReaderLoader.cpp",
-    "FileReaderLoader.h",
-    "FileReaderLoaderClient.h",
-    "FileReaderSync.cpp",
-    "FileReaderSync.h",
-    "URLFileAPI.cpp",
-    "URLFileAPI.h",
-  ]
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/frame/BUILD.gn

-# 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.
-
-import("//third_party/WebKit/Source/core/core.gni")
-
-blink_core_sources("frame") {
-  sources = [
-    "BarProp.cpp",
-    "BarProp.h",
-    "DOMTimer.cpp",
-    "DOMTimer.h",
-    "DOMTimerCoordinator.cpp",
-    "DOMTimerCoordinator.h",
-    "DOMVisualViewport.cpp",
-    "DOMVisualViewport.h",
-    "DOMWindow.cpp",
-    "DOMWindow.h",
-    "DOMWindowBase64.cpp",
-    "DOMWindowBase64.h",
-    "DOMWindowEventHandlers.h",
-    "DOMWindowProperty.cpp",
-    "DOMWindowProperty.h",
-    "DOMWindowTimers.cpp",
-    "DOMWindowTimers.h",
-    "DeprecatedScheduleStyleRecalcDuringLayout.cpp",
-    "DeprecatedScheduleStyleRecalcDuringLayout.h",
-    "Deprecation.cpp",
-    "Deprecation.h",
-    "DeviceSingleWindowEventController.cpp",
-    "DeviceSingleWindowEventController.h",
-    "EventHandlerRegistry.cpp",
-    "EventHandlerRegistry.h",
-    "External.h",
-    "Frame.cpp",
-    "Frame.h",
-    "FrameConsole.cpp",
-    "FrameHost.cpp",
-    "FrameHost.h",
-    "FrameOwner.h",
-    "FrameSerializer.cpp",
-    "FrameSerializer.h",
-    "FrameView.cpp",
-    "FrameView.h",
-    "FrameViewAutoSizeInfo.cpp",
-    "History.cpp",
-    "History.h",
-    "HostsUsingFeatures.cpp",
-    "HostsUsingFeatures.h",
-    "ImageBitmap.cpp",
-    "ImageBitmap.h",
-    "LayoutSubtreeRootList.cpp",
-    "LayoutSubtreeRootList.h",
-    "LocalDOMWindow.cpp",
-    "LocalDOMWindow.h",
-    "LocalFrame.cpp",
-    "LocalFrame.h",
-    "LocalFrameLifecycleNotifier.h",
-    "LocalFrameLifecycleObserver.h",
-    "Location.cpp",
-    "Location.h",
-    "Navigator.cpp",
-    "Navigator.h",
-    "NavigatorCPU.cpp",
-    "NavigatorCPU.h",
-    "NavigatorID.cpp",
-    "NavigatorID.h",
-    "NavigatorLanguage.cpp",
-    "NavigatorLanguage.h",
-    "NavigatorOnLine.h",
-    "PageScaleConstraints.cpp",
-    "PageScaleConstraints.h",
-    "PageScaleConstraintsSet.cpp",
-    "PageScaleConstraintsSet.h",
-    "PlatformEventController.cpp",
-    "PlatformEventController.h",
-    "PlatformEventDispatcher.cpp",
-    "PlatformEventDispatcher.h",
-    "RemoteDOMWindow.cpp",
-    "RemoteDOMWindow.h",
-    "RemoteFrame.cpp",
-    "RemoteFrame.h",
-    "RemoteFrameClient.h",
-    "RemoteFrameView.cpp",
-    "RemoteFrameView.h",
-    "RootFrameViewport.cpp",
-    "RootFrameViewport.h",
-    "Screen.cpp",
-    "Screen.h",
-    "Settings.cpp",
-    "SettingsDelegate.cpp",
-    "SettingsDelegate.h",
-    "SmartClip.cpp",
-    "SmartClip.h",
-    "SubresourceIntegrity.cpp",
-    "SubresourceIntegrity.h",
-    "SuspendableTimer.cpp",
-    "SuspendableTimer.h",
-    "TopControls.cpp",
-    "TopControls.h",
-    "UseCounter.cpp",
-    "VisualViewport.cpp",
-    "VisualViewport.h",
-    "csp/CSPDirectiveList.cpp",
-    "csp/CSPSource.cpp",
-    "csp/CSPSourceList.cpp",
-    "csp/ContentSecurityPolicy.cpp",
-    "csp/MediaListDirective.cpp",
-    "csp/SourceListDirective.cpp",
-  ]
-
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}

third_party/WebKit/Source/core/html/BUILD.gn

@@ -5,8 +5,12 @@
 import("//build/split_static_library.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("html") {
-  split_count = 5
+target(core_link_large_target_type, "html") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
+  if (core_link_large_target_type == "split_static_library") {
+    split_count = 5
+  }
 
   sources = [
     "AutoplayExperimentHelper.cpp",
@@ -503,8 +507,14 @@ blink_core_sources("html") {
     "track/vtt/VTTTokenizer.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/input/BUILD.gn

@@ -4,7 +4,9 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("input") {
+target(core_link_small_target_type, "input") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
   sources = [
     "EventHandler.cpp",
     "EventHandler.h",
@@ -24,8 +26,14 @@ blink_core_sources("input") {
     "TouchEventManager.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/layout/svg/BUILD.gn

@@ -4,7 +4,9 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("svg") {
+target(core_link_small_target_type, "svg") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
   sources = [
     "LayoutSVGBlock.cpp",
     "LayoutSVGBlock.h",
@@ -96,8 +98,14 @@ blink_core_sources("svg") {
     "SVGTextQuery.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/observer/BUILD.gn

@@ -4,7 +4,9 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("observer") {
+target(core_link_small_target_type, "observer") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
   sources = [
     "ResizeObservation.cpp",
     "ResizeObservation.h",
@@ -17,8 +19,14 @@ blink_core_sources("observer") {
     "ResizeObserverEntry.h",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/style/BUILD.gn

@@ -4,83 +4,22 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("rendering") {
+target(core_link_small_target_type, "svg") {
   visibility = [ "//third_party/WebKit/Source/core/*" ]
 
-  sources = [
-    "AppliedTextDecoration.cpp",
-    "BasicShapes.cpp",
-    "BorderEdge.cpp",
-    "BorderEdge.h",
-    "BorderImageLength.h",
-    "BorderImageLengthBox.h",
-    "CachedUAStyle.h",
-    "ClipPathOperation.h",
-    "ComputedStyle.cpp",
-    "ComputedStyle.h",
-    "ContentData.cpp",
-    "CounterDirectives.cpp",
-    "DataEquivalency.h",
-    "DataPersistent.h",
-    "DataRef.h",
-    "FillLayer.cpp",
-    "GridArea.h",
-    "GridPositionsResolver.cpp",
-    "GridPositionsResolver.h",
-    "NinePieceImage.cpp",
-    "QuotesData.cpp",
-    "QuotesData.h",
-    "ShadowData.cpp",
-    "ShadowData.h",
-    "ShadowList.cpp",
-    "ShadowList.h",
-    "StyleBackgroundData.cpp",
-    "StyleBoxData.cpp",
-    "StyleContentAlignmentData.h",
-    "StyleDeprecatedFlexibleBoxData.cpp",
-    "StyleFetchedImage.cpp",
-    "StyleFetchedImageSet.cpp",
-    "StyleFilterData.cpp",
-    "StyleFlexibleBoxData.cpp",
-    "StyleGeneratedImage.cpp",
-    "StyleGridData.cpp",
-    "StyleGridItemData.cpp",
-    "StyleImage.cpp",
-    "StyleInheritedData.cpp",
-    "StyleInvalidImage.h",
-    "StyleMotionData.cpp",
-    "StyleMotionData.h",
-    "StyleMotionRotation.h",
-    "StyleMultiColData.cpp",
-    "StylePath.cpp",
-    "StylePath.h",
-    "StylePendingImage.h",
-    "StyleRareInheritedData.cpp",
-    "StyleRareNonInheritedData.cpp",
-    "StyleScrollSnapData.cpp",
-    "StyleScrollSnapData.h",
-    "StyleSelfAlignmentData.h",
-    "StyleSurroundData.cpp",
-    "StyleTransformData.cpp",
-    "StyleVariableData.cpp",
-    "StyleVariableData.h",
-    "StyleVisualData.cpp",
-    "StyleWillChangeData.cpp",
-    "TextSizeAdjust.h",
-  ]
-  configs += [
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
-}
-
-blink_core_sources("svg") {
   sources = [
     "SVGComputedStyle.cpp",
     "SVGComputedStyleDefs.cpp",
   ]
+
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }

third_party/WebKit/Source/core/svg/BUILD.gn

@@ -4,7 +4,9 @@
 
 import("//third_party/WebKit/Source/core/core.gni")
 
-blink_core_sources("svg") {
+target(core_link_small_target_type, "svg") {
+  visibility = [ "//third_party/WebKit/Source/core/*" ]
+
   sources = [
     "ColorDistance.cpp",
     "ColorDistance.h",
@@ -293,8 +295,14 @@ blink_core_sources("svg") {
     "properties/SVGPropertyTearOff.cpp",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
+
+  deps = [
+    "//third_party/WebKit/Source/core:prerequisites",
+  ]
 }