Remove old wtf/ directory.

The removal comes with various fixups in several places: (1) Various BUILD.gn files are updated so they point to the new location; (2) Code generator templates in Source/build are fixed; and (3) Other random references to old wtf/ are fixed. BUG=691465 R=haraken@chromium.org,thakis@chromium.org,yzshen@chromium.org,dcheng@chromium.org Review-Url: https://codereview.chromium.org/2822953002 Cr-Commit-Position: refs/heads/master@{#464941}
Denger-Network · Apr 17, 2017 · c36ab84 · c36ab84
1 parent 9bb7188
commit c36ab84
Show file tree

Hide file tree

Showing 192 changed files with 66 additions and 1,842 deletions.
diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn
@@ -185,7 +185,7 @@ if (!is_ios) {
 
     public_deps = [
       ":bindings",
-      "//third_party/WebKit/Source/wtf",
+      "//third_party/WebKit/Source/platform/wtf",
     ]
 
     public_configs = [ "//third_party/WebKit/Source:config" ]

diff --git a/third_party/WebKit/Source/BUILD.gn b/third_party/WebKit/Source/BUILD.gn
@@ -79,11 +79,6 @@ config("blink_pch") {
 
 config("config") {
   include_dirs = [
-    # crbug.com/691465: Temporary solution to fix an issue related to MSVC-
-    # specific #include search order. This essentially lets
-    # #include "wtf/Foo.h" actually include "platform/wtf/Foo.h". This is okay
-    # because these files are equivalent if both exist.
-    "platform",
     ".",
     "..",
     "$root_gen_dir/blink",

diff --git a/third_party/WebKit/Source/bindings/core/v8/BUILD.gn b/third_party/WebKit/Source/bindings/core/v8/BUILD.gn
@@ -350,7 +350,7 @@ source_set("testing") {
   deps = [
     ":bindings_core_impl_generated",
     "//skia",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//v8",
   ]
 }

diff --git a/third_party/WebKit/Source/bindings/modules/BUILD.gn b/third_party/WebKit/Source/bindings/modules/BUILD.gn
@@ -195,7 +195,7 @@ source_set("generated") {
     ":event_modules_names",
     ":event_target_modules_names",
     "//third_party/WebKit/Source/core",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//v8",
   ]
 }
diff --git a/third_party/WebKit/Source/bindings/modules/v8/wasm/WasmResponseExtensions.cpp b/third_party/WebKit/Source/bindings/modules/v8/wasm/WasmResponseExtensions.cpp
@@ -13,7 +13,7 @@
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/FetchDataLoader.h"
 #include "platform/heap/Handle.h"
-#include "wtf/RefPtr.h"
+#include "platform/wtf/RefPtr.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/bindings/modules/v8/wasm/WasmResponseExtensions.h b/third_party/WebKit/Source/bindings/modules/v8/wasm/WasmResponseExtensions.h
@@ -6,8 +6,8 @@
 #define WasmResponseExtensions_h
 
 #include "modules/ModulesExport.h"
+#include "platform/wtf/Allocator.h"
 #include "v8/include/v8.h"
-#include "wtf/Allocator.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/make_css_property_names.py b/third_party/WebKit/Source/build/scripts/make_css_property_names.py
@@ -15,7 +15,7 @@
 #define %(class_name)s_h
 
 #include "core/CoreExport.h"
-#include "wtf/Assertions.h"
+#include "platform/wtf/Assertions.h"
 #include <stddef.h>
 
 namespace WTF {
@@ -85,9 +85,9 @@ class String;
 #include "core/css/HashTools.h"
 #include <string.h>
 
-#include "wtf/ASCIICType.h"
-#include "wtf/text/AtomicString.h"
-#include "wtf/text/WTFString.h"
+#include "platform/wtf/ASCIICType.h"
+#include "platform/wtf/text/AtomicString.h"
+#include "platform/wtf/text/WTFString.h"
 
 #ifdef _MSC_VER
 // Disable the warnings from casting a 64-bit pointer to 32-bit long

diff --git a/third_party/WebKit/Source/build/scripts/templates/CSSOMKeywords.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/CSSOMKeywords.cpp.tmpl
@@ -6,7 +6,7 @@
 
 #include "core/css/CSSPropertyIDTemplates.h"
 #include "core/css/cssom/CSSKeywordValue.h"
-#include "wtf/HashMap.h"
+#include "platform/wtf/HashMap.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/CSSPropertyAPI.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/CSSPropertyAPI.h.tmpl
@@ -6,7 +6,7 @@
 #define CSSPropertyAPI_h
 
 #include "core/CSSPropertyNames.h"
-#include "wtf/Allocator.h"
+#include "platform/wtf/Allocator.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl
@@ -2,7 +2,7 @@
 {{license()}}
 
 #include "core/ComputedStyleBase.h"
-#include "wtf/SizeAssertions.h"
+#include "platform/wtf/SizeAssertions.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/ElementFactory.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/ElementFactory.cpp.tmpl
@@ -18,7 +18,7 @@
 #include "core/dom/Document.h"
 #include "core/frame/Settings.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "wtf/HashMap.h"
+#include "platform/wtf/HashMap.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/ElementFactory.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/ElementFactory.h.tmpl
@@ -6,8 +6,8 @@
 
 #include "core/dom/Document.h"
 #include "platform/heap/Handle.h"
-#include "wtf/Forward.h"
-#include "wtf/PassRefPtr.h"
+#include "platform/wtf/Forward.h"
+#include "platform/wtf/PassRefPtr.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/ElementLookupTrie.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/ElementLookupTrie.h.tmpl
@@ -5,7 +5,7 @@
 #define {{namespace}}ElementLookupTrie_h
 
 #include "core/CoreExport.h"
-#include "wtf/text/StringImpl.h"
+#include "platform/wtf/text/StringImpl.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/ElementTypeHelpers.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/ElementTypeHelpers.cpp.tmpl
@@ -5,7 +5,7 @@
 
 #include "core/dom/Document.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "wtf/HashMap.h"
+#include "platform/wtf/HashMap.h"
 
 namespace blink {
 {% if namespace == "HTML" %}

diff --git a/third_party/WebKit/Source/build/scripts/templates/InternalRuntimeFlags.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/InternalRuntimeFlags.h.tmpl
@@ -7,9 +7,9 @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/heap/Handle.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefPtr.h"
-#include "wtf/RefCounted.h"
+#include "platform/wtf/PassRefPtr.h"
+#include "platform/wtf/RefPtr.h"
+#include "platform/wtf/RefCounted.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/InternalSettingsGenerated.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/InternalSettingsGenerated.h.tmpl
@@ -6,9 +6,9 @@
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "platform/heap/Handle.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
-#include "wtf/text/WTFString.h"
+#include "platform/wtf/PassRefPtr.h"
+#include "platform/wtf/RefCounted.h"
+#include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/MakeNames.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/MakeNames.cpp.tmpl
@@ -3,7 +3,7 @@
 
 #include "{{namespace}}{{suffix}}Names.h"
 
-#include "wtf/StdLibExtras.h"
+#include "platform/wtf/StdLibExtras.h"
 
 // Generated from:
 {% for entry in in_files|sort %}

diff --git a/third_party/WebKit/Source/build/scripts/templates/MakeNames.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/MakeNames.h.tmpl
@@ -8,7 +8,7 @@
 {% if suffix %}
 #include "core/{{namespace}}Names.h"
 {% else %}
-#include "wtf/text/AtomicString.h"
+#include "platform/wtf/text/AtomicString.h"
 {% endif %}
 {% if export == 'CORE_EXPORT' %}
 #include "core/CoreExport.h"

diff --git a/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl
@@ -3,9 +3,9 @@
 
 #include "{{namespace}}Names.h"
 
-#include "wtf/PtrUtil.h"
-#include "wtf/StaticConstructors.h"
-#include "wtf/StdLibExtras.h"
+#include "platform/wtf/PtrUtil.h"
+#include "platform/wtf/StaticConstructors.h"
+#include "platform/wtf/StdLibExtras.h"
 #include <memory>
 
 namespace blink {

diff --git a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
@@ -5,7 +5,7 @@
 #define OriginTrials_h
 
 #include "core/CoreExport.h"
-#include "wtf/text/WTFString.h"
+#include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl
@@ -3,8 +3,8 @@
 
 #include "platform/RuntimeEnabledFeatures.h"
 
-#include "wtf/Assertions.h"
-#include "wtf/text/WTFString.h"
+#include "platform/wtf/Assertions.h"
+#include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl
@@ -7,9 +7,9 @@
 #include <string>
 
 #include "platform/PlatformExport.h"
-#include "wtf/Allocator.h"
-#include "wtf/Forward.h"
-#include "wtf/build_config.h"
+#include "platform/wtf/Allocator.h"
+#include "platform/wtf/Forward.h"
+#include "platform/wtf/build_config.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/build/scripts/templates/StylePropertyShorthand.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/StylePropertyShorthand.cpp.tmpl
@@ -22,8 +22,8 @@
 #include "StylePropertyShorthand.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
-#include "wtf/HashMap.h"
-#include "wtf/StdLibExtras.h"
+#include "platform/wtf/HashMap.h"
+#include "platform/wtf/StdLibExtras.h"
 
 namespace blink {
 {% for property_id, property in properties.items() %}

diff --git a/third_party/WebKit/Source/build/scripts/templates/StylePropertyShorthand.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/StylePropertyShorthand.h.tmpl
@@ -23,7 +23,7 @@
 #define StylePropertyShorthand_h
 
 #include "CSSPropertyNames.h"
-#include "wtf/Vector.h"
+#include "platform/wtf/Vector.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn
@@ -94,7 +94,7 @@ source_set("generated") {
     "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated",
     "//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated",
     "//third_party/WebKit/Source/platform:make_platform_generated",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//url",
     "//v8",
   ]
@@ -106,7 +106,7 @@ source_set("prerequisites") {
     "//skia",
     "//third_party/WebKit/Source/core/inspector:generated",
     "//third_party/WebKit/Source/core/probe:generated",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//third_party/angle:translator",
     "//third_party/iccjpeg",
     "//third_party/icu",
@@ -166,7 +166,7 @@ component("core") {
     ":core_generated",
     "//skia",
     "//third_party/WebKit/Source/platform",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//url",
     "//v8",
   ]
@@ -1067,7 +1067,7 @@ target(core_link_small_target_type, "core_generated") {
     "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated",
     "//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated",
     "//third_party/WebKit/Source/platform:make_platform_generated",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//url",
     "//v8",
   ]

diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapSource.h b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapSource.h
@@ -12,7 +12,7 @@
 #include "core/dom/ExceptionCode.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/IntSize.h"
-#include "third_party/WebKit/Source/wtf/Optional.h"
+#include "platform/wtf/Optional.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/core/inspector/BUILD.gn b/third_party/WebKit/Source/core/inspector/BUILD.gn
@@ -188,7 +188,7 @@ source_set("generated") {
     "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated",
     "//third_party/WebKit/Source/core:all_generators",
     "//third_party/WebKit/Source/platform:make_platform_generated",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//v8",
   ]
 }

diff --git a/third_party/WebKit/Source/core/probe/BUILD.gn b/third_party/WebKit/Source/core/probe/BUILD.gn
@@ -52,7 +52,7 @@ source_set("generated") {
   deps = [
     ":instrumentation_probes",
     "//skia",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//v8",
   ]
 }
diff --git a/third_party/WebKit/Source/modules/BUILD.gn b/third_party/WebKit/Source/modules/BUILD.gn
@@ -327,7 +327,7 @@ source_set("unit_tests") {
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/core",
-    "//third_party/WebKit/Source/wtf",
+    "//third_party/WebKit/Source/platform/wtf",
     "//v8",
   ]
 }
diff --git a/third_party/WebKit/Source/modules/geolocation/Geoposition.h b/third_party/WebKit/Source/modules/geolocation/Geoposition.h
@@ -30,7 +30,7 @@
 #include "modules/EventModules.h"
 #include "modules/geolocation/Coordinates.h"
 #include "platform/heap/Handle.h"
-#include "wtf/Assertions.h"
+#include "platform/wtf/Assertions.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionOptions.cpp b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionOptions.cpp
@@ -8,11 +8,11 @@
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/push_messaging/PushSubscriptionOptionsInit.h"
+#include "platform/wtf/ASCIICType.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/text/WTFString.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
-#include "third_party/WebKit/Source/wtf/ASCIICType.h"
 
 namespace blink {
 namespace {