Commit c36ab84c authored by yutak's avatar yutak Committed by Commit bot

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}
parent 9bb71889
......@@ -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" ]
......
......@@ -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",
......
......@@ -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",
]
}
......
......@@ -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",
]
}
......@@ -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 {
......
......@@ -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 {
......
......@@ -15,7 +15,7 @@ HEADER_TEMPLATE = """
#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 @@ GPERF_TEMPLATE = """
#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
......
......@@ -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 {
......
......@@ -6,7 +6,7 @@
#define CSSPropertyAPI_h
#include "core/CSSPropertyNames.h"
#include "wtf/Allocator.h"
#include "platform/wtf/Allocator.h"
namespace blink {
......
......@@ -2,7 +2,7 @@
{{license()}}
#include "core/ComputedStyleBase.h"
#include "wtf/SizeAssertions.h"
#include "platform/wtf/SizeAssertions.h"
namespace blink {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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" %}
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 %}
......
......@@ -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"
......
......@@ -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 {
......
......@@ -5,7 +5,7 @@
#define OriginTrials_h
#include "core/CoreExport.h"
#include "wtf/text/WTFString.h"
#include "platform/wtf/text/WTFString.h"
namespace blink {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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() %}
......
......@@ -23,7 +23,7 @@
#define StylePropertyShorthand_h
#include "CSSPropertyNames.h"
#include "wtf/Vector.h"
#include "platform/wtf/Vector.h"
namespace blink {
......
......@@ -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",
]
......
......@@ -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 {
......
......@@ -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",
]
}
......
......@@ -52,7 +52,7 @@ source_set("generated") {
deps = [
":instrumentation_probes",
"//skia",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//v8",
]
}
......@@ -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",
]
}
......@@ -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 {
......
......@@ -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 {
......
......@@ -1483,7 +1483,7 @@ component("platform") {
"//services/service_manager/public/interfaces:interfaces_blink",
"//skia",
"//third_party:jpeg",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//third_party/WebKit/public:mojo_bindings_blink",
"//third_party/iccjpeg",
"//third_party/libpng",
......@@ -1899,7 +1899,7 @@ test("blink_platform_unittests") {
configs += [
":blink_platform_pch",
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
......@@ -1919,7 +1919,7 @@ test("blink_platform_unittests") {
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/platform/loader:unit_tests",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//third_party/harfbuzz-ng",
"//ui/gfx",
"//ui/gfx/geometry",
......@@ -1947,12 +1947,12 @@ test("image_decode_bench") {
deps = [
":platform",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//ui/gfx:test_support",
]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
......@@ -1969,7 +1969,7 @@ test("blink_platform_perftests") {
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/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
......@@ -2050,7 +2050,7 @@ fuzzer_test("mhtml_parser_fuzzer") {
dict = "//testing/libfuzzer/fuzzers/dicts/mhtml.dict"
seed_corpus = "//third_party/WebKit/LayoutTests/mhtml"
additional_configs = [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
}
......
......@@ -85,7 +85,7 @@ test("blink_heap_unittests") {
]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
"//third_party/WebKit/Source:inside_blink",
]
......@@ -97,7 +97,7 @@ test("blink_heap_unittests") {
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/platform:test_support",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
]
if (is_android) {
deps += [
......
......@@ -123,7 +123,7 @@ source_set("unit_tests") {
defines = [ "INSIDE_BLINK" ]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
......@@ -155,7 +155,7 @@ source_set("test_support") {
defines = [ "INSIDE_BLINK" ]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source/platform/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
......
......@@ -3,7 +3,7 @@
# found in the LICENSE file.
mojom = "//mojo/common/string16.mojom"
public_headers = [ "//third_party/WebKit/Source/wtf/text/WTFString.h" ]
public_headers = [ "//third_party/WebKit/Source/platform/wtf/text/WTFString.h" ]
traits_headers = [ "//third_party/WebKit/Source/platform/mojo/CommonCustomTypesStructTraits.h" ]
type_mappings =
[ "mojo.common.mojom.String16=WTF::String[nullable_is_same_type]" ]
......@@ -2,25 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# The below is a temporary setup during the WTF migration project:
# https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
#
# We are moving wtf/ files to platform/wtf/ incrementally, thus, conceptually,
# the "wtf" target in wtf/BUILD.gn is being split into two, in a way that
# only wtf/ can refer the contents in platform/wtf/.
#
# To achieve this, we introduce a new target "platform_wtf" here, and configure
# it so the source files are compiled in the same way as the original "wtf"
# target. This gn file should only be used from wtf/BUILD.gn, and this
# restriction is enforced by the visibility rule below (but it's okay to
# #include a header in this directory from core/ or modules/).
#
# The following configurations are mostly copied from wtf/BUILD.gn, so we
# can build the source files in the same way.
#
# When we finish moving all the files, "platform_wtf" target will take over
# the role of "wtf".
assert(!is_ios)
import("//testing/test.gni")
......@@ -28,7 +9,8 @@ import("//third_party/WebKit/Source/config.gni")
visibility = [
":*",
"//third_party/WebKit/Source/wtf/*",
"//mojo/public/cpp/bindings/*",
"//third_party/WebKit/*",
]
config("wtf_config") {
......@@ -59,7 +41,7 @@ config("wtf_config") {
}
}
component("platform_wtf") {
component("wtf") {
sources = [
"ASCIICType.cpp",
"ASCIICType.h",
......@@ -391,7 +373,7 @@ test("wtf_unittests") {
]
deps = [
":platform_wtf",
":wtf",
"//base",
"//base/test:test_support",
"//testing/gmock",
......
......@@ -293,7 +293,7 @@ static_library("test_support") {
"//skia",
"//third_party/WebKit/Source/core:testing",
"//third_party/WebKit/Source/modules:modules_testing",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//v8",
]
......@@ -430,7 +430,7 @@ test("webkit_unit_tests") {
"//third_party/WebKit/Source/modules:unit_tests",
"//third_party/WebKit/Source/platform:test_support",
"//third_party/WebKit/Source/platform:unit_tests",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/platform/wtf",
"//third_party/libwebp",
"//third_party/zlib",
"//url",
......
*.Makefile
*.mk
*.rules
*.sln
*.tmp
*.vcproj*
*.vcxproj*
*.xcodeproj*
// Copyright 2017 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.
#include "platform/wtf/ASCIICType.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/AddressSanitizer.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/Alignment.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/Allocator.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/Assertions.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/Atomics.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
// Copyright 2017 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.
#include "platform/wtf/AutoReset.h"
// The contents of this header was moved to platform/wtf as part of
// WTF migration project. See the following post for details:
// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
# 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.
assert(!is_ios)
import("//testing/test.gni")
import("//third_party/WebKit/Source/config.gni")
visibility = [
"//mojo/public/cpp/bindings/*",
"//third_party/WebKit/*",
]
config("wtf_config") {