diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 74ae6d7..2d73b88 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -185,9 +185,9 @@ "//components/navigation_interception/android:navigation_interception_java", "//components/ntp_tiles/android:ntp_tiles_java", "//components/offline_items_collection/core:core_java", + "//components/payments/content:mojom_java", + "//components/payments/content:mojom_parser_java", "//components/payments/content/android:java", - "//components/payments/mojom:mojom_java", - "//components/payments/mojom:mojom_parser_java", "//components/policy/android:policy_java", "//components/precache/android:precache_java", "//components/safe_browsing_db/android:safe_browsing_java", @@ -348,9 +348,9 @@ "//components/invalidation/impl:java", "//components/minidump_uploader:minidump_uploader_java", "//components/offline_items_collection/core:core_java", + "//components/payments/content:mojom_java", + "//components/payments/content:mojom_parser_java", "//components/payments/content/android:java", - "//components/payments/mojom:mojom_java", - "//components/payments/mojom:mojom_parser_java", "//components/signin/core/browser/android:java", "//components/signin/core/browser/android:signin_java_test_support", "//components/sync:sync_java_test_support", @@ -435,9 +435,9 @@ "//components/minidump_uploader:minidump_uploader_javatests", "//components/navigation_interception/android:navigation_interception_java", "//components/offline_items_collection/core:core_java", + "//components/payments/content:mojom_java", + "//components/payments/content:mojom_parser_java", "//components/payments/content/android:java", - "//components/payments/mojom:mojom_java", - "//components/payments/mojom:mojom_parser_java", "//components/policy/android:policy_java", "//components/precache/android:precache_java", "//components/precache/android:precache_javatests",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index fbf1c51..ab942d6 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -1514,8 +1514,8 @@ "//components/password_manager/core/browser", "//components/password_manager/core/common", "//components/password_manager/sync/browser", - "//components/payments/mojom", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom", + "//components/payments/content:mojom_payment_app", "//components/physical_web/eddystone", "//components/policy:generated", "//components/policy/core/browser",
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc index 6f08a1a..260f37c7 100644 --- a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc +++ b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" #include "chrome/browser/profiles/profile_manager.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/payment_app_provider.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 9679ace6..260c28e2 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -283,7 +283,7 @@ #include "chrome/browser/android/service_tab_launcher.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "content/public/browser/android/java_interfaces.h" #include "ui/base/ui_base_paths.h" #else
diff --git a/chrome/browser/payments/payment_request_factory.h b/chrome/browser/payments/payment_request_factory.h index f77e1bf..f2120f29 100644 --- a/chrome/browser/payments/payment_request_factory.h +++ b/chrome/browser/payments/payment_request_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_FACTORY_H_ #define CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_FACTORY_H_ -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "mojo/public/cpp/bindings/binding.h" namespace content {
diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.h b/chrome/browser/ui/views/payments/payment_request_browsertest_base.h index dd39f3b..3f90fe8 100644 --- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.h +++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.h
@@ -20,7 +20,7 @@ #include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/browser/personal_data_manager_observer.h" #include "components/payments/content/payment_request.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.h b/chrome/browser/ui/views/payments/payment_request_views_util.h index a6a2ef0..189618aa 100644 --- a/chrome/browser/ui/views/payments/payment_request_views_util.h +++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -9,7 +9,7 @@ #include <string> #include "base/strings/string16.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" namespace autofill { class AutofillProfile;
diff --git a/components/payments/android/BUILD.gn b/components/payments/android/BUILD.gn index 7eac568b..fc5fe8b9 100644 --- a/components/payments/android/BUILD.gn +++ b/components/payments/android/BUILD.gn
@@ -11,7 +11,7 @@ ] deps = [ - "//components/payments/mojom:mojom_parser", + "//components/payments/content:mojom_parser", "//components/webdata/common", "//sql", ]
diff --git a/components/payments/android/DEPS b/components/payments/android/DEPS index 6d4be5a9..0d58d2f 100644 --- a/components/payments/android/DEPS +++ b/components/payments/android/DEPS
@@ -1,5 +1,5 @@ include_rules = [ - "-components/payments/content", + "+components/payments/content", "+components/webdata/common", "+sql", ] \ No newline at end of file
diff --git a/components/payments/android/web_app_manifest_section_table.h b/components/payments/android/web_app_manifest_section_table.h index 7c46bcc..44a5c046 100644 --- a/components/payments/android/web_app_manifest_section_table.h +++ b/components/payments/android/web_app_manifest_section_table.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "components/payments/mojom/payment_manifest_parser.mojom.h" +#include "components/payments/content/payment_manifest_parser.mojom.h" #include "components/webdata/common/web_database.h" #include "components/webdata/common/web_database_table.h"
diff --git a/components/payments/content/BUILD.gn b/components/payments/content/BUILD.gn index ac16b7b5..a200799 100644 --- a/components/payments/content/BUILD.gn +++ b/components/payments/content/BUILD.gn
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//mojo/public/tools/bindings/mojom.gni") + static_library("content") { sources = [ "payment_request.cc", @@ -18,16 +20,44 @@ ] deps = [ + ":mojom", ":utils", "//components/autofill/core/browser", "//components/payments/core", - "//components/payments/mojom", "//content/public/browser", "//mojo/public/cpp/bindings", "//third_party/libphonenumber", ] } +mojom("mojom") { + sources = [ + "payment_request.mojom", + ] +} + +mojom("mojom_parser") { + sources = [ + "payment_manifest_parser.mojom", + ] + + public_deps = [ + "//url/mojo:url_mojom_gurl", + ] +} + +mojom("mojom_payment_app") { + sources = [ + "payment_app.mojom", + ] + + public_deps = [ + ":mojom", + "//mojo/common:common_custom_types", + "//url/mojo:url_mojom_gurl", + ] +} + static_library("utils") { sources = [ "payment_details_validation.cc", @@ -41,13 +71,13 @@ ] deps = [ + ":mojom", + ":mojom_parser", "//base", "//components/autofill/core/browser", "//components/data_use_measurement/core", "//components/link_header_util", "//components/payments/core", - "//components/payments/mojom", - "//components/payments/mojom:mojom_parser", "//components/strings", "//content/public/browser", "//net", @@ -74,13 +104,13 @@ deps = [ ":content", + ":mojom", ":utils", "//base", "//base/test:test_support", "//components/autofill/core/browser", "//components/autofill/core/browser:test_support", "//components/payments/core", - "//components/payments/mojom", "//content/test:test_support", "//net:test_support", "//testing/gtest",
diff --git a/components/payments/mojom/OWNERS b/components/payments/content/OWNERS similarity index 100% rename from components/payments/mojom/OWNERS rename to components/payments/content/OWNERS
diff --git a/components/payments/content/android/BUILD.gn b/components/payments/content/android/BUILD.gn index 46d2578..609224f14 100644 --- a/components/payments/content/android/BUILD.gn +++ b/components/payments/content/android/BUILD.gn
@@ -22,9 +22,9 @@ deps = [ ":jni_headers", "//base", + "//components/payments/content:mojom", "//components/payments/content:utils", "//components/payments/core", - "//components/payments/mojom", "//content/public/browser", "//net", ] @@ -49,8 +49,8 @@ ] deps = [ "//base:base_java", - "//components/payments/mojom:mojom_java", - "//components/payments/mojom:mojom_parser_java", + "//components/payments/content:mojom_java", + "//components/payments/content:mojom_parser_java", "//content/public/android:content_java", "//mojo/public/java:bindings_java", ]
diff --git a/components/payments/content/android/payment_details_validation_android.cc b/components/payments/content/android/payment_details_validation_android.cc index fa88d63..ddc7ffc4 100644 --- a/components/payments/content/android/payment_details_validation_android.cc +++ b/components/payments/content/android/payment_details_validation_android.cc
@@ -13,7 +13,7 @@ #include "base/android/jni_android.h" #include "components/payments/content/payment_details_validation.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "jni/PaymentValidator_jni.h" namespace payments {
diff --git a/components/payments/mojom/payment_app.mojom b/components/payments/content/payment_app.mojom similarity index 95% rename from components/payments/mojom/payment_app.mojom rename to components/payments/content/payment_app.mojom index f7eae0a4..a980ddc 100644 --- a/components/payments/mojom/payment_app.mojom +++ b/components/payments/content/payment_app.mojom
@@ -4,7 +4,7 @@ module payments.mojom; -import "components/payments/mojom/payment_request.mojom"; +import "components/payments/content/payment_request.mojom"; import "mojo/common/time.mojom"; import "url/mojo/url.mojom";
diff --git a/components/payments/content/payment_details_validation.cc b/components/payments/content/payment_details_validation.cc index c894459..351e82c 100644 --- a/components/payments/content/payment_details_validation.cc +++ b/components/payments/content/payment_details_validation.cc
@@ -7,8 +7,8 @@ #include <set> #include <vector> +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/content/payments_validators.h" -#include "components/payments/mojom/payment_request.mojom.h" namespace payments { namespace {
diff --git a/components/payments/content/payment_details_validation.h b/components/payments/content/payment_details_validation.h index fda9990..e623087 100644 --- a/components/payments/content/payment_details_validation.h +++ b/components/payments/content/payment_details_validation.h
@@ -7,7 +7,7 @@ #include <string> -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" namespace payments {
diff --git a/components/payments/mojom/payment_manifest_parser.mojom b/components/payments/content/payment_manifest_parser.mojom similarity index 100% rename from components/payments/mojom/payment_manifest_parser.mojom rename to components/payments/content/payment_manifest_parser.mojom
diff --git a/components/payments/content/payment_manifest_parser_host.h b/components/payments/content/payment_manifest_parser_host.h index eb68875..2873bdf6 100644 --- a/components/payments/content/payment_manifest_parser_host.h +++ b/components/payments/content/payment_manifest_parser_host.h
@@ -13,7 +13,7 @@ #include "base/callback_forward.h" #include "base/macros.h" -#include "components/payments/mojom/payment_manifest_parser.mojom.h" +#include "components/payments/content/payment_manifest_parser.mojom.h" #include "url/gurl.h" namespace content {
diff --git a/components/payments/content/payment_request.h b/components/payments/content/payment_request.h index d609c83..ad2abed 100644 --- a/components/payments/content/payment_request.h +++ b/components/payments/content/payment_request.h
@@ -9,10 +9,10 @@ #include <vector> #include "base/macros.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/content/payment_request_spec.h" #include "components/payments/content/payment_request_state.h" #include "components/payments/core/payment_request_delegate.h" -#include "components/payments/mojom/payment_request.mojom.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/interface_request.h"
diff --git a/components/payments/mojom/payment_request.mojom b/components/payments/content/payment_request.mojom similarity index 100% rename from components/payments/mojom/payment_request.mojom rename to components/payments/content/payment_request.mojom
diff --git a/components/payments/content/payment_request_spec.h b/components/payments/content/payment_request_spec.h index 5d9273b..de0187a 100644 --- a/components/payments/content/payment_request_spec.h +++ b/components/payments/content/payment_request_spec.h
@@ -11,9 +11,9 @@ #include "base/macros.h" #include "base/observer_list.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/core/currency_formatter.h" #include "components/payments/core/payment_options_provider.h" -#include "components/payments/mojom/payment_request.mojom.h" namespace payments {
diff --git a/components/payments/content/payment_request_spec_unittest.cc b/components/payments/content/payment_request_spec_unittest.cc index f9f2a86f..a90d1e4 100644 --- a/components/payments/content/payment_request_spec_unittest.cc +++ b/components/payments/content/payment_request_spec_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/memory/weak_ptr.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace payments {
diff --git a/components/payments/content/payment_request_state.h b/components/payments/content/payment_request_state.h index dcef090b..cb0b2a97 100644 --- a/components/payments/content/payment_request_state.h +++ b/components/payments/content/payment_request_state.h
@@ -11,8 +11,8 @@ #include "base/macros.h" #include "base/observer_list.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/content/payment_response_helper.h" -#include "components/payments/mojom/payment_request.mojom.h" namespace i18n { namespace addressinput {
diff --git a/components/payments/content/payment_request_state_unittest.cc b/components/payments/content/payment_request_state_unittest.cc index 6b18b17..8509777 100644 --- a/components/payments/content/payment_request_state_unittest.cc +++ b/components/payments/content/payment_request_state_unittest.cc
@@ -12,8 +12,8 @@ #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/test_personal_data_manager.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/content/payment_request_spec.h" -#include "components/payments/mojom/payment_request.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace payments {
diff --git a/components/payments/content/payment_request_web_contents_manager.h b/components/payments/content/payment_request_web_contents_manager.h index be08a3d..0843358 100644 --- a/components/payments/content/payment_request_web_contents_manager.h +++ b/components/payments/content/payment_request_web_contents_manager.h
@@ -10,7 +10,7 @@ #include "base/macros.h" #include "components/payments/content/payment_request.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" #include "content/public/browser/web_contents_user_data.h" #include "mojo/public/cpp/bindings/binding.h"
diff --git a/components/payments/content/payment_response_helper.h b/components/payments/content/payment_response_helper.h index 69e0383..c8903e22 100644 --- a/components/payments/content/payment_response_helper.h +++ b/components/payments/content/payment_response_helper.h
@@ -6,8 +6,8 @@ #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_RESPONSE_HELPER_H_ #include "base/macros.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/core/payment_instrument.h" -#include "components/payments/mojom/payment_request.mojom.h" namespace autofill { class AutofillProfile;
diff --git a/components/payments/content/payment_response_helper_unittest.cc b/components/payments/content/payment_response_helper_unittest.cc index efbe6f3..7f63b66 100644 --- a/components/payments/content/payment_response_helper_unittest.cc +++ b/components/payments/content/payment_response_helper_unittest.cc
@@ -15,10 +15,10 @@ #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/test_personal_data_manager.h" +#include "components/payments/content/payment_request.mojom.h" #include "components/payments/content/payment_request_spec.h" #include "components/payments/core/autofill_payment_instrument.h" #include "components/payments/core/payment_request_delegate.h" -#include "components/payments/mojom/payment_request.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace payments {
diff --git a/components/payments/content/payments_validators.h b/components/payments/content/payments_validators.h index 33af759..135074cc 100644 --- a/components/payments/content/payments_validators.h +++ b/components/payments/content/payments_validators.h
@@ -8,7 +8,7 @@ #include <string> #include "base/macros.h" -#include "components/payments/mojom/payment_request.mojom.h" +#include "components/payments/content/payment_request.mojom.h" namespace payments {
diff --git a/components/payments/content/utility/BUILD.gn b/components/payments/content/utility/BUILD.gn index d202928..643a1b64 100644 --- a/components/payments/content/utility/BUILD.gn +++ b/components/payments/content/utility/BUILD.gn
@@ -11,7 +11,7 @@ ] deps = [ "//base", - "//components/payments/mojom:mojom_parser", + "//components/payments/content:mojom_parser", "//url", ] }
diff --git a/components/payments/content/utility/payment_manifest_parser.h b/components/payments/content/utility/payment_manifest_parser.h index 5f0fbe8b..3e74394 100644 --- a/components/payments/content/utility/payment_manifest_parser.h +++ b/components/payments/content/utility/payment_manifest_parser.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/macros.h" -#include "components/payments/mojom/payment_manifest_parser.mojom.h" +#include "components/payments/content/payment_manifest_parser.mojom.h" #include "url/gurl.h" namespace payments {
diff --git a/components/payments/mojom/BUILD.gn b/components/payments/mojom/BUILD.gn deleted file mode 100644 index 9268a07..0000000 --- a/components/payments/mojom/BUILD.gn +++ /dev/null
@@ -1,33 +0,0 @@ -# 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. - -import("//mojo/public/tools/bindings/mojom.gni") - -mojom("mojom") { - sources = [ - "payment_request.mojom", - ] -} - -mojom("mojom_parser") { - sources = [ - "payment_manifest_parser.mojom", - ] - - public_deps = [ - "//url/mojo:url_mojom_gurl", - ] -} - -mojom("mojom_payment_app") { - sources = [ - "payment_app.mojom", - ] - - public_deps = [ - ":mojom", - "//mojo/common:common_custom_types", - "//url/mojo:url_mojom_gurl", - ] -}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 580a9d28..75dd323 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -44,7 +44,7 @@ "//components/leveldb:lib", "//components/link_header_util", "//components/mime_util", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom_payment_app", "//components/rappor", "//components/tracing", "//components/tracing:startup_tracing",
diff --git a/content/browser/payments/payment_app_browsertest.cc b/content/browser/payments/payment_app_browsertest.cc index e6183f0..9f840a0 100644 --- a/content/browser/payments/payment_app_browsertest.cc +++ b/content/browser/payments/payment_app_browsertest.cc
@@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/run_loop.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/public/browser/payment_app_provider.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h"
diff --git a/content/browser/payments/payment_app_content_unittest_base.h b/content/browser/payments/payment_app_content_unittest_base.h index 7a63fec..9461e5fa 100644 --- a/content/browser/payments/payment_app_content_unittest_base.h +++ b/content/browser/payments/payment_app_content_unittest_base.h
@@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/browser/payments/payment_manager.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h"
diff --git a/content/browser/payments/payment_app_context_impl.h b/content/browser/payments/payment_app_context_impl.h index 259b53da..2b9aa8f 100644 --- a/content/browser/payments/payment_app_context_impl.h +++ b/content/browser/payments/payment_app_context_impl.h
@@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/browser/payments/payment_app_database.h" #include "content/common/content_export.h"
diff --git a/content/browser/payments/payment_app_database.h b/content/browser/payments/payment_app_database.h index 2e6ec55..8e83b60 100644 --- a/content/browser/payments/payment_app_database.h +++ b/content/browser/payments/payment_app_database.h
@@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_registration.h" #include "content/common/content_export.h"
diff --git a/content/browser/payments/payment_app_provider_impl_unittest.cc b/content/browser/payments/payment_app_provider_impl_unittest.cc index 83be68b4..1872cc8 100644 --- a/content/browser/payments/payment_app_provider_impl_unittest.cc +++ b/content/browser/payments/payment_app_provider_impl_unittest.cc
@@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/browser/payments/payment_app_content_unittest_base.h" #include "content/browser/payments/payment_app_provider_impl.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/payments/payment_manager.h b/content/browser/payments/payment_manager.h index 496e8ee..6872ad2 100644 --- a/content/browser/payments/payment_manager.h +++ b/content/browser/payments/payment_manager.h
@@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/binding.h" #include "url/gurl.h"
diff --git a/content/browser/payments/payment_manager_unittest.cc b/content/browser/payments/payment_manager_unittest.cc index fd01718b..ebed2ae 100644 --- a/content/browser/payments/payment_manager_unittest.cc +++ b/content/browser/payments/payment_manager_unittest.cc
@@ -5,7 +5,7 @@ #include <utility> #include "base/macros.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/browser/payments/payment_app_content_unittest_base.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h"
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index bf9aca2..fd5c0dc 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn
@@ -614,7 +614,7 @@ public_deps = [ "//components/leveldb/public/interfaces", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom_payment_app", "//content/public/common:interfaces", # TODO(mcasas): remove the following dep after https://crbug.com/653994
diff --git a/content/common/service_worker/service_worker_event_dispatcher.mojom b/content/common/service_worker/service_worker_event_dispatcher.mojom index 42d1218c..2f309bb3 100644 --- a/content/common/service_worker/service_worker_event_dispatcher.mojom +++ b/content/common/service_worker/service_worker_event_dispatcher.mojom
@@ -4,7 +4,7 @@ module content.mojom; -import "components/payments/mojom/payment_app.mojom"; +import "components/payments/content/payment_app.mojom"; import "content/common/url_loader.mojom"; import "mojo/common/string16.mojom"; import "mojo/common/time.mojom";
diff --git a/content/public/browser/DEPS b/content/public/browser/DEPS index e779c4c..ec5000d 100644 --- a/content/public/browser/DEPS +++ b/content/public/browser/DEPS
@@ -1,5 +1,5 @@ include_rules = [ - "+components/payments/mojom/payment_app.mojom.h", + "+components/payments/content/payment_app.mojom.h", "+device/screen_orientation/public/interfaces", ]
diff --git a/content/public/browser/payment_app_provider.h b/content/public/browser/payment_app_provider.h index 9a86d01..646c3d1 100644 --- a/content/public/browser/payment_app_provider.h +++ b/content/public/browser/payment_app_provider.h
@@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 9d95d274..54ac85e2 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn
@@ -432,7 +432,7 @@ "//cc/surfaces:surface_id", "//cc/surfaces:surfaces", "//components/discardable_memory/client", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom_payment_app", "//components/url_formatter", "//components/variations", "//content:resources",
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h index 3ec1e59..967eaf8 100644 --- a/content/renderer/service_worker/service_worker_context_client.h +++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -19,7 +19,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "base/time/time.h" -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/child/webmessageportchannel_impl.h" #include "content/common/service_worker/embedded_worker.mojom.h" #include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
diff --git a/content/renderer/service_worker/service_worker_type_converters.h b/content/renderer/service_worker/service_worker_type_converters.h index 28b5e68a..e5dc1f6 100644 --- a/content/renderer/service_worker/service_worker_type_converters.h +++ b/content/renderer/service_worker/service_worker_type_converters.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_ #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_ -#include "components/payments/mojom/payment_app.mojom.h" +#include "components/payments/content/payment_app.mojom.h" #include "content/common/service_worker/service_worker_event_dispatcher.mojom.h" #include "content/common/service_worker/service_worker_status_code.h" #include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppRequest.h"
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index a1ac65ff..7f302a30 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -239,7 +239,7 @@ "//cc/surfaces", "//components/display_compositor", "//components/leveldb/public/interfaces", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom_payment_app", "//content/app:both_for_content_tests", "//content/browser:for_content_tests", "//content/browser/speech/proto", @@ -726,7 +726,7 @@ "//components/discardable_memory/client", "//components/discardable_memory/common", "//components/discardable_memory/service", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom_payment_app", "//content:resources", "//content/app:both_for_content_tests", "//content/browser:for_content_tests", @@ -1442,8 +1442,8 @@ "//cc/surfaces", "//components/display_compositor", "//components/leveldb/public/cpp", - "//components/payments/mojom", - "//components/payments/mojom:mojom_payment_app", + "//components/payments/content:mojom", + "//components/payments/content:mojom_payment_app", "//components/rappor:test_support", "//content:resources", "//content/app:both_for_content_tests",
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 22a66274..fdb88fa 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1292,13 +1292,9 @@ # By about a quarter or less of a pixel. crbug.com/421412 [ Mac ] fast/text/international/bdo-bidi-width.html [ Failure ] -crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-overflow-hidden.html [ Failure ] -crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-scrolling-no-visibility-hidden-child.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-scrolling-no.html [ Failure ] -crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-scrolling-yes.html [ Failure ] -crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-visibility-hidden-child.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-zero-size-and-border.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollbar-tickmarks-styled.html [ Failure ] crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollbar-tickmarks-styled-after-onload.html [ Failure ] @@ -2801,7 +2797,3 @@ crbug.com/682753 fast/canvas-experimental [ Skip ] crbug.com/708934 fast/backgrounds/background-image-relative-url-in-iframe.html [ Failure Pass ] - -# Sheriff failures 2017-04-14 -crbug.com/711689 [ Mac ] paint/invalidation/text-match-document-change.html [ Failure ] -crbug.com/711689 [ Mac ] virtual/disable-spinvalidation/paint/invalidation/text-match-document-change.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-indexed-properties-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-indexed-properties-expected.txt deleted file mode 100644 index e6e463c..0000000 --- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-indexed-properties-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -PASS Indexed properties of the window object (non-strict mode) -PASS Indexed properties of the window object (non-strict mode) 1 -FAIL Indexed properties of the window object (non-strict mode) 2 assert_equals: expected (undefined) undefined but got (string) "foo" -PASS Indexed properties of the window object (non-strict mode) 3 -Harness: the test ran to completion. -
diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing-expected.txt index acc2ef6..d32e2b9 100644 --- a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing-expected.txt +++ b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing-expected.txt
@@ -1,5 +1,5 @@ This is a testharness.js-based test. -Found 242 tests; 228 PASS, 14 FAIL, 0 TIMEOUT, 0 NOTRUN. +Found 234 tests; 220 PASS, 14 FAIL, 0 TIMEOUT, 0 NOTRUN. PASS innerHTML 0 PASS innerHTML 1 <a></a> PASS innerHTML 2 <a b="c"></a> @@ -103,7 +103,6 @@ PASS innerHTML Void context node input PASS innerHTML Void context node keygen PASS innerHTML Void context node link -PASS innerHTML Void context node menuitem PASS innerHTML Void context node meta PASS innerHTML Void context node param PASS innerHTML Void context node source @@ -122,7 +121,6 @@ PASS innerHTML void as first child with following siblings input PASS innerHTML void as first child with following siblings keygen PASS innerHTML void as first child with following siblings link -PASS innerHTML void as first child with following siblings menuitem PASS innerHTML void as first child with following siblings meta PASS innerHTML void as first child with following siblings param PASS innerHTML void as first child with following siblings source @@ -141,7 +139,6 @@ PASS innerHTML void as second child with following siblings input PASS innerHTML void as second child with following siblings keygen PASS innerHTML void as second child with following siblings link -PASS innerHTML void as second child with following siblings menuitem PASS innerHTML void as second child with following siblings meta PASS innerHTML void as second child with following siblings param PASS innerHTML void as second child with following siblings source @@ -160,7 +157,6 @@ PASS innerHTML void as last child with preceding siblings input PASS innerHTML void as last child with preceding siblings keygen PASS innerHTML void as last child with preceding siblings link -PASS innerHTML void as last child with preceding siblings menuitem PASS innerHTML void as last child with preceding siblings meta PASS innerHTML void as last child with preceding siblings param PASS innerHTML void as last child with preceding siblings source @@ -179,7 +175,6 @@ PASS outerHTML Void context node input PASS outerHTML Void context node keygen PASS outerHTML Void context node link -PASS outerHTML Void context node menuitem PASS outerHTML Void context node meta PASS outerHTML Void context node param PASS outerHTML Void context node source @@ -198,7 +193,6 @@ PASS outerHTML void as first child with following siblings input PASS outerHTML void as first child with following siblings keygen PASS outerHTML void as first child with following siblings link -PASS outerHTML void as first child with following siblings menuitem PASS outerHTML void as first child with following siblings meta PASS outerHTML void as first child with following siblings param PASS outerHTML void as first child with following siblings source @@ -217,7 +211,6 @@ PASS outerHTML void as second child with following siblings input PASS outerHTML void as second child with following siblings keygen PASS outerHTML void as second child with following siblings link -PASS outerHTML void as second child with following siblings menuitem PASS outerHTML void as second child with following siblings meta PASS outerHTML void as second child with following siblings param PASS outerHTML void as second child with following siblings source @@ -236,7 +229,6 @@ PASS outerHTML void as last child with preceding siblings input PASS outerHTML void as last child with preceding siblings keygen PASS outerHTML void as last child with preceding siblings link -PASS outerHTML void as last child with preceding siblings menuitem PASS outerHTML void as last child with preceding siblings meta PASS outerHTML void as last child with preceding siblings param PASS outerHTML void as last child with preceding siblings source
diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing.html b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing.html index 6b7e678a..6a6f0c1 100644 --- a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing.html +++ b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/serializing-html-fragments/serializing.html
@@ -178,7 +178,7 @@ var void_elements = [ "area", "base", "basefont", "bgsound", "br", "col", "embed", - "frame", "hr", "img", "input", "keygen", "link", "menuitem", + "frame", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr" ];
diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt deleted file mode 100644 index 60038a3..0000000 --- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS The Function instance must be created in the Realm of the node document -PASS The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document -FAIL The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document Cannot read property 'name' of undefined -Harness: the test ran to completion. -
diff --git a/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem-expected.txt b/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem-expected.txt index d9433afe..b48c5b0 100644 --- a/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem-expected.txt
@@ -1,10 +1,10 @@ -This test checks parsing of menuitem tag which is a self closing tag with no end tag. +This test checks parsing of menuitem tag which has an end tag. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS document.getElementById('div').innerHTML is "<menuitem>" -PASS document.getElementById('menu').innerHTML is "<menuitem id=\"first_item\"><menuitem id=\"second_item\">" +PASS document.getElementById('div').innerHTML is "<menuitem></menuitem>" +PASS document.getElementById('menu').innerHTML is "<menuitem id=\"first_item\"></menuitem><menuitem id=\"second_item\"></menuitem>" PASS document.getElementById('first_item').firstChild is null PASS document.getElementById('menu').firstChild.nextSibling is document.getElementById('second_item') PASS successfullyParsed is true
diff --git a/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem.html b/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem.html index e3e57b2..58348ce 100644 --- a/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem.html +++ b/third_party/WebKit/LayoutTests/fast/parser/parse-menuitem.html
@@ -2,12 +2,12 @@ <head> <script src="../../resources/js-test.js"></script> </head> -<div id="div"><menuitem></div> -<menu id="menu" type=context><menuitem id="first_item"><menuitem id="second_item"></menu> +<div id="div"><menuitem></menuitem></div> +<menu id="menu" type=context><menuitem id="first_item"></menuitem><menuitem id="second_item"></menuitem></menu> <script> -description("This test checks parsing of menuitem tag which is a self closing tag with no end tag."); -shouldBeEqualToString("document.getElementById('div').innerHTML", "<menuitem>"); -shouldBeEqualToString("document.getElementById('menu').innerHTML", "<menuitem id=\"first_item\"><menuitem id=\"second_item\">"); +description("This test checks parsing of menuitem tag which has an end tag."); +shouldBeEqualToString("document.getElementById('div').innerHTML", "<menuitem></menuitem>"); +shouldBeEqualToString("document.getElementById('menu').innerHTML", "<menuitem id=\"first_item\"></menuitem><menuitem id=\"second_item\"></menuitem>"); shouldBeNull("document.getElementById('first_item').firstChild"); shouldBe("document.getElementById('menu').firstChild.nextSibling", "document.getElementById('second_item')"); </script>
diff --git a/third_party/WebKit/LayoutTests/html/menu_menuitem/menuitem-click.html b/third_party/WebKit/LayoutTests/html/menu_menuitem/menuitem-click.html index 5a9bb86..01b1ea3 100644 --- a/third_party/WebKit/LayoutTests/html/menu_menuitem/menuitem-click.html +++ b/third_party/WebKit/LayoutTests/html/menu_menuitem/menuitem-click.html
@@ -1,22 +1,22 @@ <script src="../../resources/js-test.js"></script> <menu type=context> - <menuitem id=mi1 type=checkbox> - <menuitem id=mi2 type=radio radiogroup="g1" checked> - <menuitem id=mi3 type=radio radiogroup="g1"> - <menuitem id=mi4 type=radio radiogroup="g1"> + <menuitem id=mi1 type=checkbox></menuitem> + <menuitem id=mi2 type=radio radiogroup="g1" checked></menuitem> + <menuitem id=mi3 type=radio radiogroup="g1"></menuitem> + <menuitem id=mi4 type=radio radiogroup="g1"></menuitem> <menu label="Submenu"> - <menuitem id=_mi1 type=radio radiogroup="g1"> - <menuitem id=_mi2 type=radio radiogroup="g1"> - <menuitem id=_mi3 type=radio radiogroup="g1"> + <menuitem id=_mi1 type=radio radiogroup="g1"></menuitem> + <menuitem id=_mi2 type=radio radiogroup="g1"></menuitem> + <menuitem id=_mi3 type=radio radiogroup="g1"></menuitem> </menu> - <menuitem id=mi5 type=radio radiogroup="g2" checked> - <menuitem id=mi6 type=radio radiogroup="G2"> - <menuitem id=mi7 type=radio radiogroup=" g3 " checked> - <menuitem id=mi8 type=radio radiogroup=" g3"> - <menuitem id=mi9 type=radio radiogroup="" checked> - <menuitem id=mi10 type=radio> - <menuitem id=mi11 type=radio radiogroup="g4"> - <menuitem id=mi12 type=checkbox radiogroup="g4" checked> + <menuitem id=mi5 type=radio radiogroup="g2" checked></menuitem> + <menuitem id=mi6 type=radio radiogroup="G2"></menuitem> + <menuitem id=mi7 type=radio radiogroup=" g3 " checked></menuitem> + <menuitem id=mi8 type=radio radiogroup=" g3"></menuitem> + <menuitem id=mi9 type=radio radiogroup="" checked></menuitem> + <menuitem id=mi10 type=radio></menuitem> + <menuitem id=mi11 type=radio radiogroup="g4"></menuitem> + <menuitem id=mi12 type=checkbox radiogroup="g4" checked></menuitem> </menu> <script>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt index cbe959b..12ab0b38 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt
@@ -12,7 +12,7 @@ ----- tests for deleting the properties of window, window.history, and window.location cross-domain ----- PASS: window.existingProperty should be 'test value' and is. -PASS: window[1] should be 'test value' and is. +PASS: window[1] should be 'undefined' and is. PASS: window.history.existingProperty should be 'test value' and is. PASS: window.history[1] should be 'test value' and is. PASS: window.location.existingProperty should be 'test value' and is.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html b/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html index 15422568..441d4d8 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html +++ b/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html
@@ -26,7 +26,7 @@ log("\n----- tests for deleting the properties of window, window.history, and window.location cross-domain -----\n"); shouldBe("window.existingProperty", "'test value'"); - shouldBe("window[1]", "'test value'"); + shouldBe("window[1]", "undefined"); shouldBe("window.history.existingProperty", "'test value'"); shouldBe("window.history[1]", "'test value'"); shouldBe("window.location.existingProperty", "'test value'");
diff --git a/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js b/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js index a50b8dd0..dce8a0a 100644 --- a/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js +++ b/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js
@@ -6,7 +6,7 @@ let paymentRequestMock = loadMojoModules( 'paymentRequestMock', - ['components/payments/mojom/payment_request.mojom', + ['components/payments/content/payment_request.mojom', 'mojo/public/js/bindings', ]).then(mojo => { let [paymentRequest, bindings] = mojo.modules;
diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.png index 744ffd4b..a843a3e 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.png index 744ffd4b..a843a3e 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.png Binary files differ
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h b/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h index a89d160..36d10dd 100644 --- a/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h +++ b/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h
@@ -176,18 +176,16 @@ template <> inline void DOMWrapperMap<ScriptWrappable>::PersistentValueMapTraits::Dispose( v8::Isolate*, - v8::Global<v8::Object> value, + v8::Global<v8::Object>, ScriptWrappable*) { - ToWrapperTypeInfo(value)->WrapperDestroyed(); + WrapperTypeInfo::WrapperDestroyed(); } template <> inline void DOMWrapperMap<ScriptWrappable>::PersistentValueMapTraits::DisposeWeak( - const v8::WeakCallbackInfo<WeakCallbackDataType>& data) { - auto wrapper_type_info = reinterpret_cast<WrapperTypeInfo*>( - data.GetInternalField(kV8DOMWrapperTypeIndex)); - wrapper_type_info->WrapperDestroyed(); + const v8::WeakCallbackInfo<WeakCallbackDataType>&) { + WrapperTypeInfo::WrapperDestroyed(); } } // namespace blink
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptModule.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptModule.cpp index fda3bcb..2826d8e3 100644 --- a/third_party/WebKit/Source/bindings/core/v8/ScriptModule.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptModule.cpp
@@ -42,6 +42,7 @@ ScriptValue ScriptModule::Instantiate(ScriptState* script_state) { v8::Isolate* isolate = script_state->GetIsolate(); v8::TryCatch try_catch(isolate); + try_catch.SetVerbose(true); DCHECK(!IsNull()); v8::Local<v8::Context> context = script_state->GetContext(); @@ -55,16 +56,23 @@ return ScriptValue(); } -void ScriptModule::Evaluate(ScriptState* script_state) { +void ScriptModule::Evaluate(ScriptState* script_state) const { v8::Isolate* isolate = script_state->GetIsolate(); + + // Isolate exceptions that occur when executing the code. These exceptions + // should not interfere with javascript code we might evaluate from C++ when + // returning from here. v8::TryCatch try_catch(isolate); try_catch.SetVerbose(true); + + // TODO(kouhei): We currently don't have a code-path which use return value of + // EvaluateModule. Stop ignoring result once we have such path. v8::Local<v8::Value> result; if (!V8Call( V8ScriptRunner::EvaluateModule(module_->NewLocal(isolate), script_state->GetContext(), isolate), result, try_catch)) { - // TODO(adamk): report error + return; } }
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptModule.h b/third_party/WebKit/Source/bindings/core/v8/ScriptModule.h index 43a73d5..564f03ab 100644 --- a/third_party/WebKit/Source/bindings/core/v8/ScriptModule.h +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptModule.h
@@ -40,7 +40,7 @@ // Returns exception, if any. ScriptValue Instantiate(ScriptState*); - void Evaluate(ScriptState*); + void Evaluate(ScriptState*) const; Vector<String> ModuleRequests(ScriptState*);
diff --git a/third_party/WebKit/Source/bindings/core/v8/ToV8ForCore.cpp b/third_party/WebKit/Source/bindings/core/v8/ToV8ForCore.cpp index 4db3bc5..71e07c22 100644 --- a/third_party/WebKit/Source/bindings/core/v8/ToV8ForCore.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/ToV8ForCore.cpp
@@ -19,14 +19,8 @@ if (UNLIKELY(!window)) return v8::Null(isolate); - // Initializes environment of a frame, and return the global object - // of the frame. - Frame* frame = window->GetFrame(); - if (!frame) - return V8Undefined(); - return frame->GetWindowProxy(DOMWrapperWorld::Current(isolate)) - ->GlobalProxyIfNotDetached(); + return window->GlobalProxy(DOMWrapperWorld::Current(isolate)); } v8::Local<v8::Value> ToV8(EventTarget* impl,
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.h b/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.h index a9944a6..240a5f3 100644 --- a/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.h +++ b/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.h
@@ -113,7 +113,7 @@ const WrapperTypeInfo* wrapper_type_info, v8::Local<v8::Object> wrapper) { if (DOMDataStore::SetWrapper(isolate, impl, wrapper_type_info, wrapper)) { - wrapper_type_info->WrapperCreated(); + WrapperTypeInfo::WrapperCreated(); SetNativeInfo(isolate, wrapper, wrapper_type_info, impl); ASSERT(HasInternalFieldsSet(wrapper)); }
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp index 3689332..c793ab6 100644 --- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
@@ -155,7 +155,7 @@ v8::Local<v8::Object> wrapper) { if (world_->DomDataStore().Set(isolate_, window, wrapper_type_info, wrapper)) { - wrapper_type_info->WrapperCreated(); + WrapperTypeInfo::WrapperCreated(); V8DOMWrapper::SetNativeInfo(isolate_, wrapper, wrapper_type_info, window); DCHECK(V8DOMWrapper::HasInternalFieldsSet(wrapper)); }
diff --git a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h index 849ceca53..a802abf 100644 --- a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h +++ b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
@@ -105,6 +105,16 @@ v8::External::Cast(*type_info_wrapper)->Value()); } + static void WrapperCreated() { + ThreadState::Current()->Heap().HeapStats().IncreaseWrapperCount(1); + } + + static void WrapperDestroyed() { + ThreadHeapStats& heap_stats = ThreadState::Current()->Heap().HeapStats(); + heap_stats.DecreaseWrapperCount(1); + heap_stats.IncreaseCollectedWrapperCount(1); + } + bool Equals(const WrapperTypeInfo* that) const { return this == that; } bool IsSubclass(const WrapperTypeInfo* that) const { @@ -129,16 +139,6 @@ return dom_template_function(isolate, world); } - void WrapperCreated() const { - ThreadState::Current()->Heap().HeapStats().IncreaseWrapperCount(1); - } - - void WrapperDestroyed() const { - ThreadHeapStats& heap_stats = ThreadState::Current()->Heap().HeapStats(); - heap_stats.DecreaseWrapperCount(1); - heap_stats.IncreaseCollectedWrapperCount(1); - } - void Trace(Visitor* visitor, ScriptWrappable* script_wrappable) const { DCHECK(trace_function); return trace_function(visitor, script_wrappable);
diff --git a/third_party/WebKit/Source/core/CoreExport.h b/third_party/WebKit/Source/core/CoreExport.h index 6767b0be..83cb16f 100644 --- a/third_party/WebKit/Source/core/CoreExport.h +++ b/third_party/WebKit/Source/core/CoreExport.h
@@ -5,7 +5,7 @@ #ifndef CoreExport_h #define CoreExport_h -#include "wtf/Compiler.h" +#include "platform/wtf/Compiler.h" #if defined(COMPONENT_BUILD) #if defined(WIN32)
diff --git a/third_party/WebKit/Source/core/CoreInitializer.cpp b/third_party/WebKit/Source/core/CoreInitializer.cpp index ebfbb0c..0042a13 100644 --- a/third_party/WebKit/Source/core/CoreInitializer.cpp +++ b/third_party/WebKit/Source/core/CoreInitializer.cpp
@@ -59,9 +59,9 @@ #include "platform/weborigin/KURL.h" #include "platform/weborigin/SchemeRegistry.h" #include "platform/weborigin/SecurityPolicy.h" +#include "platform/wtf/allocator/Partitions.h" +#include "platform/wtf/text/AtomicStringTable.h" #include "public/platform/Platform.h" -#include "wtf/allocator/Partitions.h" -#include "wtf/text/AtomicStringTable.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/CoreInitializer.h b/third_party/WebKit/Source/core/CoreInitializer.h index 178c7e7..ccc61d4 100644 --- a/third_party/WebKit/Source/core/CoreInitializer.h +++ b/third_party/WebKit/Source/core/CoreInitializer.h
@@ -32,7 +32,7 @@ #define CoreInitializer_h #include "core/CoreExport.h" -#include "wtf/Allocator.h" +#include "platform/wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/DEPS b/third_party/WebKit/Source/core/DEPS index c81ff79..f1ec5796 100644 --- a/third_party/WebKit/Source/core/DEPS +++ b/third_party/WebKit/Source/core/DEPS
@@ -13,4 +13,7 @@ "-public/web", "+third_party/skia/include", "-web", + + # Use platform/wtf/ now (see crbug.com/691465). + "-wtf", ]
diff --git a/third_party/WebKit/Source/core/animation/DEPS b/third_party/WebKit/Source/core/animation/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/animation/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/clipboard/DataObject.cpp b/third_party/WebKit/Source/core/clipboard/DataObject.cpp index 5352d402..0c578e2 100644 --- a/third_party/WebKit/Source/core/clipboard/DataObject.cpp +++ b/third_party/WebKit/Source/core/clipboard/DataObject.cpp
@@ -34,10 +34,10 @@ #include "core/clipboard/Pasteboard.h" #include "platform/clipboard/ClipboardMimeTypes.h" #include "platform/clipboard/ClipboardUtilities.h" +#include "platform/wtf/HashSet.h" #include "public/platform/Platform.h" #include "public/platform/WebClipboard.h" #include "public/platform/WebDragData.h" -#include "wtf/HashSet.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataObject.h b/third_party/WebKit/Source/core/clipboard/DataObject.h index de1fc51..24d994a 100644 --- a/third_party/WebKit/Source/core/clipboard/DataObject.h +++ b/third_party/WebKit/Source/core/clipboard/DataObject.h
@@ -36,10 +36,10 @@ #include "platform/PasteMode.h" #include "platform/Supplementable.h" #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/Vector.h" -#include "wtf/text/StringHash.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/StringHash.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataObjectItem.h b/third_party/WebKit/Source/core/clipboard/DataObjectItem.h index cf98082..f2c824337 100644 --- a/third_party/WebKit/Source/core/clipboard/DataObjectItem.h +++ b/third_party/WebKit/Source/core/clipboard/DataObjectItem.h
@@ -36,7 +36,7 @@ #include "platform/SharedBuffer.h" #include "platform/heap/Handle.h" #include "platform/weborigin/KURL.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransfer.h b/third_party/WebKit/Source/core/clipboard/DataTransfer.h index f57d33c..37da4fe 100644 --- a/third_party/WebKit/Source/core/clipboard/DataTransfer.h +++ b/third_party/WebKit/Source/core/clipboard/DataTransfer.h
@@ -24,6 +24,7 @@ #ifndef DataTransfer_h #define DataTransfer_h +#include <memory> #include "bindings/core/v8/ScriptWrappable.h" #include "core/CoreExport.h" #include "core/clipboard/DataTransferAccessPolicy.h" @@ -31,8 +32,7 @@ #include "core/page/DragActions.h" #include "platform/geometry/IntPoint.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include <memory> +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp b/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp index 737248f2..10047a3 100644 --- a/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp +++ b/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp
@@ -37,9 +37,9 @@ #include "core/dom/StringCallback.h" #include "core/dom/TaskRunnerHelper.h" #include "core/probe/CoreProbes.h" +#include "platform/wtf/StdLibExtras.h" +#include "platform/wtf/text/WTFString.h" #include "public/platform/WebTraceLocation.h" -#include "wtf/StdLibExtras.h" -#include "wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransferItem.h b/third_party/WebKit/Source/core/clipboard/DataTransferItem.h index f9471ca..1434cc3 100644 --- a/third_party/WebKit/Source/core/clipboard/DataTransferItem.h +++ b/third_party/WebKit/Source/core/clipboard/DataTransferItem.h
@@ -34,7 +34,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransferItemList.h b/third_party/WebKit/Source/core/clipboard/DataTransferItemList.h index 25e4d81..ac4ed692 100644 --- a/third_party/WebKit/Source/core/clipboard/DataTransferItemList.h +++ b/third_party/WebKit/Source/core/clipboard/DataTransferItemList.h
@@ -33,7 +33,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/DraggedIsolatedFileSystem.h b/third_party/WebKit/Source/core/clipboard/DraggedIsolatedFileSystem.h index 125ac2c..922b3f8 100644 --- a/third_party/WebKit/Source/core/clipboard/DraggedIsolatedFileSystem.h +++ b/third_party/WebKit/Source/core/clipboard/DraggedIsolatedFileSystem.h
@@ -7,7 +7,7 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/Pasteboard.cpp b/third_party/WebKit/Source/core/clipboard/Pasteboard.cpp index 0fd7f17..426f7f5 100644 --- a/third_party/WebKit/Source/core/clipboard/Pasteboard.cpp +++ b/third_party/WebKit/Source/core/clipboard/Pasteboard.cpp
@@ -34,12 +34,12 @@ #include "platform/clipboard/ClipboardUtilities.h" #include "platform/graphics/Image.h" #include "platform/weborigin/KURL.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" #include "public/platform/Platform.h" #include "public/platform/WebDragData.h" #include "public/platform/WebString.h" #include "public/platform/WebURL.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/clipboard/Pasteboard.h b/third_party/WebKit/Source/core/clipboard/Pasteboard.h index b4dcf2ac..0336c6f 100644 --- a/third_party/WebKit/Source/core/clipboard/Pasteboard.h +++ b/third_party/WebKit/Source/core/clipboard/Pasteboard.h
@@ -28,10 +28,10 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/Noncopyable.h" +#include "platform/wtf/text/WTFString.h" #include "public/platform/WebClipboard.h" -#include "wtf/Forward.h" -#include "wtf/Noncopyable.h" -#include "wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/DEPS b/third_party/WebKit/Source/core/css/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/css/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/dom/DEPS b/third_party/WebKit/Source/core/dom/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/dom/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp index d30539b..a34467c 100644 --- a/third_party/WebKit/Source/core/dom/Range.cpp +++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -1440,35 +1440,40 @@ return EndPosition().NodeAsRangePastLastNode(); } +// TODO(hs1217.lee):: we should move this implement to VisibleUnits and then +// this function will remove. +static Vector<IntRect> computeTextRects(const EphemeralRange&); + IntRect Range::BoundingBox() const { IntRect result; - Vector<IntRect> rects; - TextRects(rects); + const Vector<IntRect>& rects = computeTextRects(EphemeralRange(this)); for (const IntRect& rect : rects) result.Unite(rect); return result; } -void Range::TextRects(Vector<IntRect>& rects, bool use_selection_height) const { - Node* start_container = &start_.Container(); +static Vector<IntRect> computeTextRects(const EphemeralRange& range) { + const Position& start_position = range.StartPosition(); + const Position& end_position = range.EndPosition(); + Node* const start_container = start_position.ComputeContainerNode(); DCHECK(start_container); - Node* end_container = &end_.Container(); + Node* const end_container = end_position.ComputeContainerNode(); DCHECK(end_container); - Node* stop_node = PastLastNode(); - for (Node* node = FirstNode(); node != stop_node; - node = NodeTraversal::Next(*node)) { - LayoutObject* r = node->GetLayoutObject(); - if (!r || !r->IsText()) + Vector<IntRect> rects; + for (const Node& node : range.Nodes()) { + LayoutObject* const layoutObject = node.GetLayoutObject(); + if (!layoutObject || !layoutObject->IsText()) continue; - LayoutText* layout_text = ToLayoutText(r); - unsigned start_offset = node == start_container ? start_.Offset() : 0; + LayoutText* layout_text = ToLayoutText(layoutObject); + unsigned start_offset = + node == start_container ? start_position.OffsetInContainerNode() : 0; unsigned end_offset = node == end_container - ? end_.Offset() + ? end_position.OffsetInContainerNode() : std::numeric_limits<unsigned>::max(); - layout_text->AbsoluteRectsForRange(rects, start_offset, end_offset, - use_selection_height); + layout_text->AbsoluteRectsForRange(rects, start_offset, end_offset); } + return rects; } void Range::TextQuads(Vector<FloatQuad>& quads,
diff --git a/third_party/WebKit/Source/core/dom/Range.h b/third_party/WebKit/Source/core/dom/Range.h index c300753..af10abf2 100644 --- a/third_party/WebKit/Source/core/dom/Range.h +++ b/third_party/WebKit/Source/core/dom/Range.h
@@ -140,7 +140,6 @@ Node* PastLastNode() const; // Not transform-friendly - void TextRects(Vector<IntRect>&, bool use_selection_height = false) const; IntRect BoundingBox() const; // Transform-friendly
diff --git a/third_party/WebKit/Source/core/editing/DEPS b/third_party/WebKit/Source/core/editing/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/editing/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h index 935f1d1..8dd5d00 100644 --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
@@ -180,13 +180,6 @@ void SetEndOffset(unsigned offset) { end_offset_ = offset; } void ShiftOffsets(int delta); - bool operator==(const DocumentMarker& o) const { - return GetType() == o.GetType() && StartOffset() == o.StartOffset() && - EndOffset() == o.EndOffset(); - } - - bool operator!=(const DocumentMarker& o) const { return !(*this == o); } - DECLARE_TRACE(); private:
diff --git a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.h b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.h index b029051..4669026 100644 --- a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.h +++ b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.h
@@ -28,8 +28,8 @@ #define DOMWindowEventQueue_h #include "core/events/EventQueue.h" -#include "wtf/HashSet.h" -#include "wtf/ListHashSet.h" +#include "platform/wtf/HashSet.h" +#include "platform/wtf/ListHashSet.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/ErrorEvent.h b/third_party/WebKit/Source/core/events/ErrorEvent.h index 66b9d5c..2dc41aab 100644 --- a/third_party/WebKit/Source/core/events/ErrorEvent.h +++ b/third_party/WebKit/Source/core/events/ErrorEvent.h
@@ -31,13 +31,13 @@ #ifndef ErrorEvent_h #define ErrorEvent_h +#include <memory> #include "bindings/core/v8/DOMWrapperWorld.h" #include "bindings/core/v8/SourceLocation.h" #include "core/events/ErrorEventInit.h" #include "core/events/Event.h" -#include "wtf/RefPtr.h" -#include "wtf/text/WTFString.h" -#include <memory> +#include "platform/wtf/RefPtr.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/Event.h b/third_party/WebKit/Source/core/events/Event.h index 915f154..e9929cd 100644 --- a/third_party/WebKit/Source/core/events/Event.h +++ b/third_party/WebKit/Source/core/events/Event.h
@@ -32,8 +32,8 @@ #include "core/events/EventInit.h" #include "core/events/EventPath.h" #include "platform/heap/Handle.h" -#include "wtf/Time.h" -#include "wtf/text/AtomicString.h" +#include "platform/wtf/Time.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventDispatcher.cpp b/third_party/WebKit/Source/core/events/EventDispatcher.cpp index 7aa1682..8aa5627b 100644 --- a/third_party/WebKit/Source/core/events/EventDispatcher.cpp +++ b/third_party/WebKit/Source/core/events/EventDispatcher.cpp
@@ -43,7 +43,7 @@ #include "core/inspector/InspectorTraceEvents.h" #include "platform/EventDispatchForbiddenScope.h" #include "platform/instrumentation/tracing/TraceEvent.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventDispatcher.h b/third_party/WebKit/Source/core/events/EventDispatcher.h index 56cd0fc..7b20583 100644 --- a/third_party/WebKit/Source/core/events/EventDispatcher.h +++ b/third_party/WebKit/Source/core/events/EventDispatcher.h
@@ -31,8 +31,8 @@ #include "core/dom/SimulatedClickOptions.h" #include "core/events/EventDispatchResult.h" #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventFactory.h b/third_party/WebKit/Source/core/events/EventFactory.h index 726b2d1..77ca2bc 100644 --- a/third_party/WebKit/Source/core/events/EventFactory.h +++ b/third_party/WebKit/Source/core/events/EventFactory.h
@@ -26,12 +26,12 @@ #ifndef EventFactory_h #define EventFactory_h -#include "platform/heap/Handle.h" -#include "wtf/Allocator.h" -#include "wtf/PassRefPtr.h" -#include "wtf/PtrUtil.h" -#include "wtf/text/AtomicString.h" #include <memory> +#include "platform/heap/Handle.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventListener.h b/third_party/WebKit/Source/core/events/EventListener.h index 81ce1a64..03045cc 100644 --- a/third_party/WebKit/Source/core/events/EventListener.h +++ b/third_party/WebKit/Source/core/events/EventListener.h
@@ -23,7 +23,7 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventListenerMap.cpp b/third_party/WebKit/Source/core/events/EventListenerMap.cpp index 3068e970..6e4e3e0 100644 --- a/third_party/WebKit/Source/core/events/EventListenerMap.cpp +++ b/third_party/WebKit/Source/core/events/EventListenerMap.cpp
@@ -33,12 +33,12 @@ #include "core/events/EventListenerMap.h" #include "core/events/EventTarget.h" -#include "wtf/StdLibExtras.h" -#include "wtf/Vector.h" +#include "platform/wtf/StdLibExtras.h" +#include "platform/wtf/Vector.h" #if DCHECK_IS_ON() -#include "wtf/Threading.h" -#include "wtf/ThreadingPrimitives.h" +#include "platform/wtf/Threading.h" +#include "platform/wtf/ThreadingPrimitives.h" #endif namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventListenerMap.h b/third_party/WebKit/Source/core/events/EventListenerMap.h index c36767d..ca45eb0 100644 --- a/third_party/WebKit/Source/core/events/EventListenerMap.h +++ b/third_party/WebKit/Source/core/events/EventListenerMap.h
@@ -37,8 +37,8 @@ #include "core/events/AddEventListenerOptionsResolved.h" #include "core/events/EventListenerOptions.h" #include "core/events/RegisteredEventListener.h" -#include "wtf/Noncopyable.h" -#include "wtf/text/AtomicStringHash.h" +#include "platform/wtf/Noncopyable.h" +#include "platform/wtf/text/AtomicStringHash.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventPath.h b/third_party/WebKit/Source/core/events/EventPath.h index 89238d32..f4cb5c1 100644 --- a/third_party/WebKit/Source/core/events/EventPath.h +++ b/third_party/WebKit/Source/core/events/EventPath.h
@@ -32,8 +32,8 @@ #include "core/events/TreeScopeEventContext.h" #include "core/events/WindowEventContext.h" #include "platform/heap/Handle.h" -#include "wtf/HashMap.h" -#include "wtf/Vector.h" +#include "platform/wtf/HashMap.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventQueue.h b/third_party/WebKit/Source/core/events/EventQueue.h index 34c79ed..a40bb653c 100644 --- a/third_party/WebKit/Source/core/events/EventQueue.h +++ b/third_party/WebKit/Source/core/events/EventQueue.h
@@ -29,8 +29,8 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/HashMap.h" -#include "wtf/HashSet.h" +#include "platform/wtf/HashMap.h" +#include "platform/wtf/HashSet.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventSender.h b/third_party/WebKit/Source/core/events/EventSender.h index 5bd7df3..17b3cbc 100644 --- a/third_party/WebKit/Source/core/events/EventSender.h +++ b/third_party/WebKit/Source/core/events/EventSender.h
@@ -28,8 +28,8 @@ #include "platform/Timer.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" -#include "wtf/text/AtomicString.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/EventTarget.cpp b/third_party/WebKit/Source/core/events/EventTarget.cpp index cabb6d5..d6389c88 100644 --- a/third_party/WebKit/Source/core/events/EventTarget.cpp +++ b/third_party/WebKit/Source/core/events/EventTarget.cpp
@@ -50,10 +50,10 @@ #include "core/probe/CoreProbes.h" #include "platform/EventDispatchForbiddenScope.h" #include "platform/Histogram.h" -#include "wtf/PtrUtil.h" -#include "wtf/StdLibExtras.h" -#include "wtf/Threading.h" -#include "wtf/Vector.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/StdLibExtras.h" +#include "platform/wtf/Threading.h" +#include "platform/wtf/Vector.h" namespace blink { namespace {
diff --git a/third_party/WebKit/Source/core/events/EventTarget.h b/third_party/WebKit/Source/core/events/EventTarget.h index d297dbf..4aa3588a 100644 --- a/third_party/WebKit/Source/core/events/EventTarget.h +++ b/third_party/WebKit/Source/core/events/EventTarget.h
@@ -32,6 +32,7 @@ #ifndef EventTarget_h #define EventTarget_h +#include <memory> #include "bindings/core/v8/ScriptWrappable.h" #include "core/CoreExport.h" #include "core/EventNames.h" @@ -42,9 +43,8 @@ #include "core/events/EventListenerMap.h" #include "core/frame/UseCounter.h" #include "platform/heap/Handle.h" -#include "wtf/Allocator.h" -#include "wtf/text/AtomicString.h" -#include <memory> +#include "platform/wtf/Allocator.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/GenericEventQueue.h b/third_party/WebKit/Source/core/events/GenericEventQueue.h index 8d8ae92f..f377dc1d 100644 --- a/third_party/WebKit/Source/core/events/GenericEventQueue.h +++ b/third_party/WebKit/Source/core/events/GenericEventQueue.h
@@ -30,8 +30,8 @@ #include "core/events/EventQueue.h" #include "core/events/EventTarget.h" #include "platform/Timer.h" -#include "wtf/RefPtr.h" -#include "wtf/Vector.h" +#include "platform/wtf/RefPtr.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/GestureEvent.cpp b/third_party/WebKit/Source/core/events/GestureEvent.cpp index a5a0162..5def71d 100644 --- a/third_party/WebKit/Source/core/events/GestureEvent.cpp +++ b/third_party/WebKit/Source/core/events/GestureEvent.cpp
@@ -26,7 +26,7 @@ #include "core/events/GestureEvent.h" #include "core/dom/Element.h" -#include "wtf/text/AtomicString.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/KeyboardEvent.cpp b/third_party/WebKit/Source/core/events/KeyboardEvent.cpp index ff42c02..53acf61 100644 --- a/third_party/WebKit/Source/core/events/KeyboardEvent.cpp +++ b/third_party/WebKit/Source/core/events/KeyboardEvent.cpp
@@ -27,9 +27,9 @@ #include "core/editing/InputMethodController.h" #include "core/input/InputDeviceCapabilities.h" #include "platform/WindowsKeyboardCodes.h" +#include "platform/wtf/PtrUtil.h" #include "public/platform/Platform.h" #include "public/platform/WebInputEvent.h" -#include "wtf/PtrUtil.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/MessageEvent.h b/third_party/WebKit/Source/core/events/MessageEvent.h index 67d72bb..734785f 100644 --- a/third_party/WebKit/Source/core/events/MessageEvent.h +++ b/third_party/WebKit/Source/core/events/MessageEvent.h
@@ -29,6 +29,7 @@ #ifndef MessageEvent_h #define MessageEvent_h +#include <memory> #include "bindings/core/v8/SerializedScriptValue.h" #include "core/CoreExport.h" #include "core/dom/DOMArrayBuffer.h" @@ -37,8 +38,7 @@ #include "core/events/EventTarget.h" #include "core/events/MessageEventInit.h" #include "core/fileapi/Blob.h" -#include "wtf/Compiler.h" -#include <memory> +#include "platform/wtf/Compiler.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/NavigatorEvents.h b/third_party/WebKit/Source/core/events/NavigatorEvents.h index 537690b..eb33b35 100644 --- a/third_party/WebKit/Source/core/events/NavigatorEvents.h +++ b/third_party/WebKit/Source/core/events/NavigatorEvents.h
@@ -31,7 +31,7 @@ #ifndef NavigatorEvents_h #define NavigatorEvents_h -#include "wtf/Allocator.h" +#include "platform/wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/NodeEventContext.h b/third_party/WebKit/Source/core/events/NodeEventContext.h index 90c6e3c9..2755239 100644 --- a/third_party/WebKit/Source/core/events/NodeEventContext.h +++ b/third_party/WebKit/Source/core/events/NodeEventContext.h
@@ -29,8 +29,8 @@ #include "core/CoreExport.h" #include "core/events/TreeScopeEventContext.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/PointerEventFactory.h b/third_party/WebKit/Source/core/events/PointerEventFactory.h index 617ee10..b6ffa2dd 100644 --- a/third_party/WebKit/Source/core/events/PointerEventFactory.h +++ b/third_party/WebKit/Source/core/events/PointerEventFactory.h
@@ -7,9 +7,9 @@ #include "core/CoreExport.h" #include "core/events/PointerEvent.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/HashMap.h" #include "public/platform/WebPointerProperties.h" -#include "wtf/Allocator.h" -#include "wtf/HashMap.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/RegisteredEventListener.h b/third_party/WebKit/Source/core/events/RegisteredEventListener.h index 510903b..6d8ea9e6 100644 --- a/third_party/WebKit/Source/core/events/RegisteredEventListener.h +++ b/third_party/WebKit/Source/core/events/RegisteredEventListener.h
@@ -27,7 +27,7 @@ #include "core/events/AddEventListenerOptionsResolved.h" #include "core/events/EventListener.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp b/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp index a1864b4..59d10c2 100644 --- a/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp +++ b/third_party/WebKit/Source/core/events/ScopedEventQueue.cpp
@@ -30,12 +30,12 @@ #include "core/events/ScopedEventQueue.h" +#include <memory> #include "core/events/Event.h" #include "core/events/EventDispatchMediator.h" #include "core/events/EventDispatcher.h" #include "core/events/EventTarget.h" -#include "wtf/PtrUtil.h" -#include <memory> +#include "platform/wtf/PtrUtil.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/ScopedEventQueue.h b/third_party/WebKit/Source/core/events/ScopedEventQueue.h index 34ead77..8ba7ade 100644 --- a/third_party/WebKit/Source/core/events/ScopedEventQueue.h +++ b/third_party/WebKit/Source/core/events/ScopedEventQueue.h
@@ -33,10 +33,10 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/Noncopyable.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" -#include "wtf/Vector.h" +#include "platform/wtf/Noncopyable.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/TreeScopeEventContext.h b/third_party/WebKit/Source/core/events/TreeScopeEventContext.h index 27753c4..d562915 100644 --- a/third_party/WebKit/Source/core/events/TreeScopeEventContext.h +++ b/third_party/WebKit/Source/core/events/TreeScopeEventContext.h
@@ -31,7 +31,7 @@ #include "core/dom/Node.h" #include "core/dom/TreeScope.h" #include "core/events/EventTarget.h" -#include "wtf/Vector.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/events/WindowEventContext.h b/third_party/WebKit/Source/core/events/WindowEventContext.h index 1524e9c..a5b6c31 100644 --- a/third_party/WebKit/Source/core/events/WindowEventContext.h +++ b/third_party/WebKit/Source/core/events/WindowEventContext.h
@@ -29,7 +29,7 @@ #include "core/frame/LocalDOMWindow.h" #include "platform/heap/Handle.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/Blob.h b/third_party/WebKit/Source/core/fileapi/Blob.h index 10b289e1..7b8247f 100644 --- a/third_party/WebKit/Source/core/fileapi/Blob.h +++ b/third_party/WebKit/Source/core/fileapi/Blob.h
@@ -40,8 +40,8 @@ #include "core/imagebitmap/ImageBitmapSource.h" #include "platform/blob/BlobData.h" #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/File.cpp b/third_party/WebKit/Source/core/fileapi/File.cpp index 794cf35..e4c13b7e 100644 --- a/third_party/WebKit/Source/core/fileapi/File.cpp +++ b/third_party/WebKit/Source/core/fileapi/File.cpp
@@ -34,10 +34,10 @@ #include "platform/FileMetadata.h" #include "platform/blob/BlobData.h" #include "platform/network/mime/MIMETypeRegistry.h" +#include "platform/wtf/CurrentTime.h" +#include "platform/wtf/DateMath.h" #include "public/platform/Platform.h" #include "public/platform/WebFileUtilities.h" -#include "wtf/CurrentTime.h" -#include "wtf/DateMath.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/File.h b/third_party/WebKit/Source/core/fileapi/File.h index 0bfe2951..fdd6b58 100644 --- a/third_party/WebKit/Source/core/fileapi/File.h +++ b/third_party/WebKit/Source/core/fileapi/File.h
@@ -30,8 +30,8 @@ #include "core/CoreExport.h" #include "core/fileapi/Blob.h" #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileList.h b/third_party/WebKit/Source/core/fileapi/FileList.h index ce0d232..a3e2f83 100644 --- a/third_party/WebKit/Source/core/fileapi/FileList.h +++ b/third_party/WebKit/Source/core/fileapi/FileList.h
@@ -30,7 +30,7 @@ #include "core/CoreExport.h" #include "core/fileapi/File.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.cpp b/third_party/WebKit/Source/core/fileapi/FileReader.cpp index 47fa8de..8228e05 100644 --- a/third_party/WebKit/Source/core/fileapi/FileReader.cpp +++ b/third_party/WebKit/Source/core/fileapi/FileReader.cpp
@@ -41,11 +41,11 @@ #include "core/fileapi/File.h" #include "core/probe/CoreProbes.h" #include "platform/Supplementable.h" -#include "wtf/AutoReset.h" -#include "wtf/CurrentTime.h" -#include "wtf/Deque.h" -#include "wtf/HashSet.h" -#include "wtf/text/CString.h" +#include "platform/wtf/AutoReset.h" +#include "platform/wtf/CurrentTime.h" +#include "platform/wtf/Deque.h" +#include "platform/wtf/HashSet.h" +#include "platform/wtf/text/CString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.h b/third_party/WebKit/Source/core/fileapi/FileReader.h index bfc40e0..a4d8e172 100644 --- a/third_party/WebKit/Source/core/fileapi/FileReader.h +++ b/third_party/WebKit/Source/core/fileapi/FileReader.h
@@ -31,6 +31,7 @@ #ifndef FileReader_h #define FileReader_h +#include <memory> #include "bindings/core/v8/ActiveScriptWrappable.h" #include "core/CoreExport.h" #include "core/dom/ContextLifecycleObserver.h" @@ -39,8 +40,7 @@ #include "core/fileapi/FileReaderLoader.h" #include "core/fileapi/FileReaderLoaderClient.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include <memory> +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp index 10480acb..9a238f4b 100644 --- a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp +++ b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp
@@ -43,13 +43,13 @@ #include "platform/loader/fetch/ResourceError.h" #include "platform/loader/fetch/ResourceRequest.h" #include "platform/loader/fetch/ResourceResponse.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/RefPtr.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/Base64.h" +#include "platform/wtf/text/StringBuilder.h" #include "public/platform/WebURLRequest.h" -#include "wtf/PassRefPtr.h" -#include "wtf/PtrUtil.h" -#include "wtf/RefPtr.h" -#include "wtf/Vector.h" -#include "wtf/text/Base64.h" -#include "wtf/text/StringBuilder.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.h b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.h index 5394d26..3bccac7 100644 --- a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.h +++ b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.h
@@ -31,17 +31,17 @@ #ifndef FileReaderLoader_h #define FileReaderLoader_h +#include <memory> #include "core/CoreExport.h" #include "core/fileapi/FileError.h" #include "core/loader/ThreadableLoaderClient.h" #include "platform/heap/Handle.h" #include "platform/weborigin/KURL.h" -#include "wtf/Forward.h" -#include "wtf/PtrUtil.h" -#include "wtf/text/TextEncoding.h" -#include "wtf/text/WTFString.h" -#include "wtf/typed_arrays/ArrayBufferBuilder.h" -#include <memory> +#include "platform/wtf/Forward.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/text/TextEncoding.h" +#include "platform/wtf/text/WTFString.h" +#include "platform/wtf/typed_arrays/ArrayBufferBuilder.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/FileReaderSync.h b/third_party/WebKit/Source/core/fileapi/FileReaderSync.h index 3399981..3d44502d 100644 --- a/third_party/WebKit/Source/core/fileapi/FileReaderSync.h +++ b/third_party/WebKit/Source/core/fileapi/FileReaderSync.h
@@ -33,7 +33,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/fileapi/URLFileAPI.h b/third_party/WebKit/Source/core/fileapi/URLFileAPI.h index 032e73cf..0ca6240 100644 --- a/third_party/WebKit/Source/core/fileapi/URLFileAPI.h +++ b/third_party/WebKit/Source/core/fileapi/URLFileAPI.h
@@ -5,8 +5,8 @@ #ifndef URLFileAPI_h #define URLFileAPI_h -#include "wtf/Allocator.h" -#include "wtf/Forward.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/frame/DEPS b/third_party/WebKit/Source/core/frame/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/frame/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp index fa9d7601..c3b0748 100644 --- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp +++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
@@ -5,6 +5,8 @@ #include "core/frame/DOMWindow.h" #include <memory> + +#include "bindings/core/v8/WindowProxyManager.h" #include "core/dom/Document.h" #include "core/dom/ExecutionContext.h" #include "core/dom/SecurityContext.h" @@ -29,7 +31,10 @@ namespace blink { -DOMWindow::DOMWindow(Frame& frame) : frame_(frame), window_is_closing_(false) {} +DOMWindow::DOMWindow(Frame& frame) + : frame_(frame), + window_proxy_manager_(frame.GetWindowProxyManager()), + window_is_closing_(false) {} DOMWindow::~DOMWindow() { // The frame must be disconnected before finalization. @@ -115,6 +120,18 @@ return child ? child->DomWindow() : nullptr; } +bool DOMWindow::AnonymousIndexedSetter(uint32_t index, + const ScriptValue& value) { + // https://html.spec.whatwg.org/C/browsers.html#windowproxy-defineownproperty + // step 2 - 1. If P is an array index property name, return false. + // + // As an alternative way to implement WindowProxy.[[DefineOwnProperty]] for + // array index property names, we always intercept and ignore the set + // operation for indexed properties, i.e. [[DefineOwnProperty]] for array + // index property names has always no effect. + return true; // Intercept unconditionally but do nothing. +} + bool DOMWindow::IsCurrentlyDisplayedInFrame() const { if (GetFrame()) SECURITY_CHECK(GetFrame()->DomWindow() == this); @@ -420,6 +437,14 @@ true /* notifyEmbedder */); } +v8::Local<v8::Object> DOMWindow::GlobalProxy(DOMWrapperWorld& world) { + // TODO(yukishiino): Make this function always return the non-empty handle + // even if the frame is detached because the global proxy must always exist + // per spec. + return window_proxy_manager_->GetWindowProxy(world) + ->GlobalProxyIfNotDetached(); +} + InputDeviceCapabilitiesConstants* DOMWindow::GetInputDeviceCapabilities() { if (!input_capabilities_) input_capabilities_ = new InputDeviceCapabilitiesConstants; @@ -428,6 +453,7 @@ DEFINE_TRACE(DOMWindow) { visitor->Trace(frame_); + visitor->Trace(window_proxy_manager_); visitor->Trace(input_capabilities_); visitor->Trace(location_); EventTargetWithInlineData::Trace(visitor);
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.h b/third_party/WebKit/Source/core/frame/DOMWindow.h index d7e3bc10..445850e 100644 --- a/third_party/WebKit/Source/core/frame/DOMWindow.h +++ b/third_party/WebKit/Source/core/frame/DOMWindow.h
@@ -18,10 +18,12 @@ class Document; class InputDeviceCapabilitiesConstants; -class Location; class LocalDOMWindow; +class Location; class MessageEvent; +class ScriptValue; class SerializedScriptValue; +class WindowProxyManager; class CORE_EXPORT DOMWindow : public EventTargetWithInlineData, public DOMWindowBase64 { @@ -82,10 +84,9 @@ virtual void blur() = 0; void close(ExecutionContext*); - // FIXME: This handles both window[index] and window.frames[index]. However, - // the spec exposes window.frames[index] across origins but not - // window[index]... - DOMWindow* AnonymousIndexedGetter(uint32_t) const; + // Indexed properties + DOMWindow* AnonymousIndexedGetter(uint32_t index) const; + bool AnonymousIndexedSetter(uint32_t index, const ScriptValue&); void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray&, @@ -108,6 +109,8 @@ bool isSecureContext() const; + v8::Local<v8::Object> GlobalProxy(DOMWrapperWorld&); + InputDeviceCapabilitiesConstants* GetInputDeviceCapabilities(); protected: @@ -121,6 +124,10 @@ private: Member<Frame> frame_; + // Unlike |frame_|, |window_proxy_manager_| is available even after the + // window's frame gets detached from the DOM, until the end of the lifetime + // of this object. + const Member<WindowProxyManager> window_proxy_manager_; Member<InputDeviceCapabilitiesConstants> input_capabilities_; mutable Member<Location> location_;
diff --git a/third_party/WebKit/Source/core/frame/Window.idl b/third_party/WebKit/Source/core/frame/Window.idl index c86c8b21..2bbfaa86 100644 --- a/third_party/WebKit/Source/core/frame/Window.idl +++ b/third_party/WebKit/Source/core/frame/Window.idl
@@ -64,8 +64,14 @@ [CheckSecurity=ReturnValue, Custom=Getter] readonly attribute Element? frameElement; // FIXME: open() should have 4 optional arguments with defaults. [Custom] Window? open(DOMString url, DOMString target, optional DOMString features); - // FIXME: These getters should not have [NotEnumerable]. + + // indexed properties + // https://html.spec.whatwg.org/C/browsers.html#windowproxy-getownproperty [NotEnumerable, CrossOrigin] getter Window (unsigned long index); + // https://html.spec.whatwg.org/C/browsers.html#windowproxy-defineownproperty + setter void (unsigned long index, any value); + + // named properties [Custom, NotEnumerable, CrossOrigin] getter object (DOMString name); // the user agent
diff --git a/third_party/WebKit/Source/core/html/DEPS b/third_party/WebKit/Source/core/html/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/html/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/html/HTMLElement.cpp b/third_party/WebKit/Source/core/html/HTMLElement.cpp index 07da494..9808d05 100644 --- a/third_party/WebKit/Source/core/html/HTMLElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLElement.cpp
@@ -144,9 +144,8 @@ HasTagName(bgsoundTag) || HasTagName(brTag) || HasTagName(colTag) || HasTagName(embedTag) || HasTagName(frameTag) || HasTagName(hrTag) || HasTagName(imgTag) || HasTagName(inputTag) || HasTagName(keygenTag) || - HasTagName(linkTag) || HasTagName(menuitemTag) || HasTagName(metaTag) || - HasTagName(paramTag) || HasTagName(sourceTag) || HasTagName(trackTag) || - HasTagName(wbrTag)) + HasTagName(linkTag) || HasTagName(metaTag) || HasTagName(paramTag) || + HasTagName(sourceTag) || HasTagName(trackTag) || HasTagName(wbrTag)) return false; return true; }
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLStackItem.h b/third_party/WebKit/Source/core/html/parser/HTMLStackItem.h index 5e9210ab..97b2812 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLStackItem.h +++ b/third_party/WebKit/Source/core/html/parser/HTMLStackItem.h
@@ -160,8 +160,6 @@ tag_name == HTMLNames::mainTag || tag_name == HTMLNames::marqueeTag || tag_name == HTMLNames::menuTag || - (RuntimeEnabledFeatures::contextMenuEnabled() && - tag_name == HTMLNames::menuitemTag) || tag_name == HTMLNames::metaTag || tag_name == HTMLNames::navTag || tag_name == HTMLNames::noembedTag || tag_name == HTMLNames::noframesTag ||
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp index 79c3a82d..056c0657 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
@@ -732,9 +732,7 @@ frameset_ok_ = false; return; } - if ((RuntimeEnabledFeatures::contextMenuEnabled() && - token->GetName() == menuitemTag) || - token->GetName() == paramTag || token->GetName() == sourceTag || + if (token->GetName() == paramTag || token->GetName() == sourceTag || token->GetName() == trackTag) { tree_.InsertSelfClosingHTMLElementDestroyingToken(token); return;
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp index 8b2ceca4..be63dba 100644 --- a/third_party/WebKit/Source/core/input/EventHandler.cpp +++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -94,12 +94,12 @@ #include "platform/instrumentation/tracing/TraceEvent.h" #include "platform/scroll/ScrollAnimatorBase.h" #include "platform/scroll/Scrollbar.h" +#include "platform/wtf/Assertions.h" +#include "platform/wtf/CurrentTime.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/StdLibExtras.h" #include "public/platform/WebInputEvent.h" #include "public/platform/WebMouseWheelEvent.h" -#include "wtf/Assertions.h" -#include "wtf/CurrentTime.h" -#include "wtf/PtrUtil.h" -#include "wtf/StdLibExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/EventHandler.h b/third_party/WebKit/Source/core/input/EventHandler.h index cf3d22e..f50f3dc 100644 --- a/third_party/WebKit/Source/core/input/EventHandler.h +++ b/third_party/WebKit/Source/core/input/EventHandler.h
@@ -42,12 +42,12 @@ #include "platform/geometry/LayoutPoint.h" #include "platform/heap/Handle.h" #include "platform/scroll/ScrollTypes.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/HashMap.h" +#include "platform/wtf/HashTraits.h" +#include "platform/wtf/RefPtr.h" #include "public/platform/WebInputEvent.h" #include "public/platform/WebInputEventResult.h" -#include "wtf/Forward.h" -#include "wtf/HashMap.h" -#include "wtf/HashTraits.h" -#include "wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/GestureManager.h b/third_party/WebKit/Source/core/input/GestureManager.h index 71254134..47c024d7 100644 --- a/third_party/WebKit/Source/core/input/GestureManager.h +++ b/third_party/WebKit/Source/core/input/GestureManager.h
@@ -9,9 +9,9 @@ #include "core/frame/LocalFrame.h" #include "core/layout/HitTestRequest.h" #include "core/page/EventWithHitTestResults.h" +#include "platform/wtf/Optional.h" +#include "platform/wtf/Time.h" #include "public/platform/WebInputEventResult.h" -#include "wtf/Optional.h" -#include "wtf/Time.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/KeyboardEventManager.h b/third_party/WebKit/Source/core/input/KeyboardEventManager.h index cb21fd6..7b148bb 100644 --- a/third_party/WebKit/Source/core/input/KeyboardEventManager.h +++ b/third_party/WebKit/Source/core/input/KeyboardEventManager.h
@@ -8,10 +8,10 @@ #include "core/CoreExport.h" #include "platform/heap/Handle.h" #include "platform/heap/Visitor.h" +#include "platform/wtf/Allocator.h" #include "public/platform/WebFocusType.h" #include "public/platform/WebInputEvent.h" #include "public/platform/WebInputEventResult.h" -#include "wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/MouseEventManager.h b/third_party/WebKit/Source/core/input/MouseEventManager.h index 9bebf63..1da27559 100644 --- a/third_party/WebKit/Source/core/input/MouseEventManager.h +++ b/third_party/WebKit/Source/core/input/MouseEventManager.h
@@ -11,10 +11,10 @@ #include "core/page/DragActions.h" #include "core/page/EventWithHitTestResults.h" #include "platform/Timer.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/Time.h" #include "public/platform/WebInputEventResult.h" #include "public/platform/WebMouseEvent.h" -#include "wtf/Allocator.h" -#include "wtf/Time.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/PointerEventManager.cpp b/third_party/WebKit/Source/core/input/PointerEventManager.cpp index 01ff3cf..51501f3 100644 --- a/third_party/WebKit/Source/core/input/PointerEventManager.cpp +++ b/third_party/WebKit/Source/core/input/PointerEventManager.cpp
@@ -18,8 +18,8 @@ #include "core/layout/HitTestCanvasResult.h" #include "core/page/ChromeClient.h" #include "core/page/Page.h" +#include "platform/wtf/AutoReset.h" #include "public/platform/WebTouchEvent.h" -#include "wtf/AutoReset.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/PointerEventManager.h b/third_party/WebKit/Source/core/input/PointerEventManager.h index 45e5153..5f4e21e 100644 --- a/third_party/WebKit/Source/core/input/PointerEventManager.h +++ b/third_party/WebKit/Source/core/input/PointerEventManager.h
@@ -10,10 +10,10 @@ #include "core/events/PointerEventFactory.h" #include "core/input/BoundaryEventDispatcher.h" #include "core/input/TouchEventManager.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/HashMap.h" #include "public/platform/WebInputEventResult.h" #include "public/platform/WebPointerProperties.h" -#include "wtf/Allocator.h" -#include "wtf/HashMap.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp index 38bc0e55..054ae1c8 100644 --- a/third_party/WebKit/Source/core/input/ScrollManager.cpp +++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
@@ -24,7 +24,7 @@ #include "core/paint/PaintLayer.h" #include "platform/Histogram.h" #include "platform/RuntimeEnabledFeatures.h" -#include "wtf/PtrUtil.h" +#include "platform/wtf/PtrUtil.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/input/ScrollManager.h b/third_party/WebKit/Source/core/input/ScrollManager.h index bdd7a1e8..715282d 100644 --- a/third_party/WebKit/Source/core/input/ScrollManager.h +++ b/third_party/WebKit/Source/core/input/ScrollManager.h
@@ -5,15 +5,15 @@ #ifndef ScrollManager_h #define ScrollManager_h +#include <deque> #include "core/CoreExport.h" #include "core/page/EventWithHitTestResults.h" #include "platform/geometry/LayoutSize.h" #include "platform/heap/Handle.h" #include "platform/heap/Visitor.h" #include "platform/scroll/ScrollTypes.h" +#include "platform/wtf/Allocator.h" #include "public/platform/WebInputEventResult.h" -#include "wtf/Allocator.h" -#include <deque> namespace blink {
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.cpp b/third_party/WebKit/Source/core/input/TouchEventManager.cpp index b602333..f45287cf 100644 --- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp +++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
@@ -4,6 +4,7 @@ #include "core/input/TouchEventManager.h" +#include <memory> #include "core/dom/Document.h" #include "core/events/TouchEvent.h" #include "core/frame/Deprecation.h" @@ -16,10 +17,9 @@ #include "core/page/ChromeClient.h" #include "core/page/Page.h" #include "platform/Histogram.h" +#include "platform/wtf/CurrentTime.h" +#include "platform/wtf/PtrUtil.h" #include "public/platform/WebTouchEvent.h" -#include "wtf/CurrentTime.h" -#include "wtf/PtrUtil.h" -#include <memory> namespace blink {
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.h b/third_party/WebKit/Source/core/input/TouchEventManager.h index 7674ba23..d791b49 100644 --- a/third_party/WebKit/Source/core/input/TouchEventManager.h +++ b/third_party/WebKit/Source/core/input/TouchEventManager.h
@@ -7,10 +7,10 @@ #include "core/CoreExport.h" #include "core/events/PointerEventFactory.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/HashMap.h" #include "public/platform/WebInputEventResult.h" #include "public/platform/WebTouchPoint.h" -#include "wtf/Allocator.h" -#include "wtf/HashMap.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/layout/DEPS b/third_party/WebKit/Source/core/layout/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/layout/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/loader/DEPS b/third_party/WebKit/Source/core/loader/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/loader/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp index d8539867..20b98d6 100644 --- a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp +++ b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp
@@ -19,9 +19,9 @@ #include "platform/graphics/OffscreenCanvasFrameDispatcherImpl.h" #include "platform/graphics/StaticBitmapImage.h" #include "platform/image-encoders/ImageEncoderUtils.h" +#include "platform/wtf/MathExtras.h" #include "public/platform/Platform.h" #include "third_party/skia/include/core/SkSurface.h" -#include "wtf/MathExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp index dc1411b..cb245701 100644 --- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp +++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
@@ -16,13 +16,13 @@ #include "platform/Histogram.h" #include "platform/RuntimeEnabledFeatures.h" #include "platform/weborigin/SecurityOrigin.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/StringBuilder.h" #include "public/platform/Platform.h" #include "public/platform/WebOriginTrialTokenStatus.h" #include "public/platform/WebSecurityOrigin.h" #include "public/platform/WebTrialTokenValidator.h" #include "v8/include/v8.h" -#include "wtf/Vector.h" -#include "wtf/text/StringBuilder.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h index f43529e..e1024be4 100644 --- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h +++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h
@@ -8,10 +8,10 @@ #include "core/CoreExport.h" #include "core/dom/ExecutionContext.h" #include "platform/Supplementable.h" -#include "wtf/HashSet.h" -#include "wtf/Vector.h" -#include "wtf/text/StringHash.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/HashSet.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/StringHash.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp index 08b776e2..83c1975 100644 --- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp +++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
@@ -4,6 +4,7 @@ #include "core/origin_trials/OriginTrialContext.h" +#include <memory> #include "core/HTMLNames.h" #include "core/dom/DOMException.h" #include "core/frame/FrameView.h" @@ -14,12 +15,11 @@ #include "platform/testing/HistogramTester.h" #include "platform/weborigin/KURL.h" #include "platform/weborigin/SecurityOrigin.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/Vector.h" #include "public/platform/WebOriginTrialTokenStatus.h" #include "public/platform/WebTrialTokenValidator.h" #include "testing/gtest/include/gtest/gtest.h" -#include "wtf/PtrUtil.h" -#include "wtf/Vector.h" -#include <memory> namespace blink { namespace {
diff --git a/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp b/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp index 97184b3..0e97601 100644 --- a/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp +++ b/third_party/WebKit/Source/core/page/ContextMenuControllerTest.cpp
@@ -41,18 +41,25 @@ "width: 100px;\">" "<menu type=\"context\" id=\"menu_id\">" "<menuitem label=\"Item1\" onclick='document.title = \"Title 1\";'>" + "</menuitem>" "<menuitem label=\"Item2\" onclick='document.title = \"Title 2\";'>" + "</menuitem>" "<menuitem label=\"Item3\" onclick='document.title = \"Title 3\";'>" + "</menuitem>" "<menu label='Submenu'>" "<menuitem label=\"Item4\" onclick='document.title = \"Title 4\";'>" + "</menuitem>" "<menuitem label=\"Item5\" onclick='document.title = \"Title 5\";'>" + "</menuitem>" "<menuitem label=\"Item6\" onclick='document.title = \"Title 6\";'>" + "</menuitem>" "</menu>" "<menuitem id=\"item7\" type=\"checkbox\" checked label=\"Item7\"" "onclick='if " "(document.getElementById(\"item7\").hasAttribute(\"checked\"))" "document.title = \"Title 7 checked\"; else document.title = \"Title 7 " "not checked\";'>" + "</menuitem>" "<menuitem id=\"item8\" type=\"radio\" radiogroup=\"group\" " "label=\"Item8\"" "onclick='if " @@ -60,12 +67,14 @@ "document.title = \"Title 8 checked\"; else if " "(document.getElementById(\"item9\").hasAttribute(\"checked\"))" "document.title = \"Title 8 not checked and Title 9 checked\";'>" + "</menuitem>" "<menuitem id=\"item9\" type=\"radio\" radiogroup=\"group\" checked " "label=\"Item9\"" "onclick='if " "(document.getElementById(\"item9\").hasAttribute(\"checked\"))" "document.title = \"Title 9 checked\"; else document.title = \"Title 9 " "not checked\";'>" + "</menuitem>" "<menuitem id=\"item10\" type=\"radio\" radiogroup=\"group\" " "label=\"Item10\"" "onclick='if " @@ -73,6 +82,7 @@ "document.title = \"Title 10 checked\"; else if " "(document.getElementById(\"item8\").hasAttribute(\"checked\"))" "document.title = \"Title 10 not checked and Title 8 checked\";'>" + "</menuitem>" "</menu>" "</button>");
diff --git a/third_party/WebKit/Source/core/page/DEPS b/third_party/WebKit/Source/core/page/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/page/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/paint/DEPS b/third_party/WebKit/Source/core/paint/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/paint/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/plugins/PluginView.h b/third_party/WebKit/Source/core/plugins/PluginView.h index 0a1113ca..5def9f9 100644 --- a/third_party/WebKit/Source/core/plugins/PluginView.h +++ b/third_party/WebKit/Source/core/plugins/PluginView.h
@@ -31,9 +31,9 @@ #include "core/CoreExport.h" #include "platform/FrameViewBase.h" #include "platform/scroll/ScrollTypes.h" +#include "platform/wtf/text/WTFString.h" #include "public/platform/WebFocusType.h" #include "v8/include/v8.h" -#include "wtf/text/WTFString.h" namespace blink { class WebLayer;
diff --git a/third_party/WebKit/Source/core/streams/ReadableStreamController.h b/third_party/WebKit/Source/core/streams/ReadableStreamController.h index 96a4c15..20362d91 100644 --- a/third_party/WebKit/Source/core/streams/ReadableStreamController.h +++ b/third_party/WebKit/Source/core/streams/ReadableStreamController.h
@@ -11,8 +11,8 @@ #include "bindings/core/v8/V8ScriptRunner.h" #include "core/CoreExport.h" #include "platform/heap/Handle.h" +#include "platform/wtf/RefPtr.h" #include "v8/include/v8.h" -#include "wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/streams/Stream.h b/third_party/WebKit/Source/core/streams/Stream.h index ad00624..b6850ee 100644 --- a/third_party/WebKit/Source/core/streams/Stream.h +++ b/third_party/WebKit/Source/core/streams/Stream.h
@@ -35,7 +35,7 @@ #include "core/dom/SuspendableObject.h" #include "platform/heap/Handle.h" #include "platform/weborigin/KURL.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/style/DEPS b/third_party/WebKit/Source/core/style/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/style/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/svg/DEPS b/third_party/WebKit/Source/core/svg/DEPS index c0fa7f3..709a0319 100644 --- a/third_party/WebKit/Source/core/svg/DEPS +++ b/third_party/WebKit/Source/core/svg/DEPS
@@ -1,6 +1,3 @@ include_rules = [ "+ui/gfx/geometry/cubic_bezier.h", - - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", ]
diff --git a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.h b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.h index db264e8a..67e81b0 100644 --- a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.h +++ b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.h
@@ -7,8 +7,8 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/DeathAwareScriptWrappable.h b/third_party/WebKit/Source/core/testing/DeathAwareScriptWrappable.h index 4c72ca02..077fbd2 100644 --- a/third_party/WebKit/Source/core/testing/DeathAwareScriptWrappable.h +++ b/third_party/WebKit/Source/core/testing/DeathAwareScriptWrappable.h
@@ -5,11 +5,11 @@ #ifndef DeathAwareScriptWrappable_h #define DeathAwareScriptWrappable_h +#include <signal.h> #include "bindings/core/v8/ScriptWrappable.h" #include "bindings/core/v8/TraceWrapperMember.h" #include "platform/heap/Heap.h" -#include "wtf/text/WTFString.h" -#include <signal.h> +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/DictionaryTest.h b/third_party/WebKit/Source/core/testing/DictionaryTest.h index e811c663..b3b97c1 100644 --- a/third_party/WebKit/Source/core/testing/DictionaryTest.h +++ b/third_party/WebKit/Source/core/testing/DictionaryTest.h
@@ -11,8 +11,8 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "core/dom/Element.h" #include "platform/heap/Handle.h" -#include "wtf/HashMap.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/HashMap.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp index 7336cd8..e2a7f06a 100644 --- a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp +++ b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
@@ -30,15 +30,15 @@ #include "core/testing/DummyPageHolder.h" +#include <memory> #include "core/frame/FrameView.h" #include "core/frame/LocalDOMWindow.h" #include "core/frame/LocalFrame.h" #include "core/frame/Settings.h" #include "core/frame/VisualViewport.h" #include "core/loader/EmptyClients.h" -#include "wtf/Assertions.h" -#include "wtf/PtrUtil.h" -#include <memory> +#include "platform/wtf/Assertions.h" +#include "platform/wtf/PtrUtil.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/DummyPageHolder.h b/third_party/WebKit/Source/core/testing/DummyPageHolder.h index adb65ec..f667b0f 100644 --- a/third_party/WebKit/Source/core/testing/DummyPageHolder.h +++ b/third_party/WebKit/Source/core/testing/DummyPageHolder.h
@@ -36,8 +36,8 @@ #include "core/page/Page.h" #include "platform/geometry/IntSize.h" #include "platform/heap/Handle.h" -#include "wtf/Allocator.h" -#include "wtf/Noncopyable.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/Noncopyable.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/GarbageCollectedScriptWrappable.h b/third_party/WebKit/Source/core/testing/GarbageCollectedScriptWrappable.h index b37f2527..c86f8e0 100644 --- a/third_party/WebKit/Source/core/testing/GarbageCollectedScriptWrappable.h +++ b/third_party/WebKit/Source/core/testing/GarbageCollectedScriptWrappable.h
@@ -7,8 +7,8 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Heap.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/InternalSettings.h b/third_party/WebKit/Source/core/testing/InternalSettings.h index 711278fe..5428ed06 100644 --- a/third_party/WebKit/Source/core/testing/InternalSettings.h +++ b/third_party/WebKit/Source/core/testing/InternalSettings.h
@@ -33,9 +33,9 @@ #include "platform/geometry/IntSize.h" #include "platform/graphics/ImageAnimationPolicy.h" #include "platform/heap/Handle.h" +#include "platform/wtf/Allocator.h" +#include "platform/wtf/text/WTFString.h" #include "public/platform/WebDisplayMode.h" -#include "wtf/Allocator.h" -#include "wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp index 8bde90e..cded96f 100644 --- a/third_party/WebKit/Source/core/testing/Internals.cpp +++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -146,17 +146,17 @@ #include "platform/scroll/ScrollbarTheme.h" #include "platform/testing/URLTestHelpers.h" #include "platform/weborigin/SchemeRegistry.h" +#include "platform/wtf/InstanceCounter.h" +#include "platform/wtf/Optional.h" +#include "platform/wtf/PtrUtil.h" +#include "platform/wtf/dtoa.h" +#include "platform/wtf/text/StringBuffer.h" #include "public/platform/Platform.h" #include "public/platform/WebConnectionType.h" #include "public/platform/WebGraphicsContext3DProvider.h" #include "public/platform/WebLayer.h" #include "public/platform/modules/remoteplayback/WebRemotePlaybackAvailability.h" #include "v8/include/v8.h" -#include "wtf/InstanceCounter.h" -#include "wtf/Optional.h" -#include "wtf/PtrUtil.h" -#include "wtf/dtoa.h" -#include "wtf/text/StringBuffer.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/Internals.h b/third_party/WebKit/Source/core/testing/Internals.h index cbe4354..6db652f 100644 --- a/third_party/WebKit/Source/core/testing/Internals.h +++ b/third_party/WebKit/Source/core/testing/Internals.h
@@ -35,8 +35,8 @@ #include "core/css/CSSComputedStyleDeclaration.h" #include "core/page/scrolling/ScrollingCoordinator.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/LayerRect.h b/third_party/WebKit/Source/core/testing/LayerRect.h index 2b768375..e22e766 100644 --- a/third_party/WebKit/Source/core/testing/LayerRect.h +++ b/third_party/WebKit/Source/core/testing/LayerRect.h
@@ -35,7 +35,7 @@ #include "core/dom/ClientRect.h" #include "core/dom/Node.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/LayerRectList.h b/third_party/WebKit/Source/core/testing/LayerRectList.h index fe9a1e92..99bc588 100644 --- a/third_party/WebKit/Source/core/testing/LayerRectList.h +++ b/third_party/WebKit/Source/core/testing/LayerRectList.h
@@ -33,8 +33,8 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/OriginTrialsTestPartial.h b/third_party/WebKit/Source/core/testing/OriginTrialsTestPartial.h index 98f103af..16cbb512 100644 --- a/third_party/WebKit/Source/core/testing/OriginTrialsTestPartial.h +++ b/third_party/WebKit/Source/core/testing/OriginTrialsTestPartial.h
@@ -5,7 +5,7 @@ #ifndef OriginTrialsTestPartial_h #define OriginTrialsTestPartial_h -#include "wtf/Allocator.h" +#include "platform/wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/RecordTest.h b/third_party/WebKit/Source/core/testing/RecordTest.h index 4141cc1..c681914a 100644 --- a/third_party/WebKit/Source/core/testing/RecordTest.h +++ b/third_party/WebKit/Source/core/testing/RecordTest.h
@@ -12,8 +12,8 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "core/dom/Element.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Vector.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/UnionTypesTest.cpp b/third_party/WebKit/Source/core/testing/UnionTypesTest.cpp index ad4d21f..8ac58f4 100644 --- a/third_party/WebKit/Source/core/testing/UnionTypesTest.cpp +++ b/third_party/WebKit/Source/core/testing/UnionTypesTest.cpp
@@ -4,7 +4,7 @@ #include "core/testing/UnionTypesTest.h" -#include "wtf/text/StringBuilder.h" +#include "platform/wtf/text/StringBuilder.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/testing/UnionTypesTest.h b/third_party/WebKit/Source/core/testing/UnionTypesTest.h index 01f9aaf..74da66a 100644 --- a/third_party/WebKit/Source/core/testing/UnionTypesTest.h +++ b/third_party/WebKit/Source/core/testing/UnionTypesTest.h
@@ -10,7 +10,7 @@ #include "bindings/core/v8/DoubleOrStringOrStringArray.h" #include "bindings/core/v8/DoubleOrStringOrStringSequence.h" #include "bindings/core/v8/NodeListOrElement.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h index 0f4d4dc..7dfcc46 100644 --- a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h +++ b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h
@@ -8,7 +8,7 @@ #include "core/CoreExport.h" #include "platform/Supplementable.h" #include "platform/heap/Handle.h" -#include "wtf/Noncopyable.h" +#include "platform/wtf/Noncopyable.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp index 7522903f..60bb6be 100644 --- a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp +++ b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp
@@ -35,10 +35,10 @@ #include "core/frame/LocalFrame.h" #include "core/frame/Settings.h" #include "platform/RuntimeEnabledFeatures.h" +#include "platform/wtf/CurrentTime.h" +#include "platform/wtf/MathExtras.h" +#include "platform/wtf/ThreadSpecific.h" #include "v8/include/v8.h" -#include "wtf/CurrentTime.h" -#include "wtf/MathExtras.h" -#include "wtf/ThreadSpecific.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/MemoryInfo.h b/third_party/WebKit/Source/core/timing/MemoryInfo.h index b09f00c..b7e1f73 100644 --- a/third_party/WebKit/Source/core/timing/MemoryInfo.h +++ b/third_party/WebKit/Source/core/timing/MemoryInfo.h
@@ -34,7 +34,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "core/CoreExport.h" #include "platform/heap/Handle.h" -#include "wtf/Allocator.h" +#include "platform/wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp index a6b5dab..89b35e61 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
@@ -47,7 +47,7 @@ #include "platform/loader/fetch/ResourceResponse.h" #include "platform/loader/fetch/ResourceTimingInfo.h" #include "platform/weborigin/SecurityOrigin.h" -#include "wtf/CurrentTime.h" +#include "platform/wtf/CurrentTime.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceBase.h b/third_party/WebKit/Source/core/timing/PerformanceBase.h index 1a362bb..cd75b5d 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceBase.h +++ b/third_party/WebKit/Source/core/timing/PerformanceBase.h
@@ -41,10 +41,10 @@ #include "core/timing/PerformancePaintTiming.h" #include "platform/Timer.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/HashSet.h" -#include "wtf/ListHashSet.h" -#include "wtf/Vector.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/HashSet.h" +#include "platform/wtf/ListHashSet.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceEntry.h b/third_party/WebKit/Source/core/timing/PerformanceEntry.h index 53ec54e..aad53f8 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceEntry.h +++ b/third_party/WebKit/Source/core/timing/PerformanceEntry.h
@@ -36,7 +36,7 @@ #include "core/CoreExport.h" #include "core/dom/DOMHighResTimeStamp.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.h b/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.h index 843aa01..0d8e8087a 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.h +++ b/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.h
@@ -7,8 +7,8 @@ #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceMark.h b/third_party/WebKit/Source/core/timing/PerformanceMark.h index b08de62..b75afc74 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceMark.h +++ b/third_party/WebKit/Source/core/timing/PerformanceMark.h
@@ -28,7 +28,7 @@ #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceMeasure.h b/third_party/WebKit/Source/core/timing/PerformanceMeasure.h index b6d32cd..223c601 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceMeasure.h +++ b/third_party/WebKit/Source/core/timing/PerformanceMeasure.h
@@ -28,8 +28,8 @@ #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceObserver.h b/third_party/WebKit/Source/core/timing/PerformanceObserver.h index e2b4dac9..4c1328d 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceObserver.h +++ b/third_party/WebKit/Source/core/timing/PerformanceObserver.h
@@ -9,7 +9,7 @@ #include "core/CoreExport.h" #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/Vector.h" +#include "platform/wtf/Vector.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.cpp b/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.cpp index 394b08a..b1c564e 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.cpp
@@ -4,9 +4,9 @@ #include "core/timing/PerformanceObserverEntryList.h" -#include "core/timing/PerformanceEntry.h" -#include "wtf/StdLibExtras.h" #include <algorithm> +#include "core/timing/PerformanceEntry.h" +#include "platform/wtf/StdLibExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.h b/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.h index 00ee332..1e212fc 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.h +++ b/third_party/WebKit/Source/core/timing/PerformanceObserverEntryList.h
@@ -7,7 +7,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h index e6fb9c2..6d4d298 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h +++ b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h
@@ -35,7 +35,7 @@ #include "core/dom/DOMHighResTimeStamp.h" #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp index 0e4f752..f45681bb 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp
@@ -32,8 +32,8 @@ #include "core/timing/PerformanceMeasure.h" #include "platform/Histogram.h" #include "platform/instrumentation/tracing/TraceEvent.h" +#include "platform/wtf/text/StringHash.h" #include "public/platform/Platform.h" -#include "wtf/text/StringHash.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.h b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.h index 78b2f52..94b792f4 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.h +++ b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.h
@@ -29,7 +29,7 @@ #include "core/timing/PerformanceBase.h" #include "core/timing/PerformanceTiming.h" #include "platform/heap/Handle.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/TaskAttributionTiming.h b/third_party/WebKit/Source/core/timing/TaskAttributionTiming.h index 2b20819..5ccd305 100644 --- a/third_party/WebKit/Source/core/timing/TaskAttributionTiming.h +++ b/third_party/WebKit/Source/core/timing/TaskAttributionTiming.h
@@ -7,8 +7,8 @@ #include "core/timing/PerformanceEntry.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/WorkerPerformance.cpp b/third_party/WebKit/Source/core/timing/WorkerPerformance.cpp index 628662e8..5dedc36 100644 --- a/third_party/WebKit/Source/core/timing/WorkerPerformance.cpp +++ b/third_party/WebKit/Source/core/timing/WorkerPerformance.cpp
@@ -33,10 +33,10 @@ #include "core/timing/MemoryInfo.h" #include "core/workers/DedicatedWorkerGlobalScope.h" #include "core/workers/WorkerGlobalScope.h" +#include "platform/wtf/CurrentTime.h" #include "public/platform/Platform.h" #include "public/platform/WebScheduler.h" #include "public/platform/WebThread.h" -#include "wtf/CurrentTime.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/timing/WorkerPerformance.h b/third_party/WebKit/Source/core/timing/WorkerPerformance.h index d1a6558..be726201 100644 --- a/third_party/WebKit/Source/core/timing/WorkerPerformance.h +++ b/third_party/WebKit/Source/core/timing/WorkerPerformance.h
@@ -34,7 +34,7 @@ #include "bindings/core/v8/ScriptWrappable.h" #include "core/timing/PerformanceBase.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" +#include "platform/wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/workers/DEPS b/third_party/WebKit/Source/core/workers/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/workers/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/xml/DEPS b/third_party/WebKit/Source/core/xml/DEPS deleted file mode 100644 index eba58c8..0000000 --- a/third_party/WebKit/Source/core/xml/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - # Use platform/wtf/ now (see crbug.com/691465). - "-wtf/", -]
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp index 9864143..7f2cb18 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
@@ -78,11 +78,11 @@ #include "platform/weborigin/SecurityOrigin.h" #include "platform/weborigin/SecurityPolicy.h" #include "platform/weborigin/Suborigin.h" +#include "platform/wtf/Assertions.h" +#include "platform/wtf/AutoReset.h" +#include "platform/wtf/StdLibExtras.h" +#include "platform/wtf/text/CString.h" #include "public/platform/WebURLRequest.h" -#include "wtf/Assertions.h" -#include "wtf/AutoReset.h" -#include "wtf/StdLibExtras.h" -#include "wtf/text/CString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h index 918bb56..e192b6f 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
@@ -40,11 +40,11 @@ #include "platform/network/HTTPHeaderMap.h" #include "platform/weborigin/KURL.h" #include "platform/weborigin/SecurityOrigin.h" -#include "wtf/Forward.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" -#include "wtf/text/AtomicString.h" -#include "wtf/text/WTFString.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" +#include "platform/wtf/text/AtomicString.h" +#include "platform/wtf/text/WTFString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp index 6b4a942f..839bcaf 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp
@@ -32,11 +32,11 @@ #include "core/inspector/InspectorTraceEvents.h" #include "core/probe/CoreProbes.h" #include "core/xmlhttprequest/XMLHttpRequest.h" +#include "platform/wtf/Assertions.h" +#include "platform/wtf/text/AtomicString.h" #include "public/platform/Platform.h" #include "public/platform/WebScheduler.h" #include "public/platform/WebThread.h" -#include "wtf/Assertions.h" -#include "wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.h index da29476..debf3daf 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.h +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.h
@@ -29,8 +29,8 @@ #include "platform/Timer.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/core/xmlhttprequest/XMLHttpRequestUpload.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp index be32b85..ac788d3 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp
@@ -28,8 +28,8 @@ #include "core/EventTypeNames.h" #include "core/events/ProgressEvent.h" #include "core/probe/CoreProbes.h" -#include "wtf/Assertions.h" -#include "wtf/text/AtomicString.h" +#include "platform/wtf/Assertions.h" +#include "platform/wtf/text/AtomicString.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.h index da7c9bd..69fdc931 100644 --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.h +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.h
@@ -30,9 +30,9 @@ #include "core/xmlhttprequest/XMLHttpRequest.h" #include "core/xmlhttprequest/XMLHttpRequestEventTarget.h" #include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefPtr.h" +#include "platform/wtf/Forward.h" +#include "platform/wtf/PassRefPtr.h" +#include "platform/wtf/RefPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/modules/BUILD.gn b/third_party/WebKit/Source/modules/BUILD.gn index e42ddf0..15fa267 100644 --- a/third_party/WebKit/Source/modules/BUILD.gn +++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -322,7 +322,7 @@ deps = [ ":modules", ":modules_testing", - "//components/payments/mojom:mojom_blink", + "//components/payments/content:mojom_blink", "//skia", "//testing/gmock", "//testing/gtest",
diff --git a/third_party/WebKit/Source/modules/payments/BUILD.gn b/third_party/WebKit/Source/modules/payments/BUILD.gn index 09cdb69..7379385 100644 --- a/third_party/WebKit/Source/modules/payments/BUILD.gn +++ b/third_party/WebKit/Source/modules/payments/BUILD.gn
@@ -35,7 +35,7 @@ "PaymentsValidators.h", ] deps = [ - "//components/payments/mojom:mojom_blink", - "//components/payments/mojom:mojom_payment_app_blink", + "//components/payments/content:mojom_blink", + "//components/payments/content:mojom_payment_app_blink", ] }
diff --git a/third_party/WebKit/Source/modules/payments/PaymentAddress.h b/third_party/WebKit/Source/modules/payments/PaymentAddress.h index 01f06b37..805e0ba 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentAddress.h +++ b/third_party/WebKit/Source/modules/payments/PaymentAddress.h
@@ -7,7 +7,7 @@ #include "bindings/core/v8/ScriptValue.h" #include "bindings/core/v8/ScriptWrappable.h" -#include "components/payments/mojom/payment_request.mojom-blink.h" +#include "components/payments/content/payment_request.mojom-blink.h" #include "modules/ModulesExport.h" #include "platform/heap/Handle.h" #include "platform/wtf/Noncopyable.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentManager.h b/third_party/WebKit/Source/modules/payments/PaymentManager.h index b20a1ff..207ad86e 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentManager.h +++ b/third_party/WebKit/Source/modules/payments/PaymentManager.h
@@ -7,7 +7,7 @@ #include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptWrappable.h" -#include "components/payments/mojom/payment_app.mojom-blink.h" +#include "components/payments/content/payment_app.mojom-blink.h" #include "modules/ModulesExport.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.h b/third_party/WebKit/Source/modules/payments/PaymentRequest.h index f3c1319..63022dc 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentRequest.h +++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
@@ -8,7 +8,7 @@ #include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptValue.h" #include "bindings/core/v8/ScriptWrappable.h" -#include "components/payments/mojom/payment_request.mojom-blink.h" +#include "components/payments/content/payment_request.mojom-blink.h" #include "core/dom/ContextLifecycleObserver.h" #include "core/events/EventTarget.h" #include "modules/ModulesExport.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentResponse.h b/third_party/WebKit/Source/modules/payments/PaymentResponse.h index f3a713f..f6de224 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentResponse.h +++ b/third_party/WebKit/Source/modules/payments/PaymentResponse.h
@@ -8,7 +8,7 @@ #include "bindings/core/v8/ScriptPromise.h" #include "bindings/core/v8/ScriptValue.h" #include "bindings/core/v8/ScriptWrappable.h" -#include "components/payments/mojom/payment_request.mojom-blink.h" +#include "components/payments/content/payment_request.mojom-blink.h" #include "modules/ModulesExport.h" #include "modules/payments/PaymentCurrencyAmount.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h index 19683ee..9d9d7aa 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h +++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h
@@ -7,7 +7,7 @@ #include "bindings/core/v8/ScriptFunction.h" #include "bindings/core/v8/V8DOMException.h" -#include "components/payments/mojom/payment_request.mojom-blink.h" +#include "components/payments/content/payment_request.mojom-blink.h" #include "modules/payments/PaymentDetailsInit.h" #include "modules/payments/PaymentDetailsUpdate.h" #include "modules/payments/PaymentItem.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentsValidators.h b/third_party/WebKit/Source/modules/payments/PaymentsValidators.h index c391a1e..177fde0 100644 --- a/third_party/WebKit/Source/modules/payments/PaymentsValidators.h +++ b/third_party/WebKit/Source/modules/payments/PaymentsValidators.h
@@ -5,7 +5,7 @@ #ifndef PaymentsValidators_h #define PaymentsValidators_h -#include "components/payments/mojom/payment_request.mojom-blink.h" +#include "components/payments/content/payment_request.mojom-blink.h" #include "modules/ModulesExport.h" #include "platform/wtf/Allocator.h" #include "platform/wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/platform/heap/HeapAllocator.h b/third_party/WebKit/Source/platform/heap/HeapAllocator.h index 1402dcd..ee61d0b 100644 --- a/third_party/WebKit/Source/platform/heap/HeapAllocator.h +++ b/third_party/WebKit/Source/platform/heap/HeapAllocator.h
@@ -148,8 +148,7 @@ static void DeleteArray(void* ptr) { NOTREACHED(); } static bool IsAllocationAllowed() { - return ThreadState::Current()->IsAllocationAllowed() && - !ThreadState::Current()->IsObjectResurrectionForbidden(); + return ThreadState::Current()->IsAllocationAllowed(); } static bool IsObjectResurrectionForbidden() {
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn index 5c99374..d54758b 100644 --- a/third_party/WebKit/public/BUILD.gn +++ b/third_party/WebKit/public/BUILD.gn
@@ -754,7 +754,7 @@ "platform/modules/webshare/webshare.mojom", ] public_deps = [ - "//components/payments/mojom", + "//components/payments/content:mojom", "//url/mojo:url_mojom_gurl", ]
