diff --git a/AUTHORS b/AUTHORS index deb5684..2fac08e 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -87,6 +87,7 @@ Brian Konzman, SJ <b.g.konzman@gmail.com> Brian Luft <brian@electroly.com> Brian Merrell, Novell Inc. <bgmerrell@gmail.com> +Brian Yip <itsbriany@gmail.com> Bruno Calvignac <bruno@flock.com> Bruno de Oliveira Abinader <brunoabinader@gmail.com> Bryan Donlan <bdonlan@gmail.com>
diff --git a/BUILD.gn b/BUILD.gn index 4f8d5c0..6e94646 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -715,6 +715,7 @@ # these are needed only for gn to discover build files. deps += [ "//testing/libfuzzer:libfuzzer_main", + "//testing/libfuzzer/tests:libfuzzer_tests", "//testing/libfuzzer/fuzzers:string_to_int_fuzzer", ] }
diff --git a/DEPS b/DEPS index 13cc4dc..e93d334 100644 --- a/DEPS +++ b/DEPS
@@ -39,11 +39,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '77991de60c30211a29a946d321abd3b4d42b3d75', + 'skia_revision': '2d6ba6690f8951e152d8e793191b14afd52f5506', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '79e36cf1361330c9f011bbba4b808b03f5939ded', + 'v8_revision': '87bcc07fd1c772a033ced39a0eaa77246bfc4877', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other.
diff --git a/WATCHLISTS b/WATCHLISTS index 013e12f..2dee4f4 100644 --- a/WATCHLISTS +++ b/WATCHLISTS
@@ -1040,6 +1040,9 @@ '|third_party/WebKit/Source/modules/push_messaging' \ '|third_party/WebKit/public/platform/modules/push_messaging' }, + 'blink_platform': { + 'filepath': 'third_party/WebKit/Source/platform' + }, 'blink_platform_graphics': { 'filepath': 'third_party/WebKit/Source/platform/fonts' \ '|third_party/WebKit/Source/platform/geometry' \ @@ -1584,6 +1587,7 @@ 'tyoshino+watch@chromium.org', 'loading-reviews@chromium.org' ], 'blink_owners': [ 'abarth@chromium.org'], + 'blink_platform': [ 'kinuko+watch@chromium.org' ], 'blink_platform_graphics': [ 'schenney@chromium.org', 'danakj@chromium.org', 'pdr+graphicswatchlist@chromium.org',
diff --git a/base/debug/close_handle_hook_win.cc b/base/debug/close_handle_hook_win.cc index 70d40b2..359b758e 100644 --- a/base/debug/close_handle_hook_win.cc +++ b/base/debug/close_handle_hook_win.cc
@@ -203,14 +203,15 @@ base::win::IATPatchFunction* patch = NULL; patch = IATPatch(module, "CloseHandle", &CloseHandleHook, reinterpret_cast<void**>(&g_close_function)); - if (patch) - hooks_.push_back(patch); + if (!patch) + return false; + hooks_.push_back(patch); patch = IATPatch(module, "DuplicateHandle", &DuplicateHandleHook, reinterpret_cast<void**>(&g_duplicate_function)); - if (patch) - hooks_.push_back(patch); - + if (!patch) + return false; + hooks_.push_back(patch); return true; } @@ -248,12 +249,15 @@ returned /= sizeof(HMODULE); returned = std::min(kSize, returned); + bool success = false; + for (DWORD current = 0; current < returned; current++) { - if (!hooks->AddIATPatch(modules[current])) - return false; + success = hooks->AddIATPatch(modules[current]); + if (!success) + break; } - return true; + return success; } } // namespace
diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc index f3fb3d1..84e6d3f 100644 --- a/base/test/run_all_unittests.cc +++ b/base/test/run_all_unittests.cc
@@ -22,7 +22,7 @@ #endif base::TestSuite test_suite(argc, argv); #if defined(OS_WIN) - CHECK(base::debug::InstallHandleHooks()); + base::debug::InstallHandleHooks(); #endif int ret = base::LaunchUnitTests( argc, argv,
diff --git a/cc/animation/animation.h b/cc/animation/animation.h index 153e4ef..fb8f8d82 100644 --- a/cc/animation/animation.h +++ b/cc/animation/animation.h
@@ -5,7 +5,7 @@ #ifndef CC_ANIMATION_ANIMATION_H_ #define CC_ANIMATION_ANIMATION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc index 53027e24..512f877 100644 --- a/cc/animation/animation_host.cc +++ b/cc/animation/animation_host.cc
@@ -6,6 +6,7 @@ #include <algorithm> +#include "base/macros.h" #include "cc/animation/animation_delegate.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_player.h"
diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h index 05f2ba3..ad5117c 100644 --- a/cc/animation/animation_host.h +++ b/cc/animation/animation_host.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/cc/animation/animation_id_provider.h b/cc/animation/animation_id_provider.h index 3b14801..22f62d2 100644 --- a/cc/animation/animation_id_provider.h +++ b/cc/animation/animation_id_provider.h
@@ -5,7 +5,7 @@ #ifndef CC_ANIMATION_ANIMATION_ID_PROVIDER_H_ #define CC_ANIMATION_ANIMATION_ID_PROVIDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" namespace cc {
diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc index c237aa7f..dee19eab 100644 --- a/cc/animation/animation_player.cc +++ b/cc/animation/animation_player.cc
@@ -154,15 +154,12 @@ } void AnimationPlayer::PushPropertiesTo(AnimationPlayer* player_impl) { - if (!element_animations_) { - if (player_impl->element_animations()) + if (layer_id_ != player_impl->layer_id()) { + if (player_impl->layer_id()) player_impl->DetachLayer(); - return; + if (layer_id_) + player_impl->AttachLayer(layer_id_); } - - DCHECK(layer_id_); - if (!player_impl->element_animations()) - player_impl->AttachLayer(layer_id_); } void AnimationPlayer::NotifyAnimationStarted(
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h index 3665a2381..d028930 100644 --- a/cc/animation/animation_player.h +++ b/cc/animation/animation_player.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/containers/linked_list.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "cc/animation/animation.h"
diff --git a/cc/animation/animation_player_unittest.cc b/cc/animation/animation_player_unittest.cc index 466964f..d8030b3 100644 --- a/cc/animation/animation_player_unittest.cc +++ b/cc/animation/animation_player_unittest.cc
@@ -332,5 +332,39 @@ client_.set_mutators_need_commit(false); } +// If main-thread player switches to another layer within one frame then +// impl-thread player must be switched as well. +TEST_F(AnimationPlayerTest, SwitchToLayer) { + host_->AddAnimationTimeline(timeline_); + timeline_->AttachPlayer(player_); + player_->AttachLayer(layer_id_); + + host_->PushPropertiesTo(host_impl_); + + GetImplTimelineAndPlayerByID(); + + EXPECT_EQ(player_, GetPlayerForLayerId(layer_id_)); + EXPECT_TRUE(player_->element_animations()); + EXPECT_EQ(player_->layer_id(), layer_id_); + + EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(layer_id_)); + EXPECT_TRUE(player_impl_->element_animations()); + EXPECT_EQ(player_impl_->layer_id(), layer_id_); + + const int new_layer_id = NextTestLayerId(); + player_->DetachLayer(); + player_->AttachLayer(new_layer_id); + + EXPECT_EQ(player_, GetPlayerForLayerId(new_layer_id)); + EXPECT_TRUE(player_->element_animations()); + EXPECT_EQ(player_->layer_id(), new_layer_id); + + host_->PushPropertiesTo(host_impl_); + + EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_layer_id)); + EXPECT_TRUE(player_impl_->element_animations()); + EXPECT_EQ(player_impl_->layer_id(), new_layer_id); +} + } // namespace } // namespace cc
diff --git a/cc/animation/animation_registrar.cc b/cc/animation/animation_registrar.cc index a3edd74a..c300026 100644 --- a/cc/animation/animation_registrar.cc +++ b/cc/animation/animation_registrar.cc
@@ -4,6 +4,8 @@ #include "cc/animation/animation_registrar.h" +#include <stddef.h> + #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h" #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h index 5302390..5cb21e9 100644 --- a/cc/animation/animation_registrar.h +++ b/cc/animation/animation_registrar.h
@@ -6,6 +6,7 @@ #define CC_ANIMATION_ANIMATION_REGISTRAR_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/animation/animation_events.h"
diff --git a/cc/animation/animation_timeline.h b/cc/animation/animation_timeline.h index 4cb31f5c..6100b44 100644 --- a/cc/animation/animation_timeline.h +++ b/cc/animation/animation_timeline.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc index 09219dc..1264718 100644 --- a/cc/animation/element_animations.cc +++ b/cc/animation/element_animations.cc
@@ -4,6 +4,7 @@ #include "cc/animation/element_animations.h" +#include "base/macros.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_player.h" #include "cc/animation/animation_registrar.h"
diff --git a/cc/animation/element_animations.h b/cc/animation/element_animations.h index 0d4fb6a..de76291 100644 --- a/cc/animation/element_animations.h +++ b/cc/animation/element_animations.h
@@ -6,6 +6,7 @@ #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_ #include "base/containers/linked_list.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/animation/animation_delegate.h" #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/animation/keyframed_animation_curve.cc b/cc/animation/keyframed_animation_curve.cc index 0d74135..a8dd9bd 100644 --- a/cc/animation/keyframed_animation_curve.cc +++ b/cc/animation/keyframed_animation_curve.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include "cc/animation/keyframed_animation_curve.h"
diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h index a589c76..24101f65 100644 --- a/cc/animation/keyframed_animation_curve.h +++ b/cc/animation/keyframed_animation_curve.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "cc/animation/animation_curve.h" #include "cc/animation/timing_function.h"
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc index 721173c..b909dccae 100644 --- a/cc/animation/layer_animation_controller.cc +++ b/cc/animation/layer_animation_controller.cc
@@ -4,6 +4,8 @@ #include "cc/animation/layer_animation_controller.h" +#include <stddef.h> + #include <algorithm> #include <vector>
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h index 1f85223..cbff7aa 100644 --- a/cc/animation/layer_animation_controller.h +++ b/cc/animation/layer_animation_controller.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h"
diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc index 7f0f0332..f47b0cf 100644 --- a/cc/animation/layer_animation_controller_unittest.cc +++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/animation/layer_animation_controller.h" +#include <stddef.h> + #include "cc/animation/animation.h" #include "cc/animation/animation_curve.h" #include "cc/animation/animation_delegate.h"
diff --git a/cc/animation/scroll_offset_animation_curve.h b/cc/animation/scroll_offset_animation_curve.h index 95f3d9f5..d27a6dd1 100644 --- a/cc/animation/scroll_offset_animation_curve.h +++ b/cc/animation/scroll_offset_animation_curve.h
@@ -5,6 +5,7 @@ #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/animation/animation_curve.h"
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h index f6f40112..8fce904 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade.h +++ b/cc/animation/scrollbar_animation_controller_linear_fade.h
@@ -5,6 +5,7 @@ #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/animation/scrollbar_animation_controller.h" #include "cc/base/cc_export.h"
diff --git a/cc/animation/scrollbar_animation_controller_thinning.h b/cc/animation/scrollbar_animation_controller_thinning.h index 44362bd..b700db83 100644 --- a/cc/animation/scrollbar_animation_controller_thinning.h +++ b/cc/animation/scrollbar_animation_controller_thinning.h
@@ -5,6 +5,7 @@ #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/animation/scrollbar_animation_controller.h" #include "cc/base/cc_export.h"
diff --git a/cc/animation/timing_function.h b/cc/animation/timing_function.h index f722dd6..ddc3c51 100644 --- a/cc/animation/timing_function.h +++ b/cc/animation/timing_function.h
@@ -5,6 +5,7 @@ #ifndef CC_ANIMATION_TIMING_FUNCTION_H_ #define CC_ANIMATION_TIMING_FUNCTION_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "ui/gfx/geometry/cubic_bezier.h"
diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc index 29a3d90..55a23ab 100644 --- a/cc/animation/transform_operations.cc +++ b/cc/animation/transform_operations.cc
@@ -4,6 +4,8 @@ #include "cc/animation/transform_operations.h" +#include <stddef.h> + #include <algorithm> #include "ui/gfx/animation/tween.h"
diff --git a/cc/animation/transform_operations.h b/cc/animation/transform_operations.h index 65f8511..d173ace 100644 --- a/cc/animation/transform_operations.h +++ b/cc/animation/transform_operations.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/animation/transform_operation.h" #include "cc/base/cc_export.h"
diff --git a/cc/animation/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc index 572ab47e..f7610aa 100644 --- a/cc/animation/transform_operations_unittest.cc +++ b/cc/animation/transform_operations_unittest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <limits> -#include "base/basictypes.h" #include "base/memory/scoped_vector.h" #include "cc/animation/transform_operations.h" #include "cc/test/geometry_test_utils.h"
diff --git a/cc/base/contiguous_container.cc b/cc/base/contiguous_container.cc index 53219f9..b56b26b 100644 --- a/cc/base/contiguous_container.cc +++ b/cc/base/contiguous_container.cc
@@ -4,6 +4,8 @@ #include "cc/base/contiguous_container.h" +#include <stddef.h> + #include <utility> namespace cc {
diff --git a/cc/base/contiguous_container.h b/cc/base/contiguous_container.h index f58f5f8b..bad1511 100644 --- a/cc/base/contiguous_container.h +++ b/cc/base/contiguous_container.h
@@ -5,8 +5,10 @@ #ifndef CC_BASE_CONTIGUOUS_CONTAINER_H_ #define CC_BASE_CONTIGUOUS_CONTAINER_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "cc/base/cc_export.h"
diff --git a/cc/base/contiguous_container_unittest.cc b/cc/base/contiguous_container_unittest.cc index b5e3a6ab..dde2e62e 100644 --- a/cc/base/contiguous_container_unittest.cc +++ b/cc/base/contiguous_container_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/base/contiguous_container.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/base/delayed_unique_notifier.h b/cc/base/delayed_unique_notifier.h index 0e461fe..c177a1f 100644 --- a/cc/base/delayed_unique_notifier.h +++ b/cc/base/delayed_unique_notifier.h
@@ -6,6 +6,7 @@ #define CC_BASE_DELAYED_UNIQUE_NOTIFIER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/base/histograms.cc b/cc/base/histograms.cc index ba6f4f6..58d9aed 100644 --- a/cc/base/histograms.cc +++ b/cc/base/histograms.cc
@@ -4,6 +4,8 @@ #include "cc/base/histograms.h" +#include <stdint.h> + #include <algorithm> #include <cmath> #include <cstring> @@ -52,7 +54,7 @@ } // Minimum elapsed time of 1us to limit weighting of fast calls. -static const int64 kMinimumTimeMicroseconds = 1; +static const int64_t kMinimumTimeMicroseconds = 1; ScopedUMAHistogramAreaTimerBase::ScopedUMAHistogramAreaTimerBase() : area_(0) { }
diff --git a/cc/base/histograms.h b/cc/base/histograms.h index 8c8b467..6614f73 100644 --- a/cc/base/histograms.h +++ b/cc/base/histograms.h
@@ -6,6 +6,7 @@ #define CC_BASE_HISTOGRAMS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_math.h"
diff --git a/cc/base/list_container.h b/cc/base/list_container.h index d590740..962f6f3 100644 --- a/cc/base/list_container.h +++ b/cc/base/list_container.h
@@ -5,6 +5,8 @@ #ifndef CC_BASE_LIST_CONTAINER_H_ #define CC_BASE_LIST_CONTAINER_H_ +#include <stddef.h> + #include "base/logging.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h"
diff --git a/cc/base/list_container_helper.cc b/cc/base/list_container_helper.cc index ea30bad..7b249ac 100644 --- a/cc/base/list_container_helper.cc +++ b/cc/base/list_container_helper.cc
@@ -4,10 +4,13 @@ #include "cc/base/list_container_helper.h" +#include <stddef.h> + #include <algorithm> #include <vector> #include "base/logging.h" +#include "base/macros.h" namespace { const size_t kDefaultNumElementTypesToReserve = 32;
diff --git a/cc/base/list_container_helper.h b/cc/base/list_container_helper.h index 31b2310..61ca25e 100644 --- a/cc/base/list_container_helper.h +++ b/cc/base/list_container_helper.h
@@ -5,6 +5,9 @@ #ifndef CC_BASE_LIST_CONTAINER_HELPER_H_ #define CC_BASE_LIST_CONTAINER_HELPER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/base/list_container_unittest.cc b/cc/base/list_container_unittest.cc index be0b2b75..1363025 100644 --- a/cc/base/list_container_unittest.cc +++ b/cc/base/list_container_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/list_container.h" +#include <stddef.h> + #include <algorithm> #include <vector> #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/base/math_util_unittest.cc b/cc/base/math_util_unittest.cc index 9d44fba..e82de664 100644 --- a/cc/base/math_util_unittest.cc +++ b/cc/base/math_util_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/math_util.h" +#include <stdint.h> + #include <cmath> #include "cc/test/geometry_test_utils.h"
diff --git a/cc/base/random_access_list_container.h b/cc/base/random_access_list_container.h index b2baf30..34eb699 100644 --- a/cc/base/random_access_list_container.h +++ b/cc/base/random_access_list_container.h
@@ -5,6 +5,8 @@ #ifndef CC_BASE_RANDOM_ACCESS_LIST_CONTAINER_H_ #define CC_BASE_RANDOM_ACCESS_LIST_CONTAINER_H_ +#include <stddef.h> + #include <vector> #include "base/logging.h"
diff --git a/cc/base/random_access_list_container_unittest.cc b/cc/base/random_access_list_container_unittest.cc index 78004b4..c02ca78 100644 --- a/cc/base/random_access_list_container_unittest.cc +++ b/cc/base/random_access_list_container_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/random_access_list_container.h" +#include <stddef.h> + #include <algorithm> #include <vector>
diff --git a/cc/base/region.cc b/cc/base/region.cc index 3030a17f..8332f9ad 100644 --- a/cc/base/region.cc +++ b/cc/base/region.cc
@@ -4,6 +4,8 @@ #include "cc/base/region.h" +#include <stddef.h> + #include "base/trace_event/trace_event_argument.h" #include "base/values.h" #include "cc/base/simple_enclosed_region.h"
diff --git a/cc/base/rolling_time_delta_history.cc b/cc/base/rolling_time_delta_history.cc index db04f58..e296c4b 100644 --- a/cc/base/rolling_time_delta_history.cc +++ b/cc/base/rolling_time_delta_history.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <cmath> #include "cc/base/rolling_time_delta_history.h"
diff --git a/cc/base/rolling_time_delta_history.h b/cc/base/rolling_time_delta_history.h index e51fb86..61ed339 100644 --- a/cc/base/rolling_time_delta_history.h +++ b/cc/base/rolling_time_delta_history.h
@@ -5,9 +5,12 @@ #ifndef CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_ #define CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_ +#include <stddef.h> + #include <deque> #include <set> +#include "base/macros.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/base/rtree.cc b/cc/base/rtree.cc index 9efc746..0b389f42 100644 --- a/cc/base/rtree.cc +++ b/cc/base/rtree.cc
@@ -4,6 +4,9 @@ #include "cc/base/rtree.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include "base/logging.h"
diff --git a/cc/base/rtree.h b/cc/base/rtree.h index b9bc0fbe..21cd920 100644 --- a/cc/base/rtree.h +++ b/cc/base/rtree.h
@@ -5,6 +5,9 @@ #ifndef CC_BASE_RTREE_H_ #define CC_BASE_RTREE_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <vector>
diff --git a/cc/base/rtree_unittest.cc b/cc/base/rtree_unittest.cc index 9f6a46b..8328883 100644 --- a/cc/base/rtree_unittest.cc +++ b/cc/base/rtree_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/rtree.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/base/simple_enclosed_region.cc b/cc/base/simple_enclosed_region.cc index e2683f3..50e905b 100644 --- a/cc/base/simple_enclosed_region.cc +++ b/cc/base/simple_enclosed_region.cc
@@ -4,14 +4,17 @@ #include "cc/base/simple_enclosed_region.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "cc/base/region.h" namespace cc { static bool RectIsLargerArea(const gfx::Rect& a, const gfx::Rect b) { - int64 a_area = static_cast<int64>(a.width()) * a.height(); - int64 b_area = static_cast<int64>(b.width()) * b.height(); + int64_t a_area = static_cast<int64_t>(a.width()) * a.height(); + int64_t b_area = static_cast<int64_t>(b.width()) * b.height(); return a_area > b_area; }
diff --git a/cc/base/simple_enclosed_region.h b/cc/base/simple_enclosed_region.h index 5e8a6b2..e7bb995 100644 --- a/cc/base/simple_enclosed_region.h +++ b/cc/base/simple_enclosed_region.h
@@ -5,6 +5,8 @@ #ifndef CC_BASE_SIMPLE_ENCLOSED_REGION_H_ #define CC_BASE_SIMPLE_ENCLOSED_REGION_H_ +#include <stddef.h> + #include <string> #include "cc/base/cc_export.h"
diff --git a/cc/base/simple_enclosed_region_unittest.cc b/cc/base/simple_enclosed_region_unittest.cc index 869da4e1..ca3ad619 100644 --- a/cc/base/simple_enclosed_region_unittest.cc +++ b/cc/base/simple_enclosed_region_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/simple_enclosed_region.h" +#include <stddef.h> + #include <algorithm> #include <vector>
diff --git a/cc/base/tiling_data.h b/cc/base/tiling_data.h index c95a672..3c3937d 100644 --- a/cc/base/tiling_data.h +++ b/cc/base/tiling_data.h
@@ -7,7 +7,6 @@ #include <utility> -#include "base/basictypes.h" #include "base/logging.h" #include "cc/base/cc_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/cc/base/tiling_data_unittest.cc b/cc/base/tiling_data_unittest.cc index 732b04db..004db11c 100644 --- a/cc/base/tiling_data_unittest.cc +++ b/cc/base/tiling_data_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/base/tiling_data.h" +#include <stddef.h> + #include <algorithm> #include <vector>
diff --git a/cc/base/time_util.h b/cc/base/time_util.h index 06682c2..d124f94 100644 --- a/cc/base/time_util.h +++ b/cc/base/time_util.h
@@ -14,7 +14,7 @@ class CC_EXPORT TimeUtil { public: static base::TimeDelta Scale(base::TimeDelta time_delta, double value) { - return base::TimeDelta::FromInternalValue(static_cast<int64>( + return base::TimeDelta::FromInternalValue(static_cast<int64_t>( static_cast<double>(time_delta.ToInternalValue()) * value)); }
diff --git a/cc/base/unique_notifier.h b/cc/base/unique_notifier.h index 3cbc22a..b54091a0 100644 --- a/cc/base/unique_notifier.h +++ b/cc/base/unique_notifier.h
@@ -6,6 +6,7 @@ #define CC_BASE_UNIQUE_NOTIFIER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/blink/scrollbar_impl.h b/cc/blink/scrollbar_impl.h index 61796974..5f11a1b 100644 --- a/cc/blink/scrollbar_impl.h +++ b/cc/blink/scrollbar_impl.h
@@ -5,7 +5,7 @@ #ifndef CC_BLINK_SCROLLBAR_IMPL_H_ #define CC_BLINK_SCROLLBAR_IMPL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/input/scrollbar.h" #include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h"
diff --git a/cc/blink/web_animation_impl.h b/cc/blink/web_animation_impl.h index c1bdb0e..92029be 100644 --- a/cc/blink/web_animation_impl.h +++ b/cc/blink/web_animation_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_ANIMATION_IMPL_H_ #define CC_BLINK_WEB_ANIMATION_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
diff --git a/cc/blink/web_compositor_animation_player_impl.h b/cc/blink/web_compositor_animation_player_impl.h index 1d4879b..0cc6975 100644 --- a/cc/blink/web_compositor_animation_player_impl.h +++ b/cc/blink/web_compositor_animation_player_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_COMPOSITOR_ANIMATION_PLAYER_IMPL_H_ #define CC_BLINK_WEB_COMPOSITOR_ANIMATION_PLAYER_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_compositor_animation_timeline_impl.h b/cc/blink/web_compositor_animation_timeline_impl.h index 624d29f..556c937 100644 --- a/cc/blink/web_compositor_animation_timeline_impl.h +++ b/cc/blink/web_compositor_animation_timeline_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_COMPOSITOR_ANIMATION_TIMELINE_IMPL_H_ #define CC_BLINK_WEB_COMPOSITOR_ANIMATION_TIMELINE_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_compositor_support_impl.h b/cc/blink/web_compositor_support_impl.h index 73880b2..d32d0e1 100644 --- a/cc/blink/web_compositor_support_impl.h +++ b/cc/blink/web_compositor_support_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_COMPOSITOR_SUPPORT_IMPL_H_ #define CC_BLINK_WEB_COMPOSITOR_SUPPORT_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc index 0eb381f3..6f7b66c 100644 --- a/cc/blink/web_content_layer_impl.cc +++ b/cc/blink/web_content_layer_impl.cc
@@ -4,6 +4,8 @@ #include "cc/blink/web_content_layer_impl.h" +#include <stddef.h> + #include "base/command_line.h" #include "cc/base/switches.h" #include "cc/blink/web_display_item_list_impl.h"
diff --git a/cc/blink/web_content_layer_impl.h b/cc/blink/web_content_layer_impl.h index 6a075ae..53fd83c 100644 --- a/cc/blink/web_content_layer_impl.h +++ b/cc/blink/web_content_layer_impl.h
@@ -5,6 +5,9 @@ #ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "cc/blink/web_layer_impl.h"
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc index f5d89b0..c46e8a0 100644 --- a/cc/blink/web_display_item_list_impl.cc +++ b/cc/blink/web_display_item_list_impl.cc
@@ -4,6 +4,9 @@ #include "cc/blink/web_display_item_list_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "cc/blink/web_filter_operations_impl.h"
diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h index 0c271f1..14278ef 100644 --- a/cc/blink/web_display_item_list_impl.h +++ b/cc/blink/web_display_item_list_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ #define CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/blink/cc_blink_export.h" #include "cc/playback/display_item_list.h"
diff --git a/cc/blink/web_external_bitmap_impl.cc b/cc/blink/web_external_bitmap_impl.cc index 23018960..ace8725 100644 --- a/cc/blink/web_external_bitmap_impl.cc +++ b/cc/blink/web_external_bitmap_impl.cc
@@ -4,6 +4,8 @@ #include "cc/blink/web_external_bitmap_impl.h" +#include <stdint.h> + #include "cc/resources/shared_bitmap.h" namespace cc_blink { @@ -36,7 +38,7 @@ return size_; } -uint8* WebExternalBitmapImpl::pixels() { +uint8_t* WebExternalBitmapImpl::pixels() { if (!shared_bitmap_) { // crbug.com/520417: not sure why a non-null WebExternalBitmap is // being passed to prepareMailbox when the shared_bitmap_ is null.
diff --git a/cc/blink/web_external_bitmap_impl.h b/cc/blink/web_external_bitmap_impl.h index 6cada7d..20e27df 100644 --- a/cc/blink/web_external_bitmap_impl.h +++ b/cc/blink/web_external_bitmap_impl.h
@@ -5,7 +5,10 @@ #ifndef CC_BLINK_WEB_EXTERNAL_BITMAP_IMPL_H_ #define CC_BLINK_WEB_EXTERNAL_BITMAP_IMPL_H_ +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebExternalBitmap.h" @@ -31,7 +34,7 @@ // blink::WebExternalBitmap implementation. blink::WebSize size() override; void setSize(blink::WebSize size) override; - uint8* pixels() override; + uint8_t* pixels() override; cc::SharedBitmap* shared_bitmap() { return shared_bitmap_.get(); }
diff --git a/cc/blink/web_external_texture_layer_impl.h b/cc/blink/web_external_texture_layer_impl.h index 8438a89..d48af64 100644 --- a/cc/blink/web_external_texture_layer_impl.h +++ b/cc/blink/web_external_texture_layer_impl.h
@@ -6,6 +6,7 @@ #define CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_ #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_filter_animation_curve_impl.h b/cc/blink/web_filter_animation_curve_impl.h index e922ccb..9d6ea40 100644 --- a/cc/blink/web_filter_animation_curve_impl.h +++ b/cc/blink/web_filter_animation_curve_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_FILTER_ANIMATION_CURVE_IMPL_H_ #define CC_BLINK_WEB_FILTER_ANIMATION_CURVE_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebFilterAnimationCurve.h"
diff --git a/cc/blink/web_filter_operations_impl.cc b/cc/blink/web_filter_operations_impl.cc index e896c6a..d657d11 100644 --- a/cc/blink/web_filter_operations_impl.cc +++ b/cc/blink/web_filter_operations_impl.cc
@@ -4,7 +4,6 @@ #include "cc/blink/web_filter_operations_impl.h" -#include "base/basictypes.h" #include "skia/ext/refptr.h" #include "third_party/WebKit/public/platform/WebColor.h" #include "third_party/WebKit/public/platform/WebPoint.h"
diff --git a/cc/blink/web_filter_operations_impl.h b/cc/blink/web_filter_operations_impl.h index d1746ce..b2a9e6a 100644 --- a/cc/blink/web_filter_operations_impl.h +++ b/cc/blink/web_filter_operations_impl.h
@@ -5,8 +5,9 @@ #ifndef CC_BLINK_WEB_FILTER_OPERATIONS_IMPL_H_ #define CC_BLINK_WEB_FILTER_OPERATIONS_IMPL_H_ -#include "cc/output/filter_operations.h" +#include "base/macros.h" #include "cc/blink/cc_blink_export.h" +#include "cc/output/filter_operations.h" #include "third_party/WebKit/public/platform/WebFilterOperations.h" namespace cc_blink {
diff --git a/cc/blink/web_float_animation_curve_impl.h b/cc/blink/web_float_animation_curve_impl.h index 42bab59f..a47b1e1 100644 --- a/cc/blink/web_float_animation_curve_impl.h +++ b/cc/blink/web_float_animation_curve_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ #define CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebFloatAnimationCurve.h"
diff --git a/cc/blink/web_image_layer_impl.h b/cc/blink/web_image_layer_impl.h index 74a8e76..d2775fb 100644 --- a/cc/blink/web_image_layer_impl.h +++ b/cc/blink/web_image_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_IMAGE_LAYER_IMPL_H_ #define CC_BLINK_WEB_IMAGE_LAYER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebImageLayer.h"
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index cdf3160..ddae256 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/blink/web_layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include <vector>
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index e6429156..a1b762b 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h
@@ -5,9 +5,13 @@ #ifndef CC_BLINK_WEB_LAYER_IMPL_H_ #define CC_BLINK_WEB_LAYER_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <utility> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h"
diff --git a/cc/blink/web_layer_impl_fixed_bounds.h b/cc/blink/web_layer_impl_fixed_bounds.h index 3289245..614ccd3 100644 --- a/cc/blink/web_layer_impl_fixed_bounds.h +++ b/cc/blink/web_layer_impl_fixed_bounds.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ #define CC_BLINK_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ +#include "base/macros.h" #include "cc/blink/web_layer_impl.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h"
diff --git a/cc/blink/web_scroll_offset_animation_curve_impl.h b/cc/blink/web_scroll_offset_animation_curve_impl.h index 3a218532..82e77ac 100644 --- a/cc/blink/web_scroll_offset_animation_curve_impl.h +++ b/cc/blink/web_scroll_offset_animation_curve_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_ #define CC_BLINK_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebScrollOffsetAnimationCurve.h"
diff --git a/cc/blink/web_scrollbar_layer_impl.h b/cc/blink/web_scrollbar_layer_impl.h index 734e069..f9cd68c 100644 --- a/cc/blink/web_scrollbar_layer_impl.h +++ b/cc/blink/web_scrollbar_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_SCROLLBAR_LAYER_IMPL_H_ #define CC_BLINK_WEB_SCROLLBAR_LAYER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebScrollbar.h"
diff --git a/cc/blink/web_to_cc_animation_delegate_adapter.h b/cc/blink/web_to_cc_animation_delegate_adapter.h index 4d52cb4..72e79e6 100644 --- a/cc/blink/web_to_cc_animation_delegate_adapter.h +++ b/cc/blink/web_to_cc_animation_delegate_adapter.h
@@ -5,8 +5,8 @@ #ifndef CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_ #define CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "cc/animation/animation_delegate.h" namespace blink {
diff --git a/cc/blink/web_transform_animation_curve_impl.h b/cc/blink/web_transform_animation_curve_impl.h index 9143d3c..b6f1cabc 100644 --- a/cc/blink/web_transform_animation_curve_impl.h +++ b/cc/blink/web_transform_animation_curve_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_TRANSFORM_ANIMATION_CURVE_IMPL_H_ #define CC_BLINK_WEB_TRANSFORM_ANIMATION_CURVE_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/blink/cc_blink_export.h" #include "third_party/WebKit/public/platform/WebTransformAnimationCurve.h"
diff --git a/cc/blink/web_transform_operations_impl.h b/cc/blink/web_transform_operations_impl.h index f8fe22b..c13a72b 100644 --- a/cc/blink/web_transform_operations_impl.h +++ b/cc/blink/web_transform_operations_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_BLINK_WEB_TRANSFORM_OPERATIONS_IMPL_H_ #define CC_BLINK_WEB_TRANSFORM_OPERATIONS_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/animation/transform_operations.h" #include "cc/blink/cc_blink_export.h"
diff --git a/cc/debug/benchmark_instrumentation.h b/cc/debug/benchmark_instrumentation.h index 99cfa21f..af70156e 100644 --- a/cc/debug/benchmark_instrumentation.h +++ b/cc/debug/benchmark_instrumentation.h
@@ -5,6 +5,7 @@ #ifndef CC_DEBUG_BENCHMARK_INSTRUMENTATION_H_ #define CC_DEBUG_BENCHMARK_INSTRUMENTATION_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/debug/rendering_stats.h"
diff --git a/cc/debug/debug_colors.h b/cc/debug/debug_colors.h index 1efabde8..673f199 100644 --- a/cc/debug/debug_colors.h +++ b/cc/debug/debug_colors.h
@@ -5,7 +5,7 @@ #ifndef CC_DEBUG_DEBUG_COLORS_H_ #define CC_DEBUG_DEBUG_COLORS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" namespace cc {
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc index 10faaca..5ac2b5d 100644 --- a/cc/debug/debug_rect_history.cc +++ b/cc/debug/debug_rect_history.cc
@@ -4,6 +4,8 @@ #include "cc/debug/debug_rect_history.h" +#include <stddef.h> + #include "cc/base/math_util.h" #include "cc/layers/layer_impl.h" #include "cc/layers/layer_iterator.h"
diff --git a/cc/debug/debug_rect_history.h b/cc/debug/debug_rect_history.h index 6bcf438..bea34670f 100644 --- a/cc/debug/debug_rect_history.h +++ b/cc/debug/debug_rect_history.h
@@ -6,7 +6,7 @@ #define CC_DEBUG_DEBUG_RECT_HISTORY_H_ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/layers/layer_lists.h" #include "ui/gfx/geometry/rect.h"
diff --git a/cc/debug/devtools_instrumentation.h b/cc/debug/devtools_instrumentation.h index 3a28579..f6eacdc 100644 --- a/cc/debug/devtools_instrumentation.h +++ b/cc/debug/devtools_instrumentation.h
@@ -5,6 +5,9 @@ #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h" @@ -55,7 +58,7 @@ explicit ScopedImageDecodeTask(const void* imagePtr) { TRACE_EVENT_BEGIN1(internal::kCategory, internal::kImageDecodeTask, internal::kPixelRefId, - reinterpret_cast<uint64>(imagePtr)); + reinterpret_cast<uint64_t>(imagePtr)); } ~ScopedImageDecodeTask() { TRACE_EVENT_END0(internal::kCategory, internal::kImageDecodeTask);
diff --git a/cc/debug/frame_rate_counter.cc b/cc/debug/frame_rate_counter.cc index c43270dc..a6b4a4451 100644 --- a/cc/debug/frame_rate_counter.cc +++ b/cc/debug/frame_rate_counter.cc
@@ -4,6 +4,8 @@ #include "cc/debug/frame_rate_counter.h" +#include <stddef.h> + #include <algorithm> #include <limits>
diff --git a/cc/debug/frame_rate_counter.h b/cc/debug/frame_rate_counter.h index c50d7e2..ad91598a 100644 --- a/cc/debug/frame_rate_counter.h +++ b/cc/debug/frame_rate_counter.h
@@ -5,7 +5,9 @@ #ifndef CC_DEBUG_FRAME_RATE_COUNTER_H_ #define CC_DEBUG_FRAME_RATE_COUNTER_H_ -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/debug/ring_buffer.h"
diff --git a/cc/debug/frame_timing_request.cc b/cc/debug/frame_timing_request.cc index 6c54ea28..211d57d 100644 --- a/cc/debug/frame_timing_request.cc +++ b/cc/debug/frame_timing_request.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "cc/debug/frame_timing_request.h" namespace cc {
diff --git a/cc/debug/frame_timing_request.h b/cc/debug/frame_timing_request.h index aedd720..6b2b57c5 100644 --- a/cc/debug/frame_timing_request.h +++ b/cc/debug/frame_timing_request.h
@@ -5,6 +5,8 @@ #ifndef CC_DEBUG_FRAME_TIMING_REQUEST_H_ #define CC_DEBUG_FRAME_TIMING_REQUEST_H_ +#include <stdint.h> + #include "cc/base/cc_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/cc/debug/frame_timing_tracker.cc b/cc/debug/frame_timing_tracker.cc index e1e7258d..dda2e311 100644 --- a/cc/debug/frame_timing_tracker.cc +++ b/cc/debug/frame_timing_tracker.cc
@@ -4,6 +4,8 @@ #include "cc/debug/frame_timing_tracker.h" +#include <stdint.h> + #include <algorithm> #include <limits>
diff --git a/cc/debug/frame_timing_tracker.h b/cc/debug/frame_timing_tracker.h index 7b638d7..5341b6ad 100644 --- a/cc/debug/frame_timing_tracker.h +++ b/cc/debug/frame_timing_tracker.h
@@ -5,11 +5,13 @@ #ifndef CC_DEBUG_FRAME_TIMING_TRACKER_H_ #define CC_DEBUG_FRAME_TIMING_TRACKER_H_ +#include <stdint.h> + #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/debug/frame_timing_tracker_unittest.cc b/cc/debug/frame_timing_tracker_unittest.cc index 73834977..141e9b7 100644 --- a/cc/debug/frame_timing_tracker_unittest.cc +++ b/cc/debug/frame_timing_tracker_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <set> #include <string>
diff --git a/cc/debug/frame_viewer_instrumentation.h b/cc/debug/frame_viewer_instrumentation.h index 773e8c5..119e523 100644 --- a/cc/debug/frame_viewer_instrumentation.h +++ b/cc/debug/frame_viewer_instrumentation.h
@@ -5,6 +5,7 @@ #ifndef CC_DEBUG_FRAME_VIEWER_INSTRUMENTATION_H_ #define CC_DEBUG_FRAME_VIEWER_INSTRUMENTATION_H_ +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "cc/tiles/tile.h" #include "cc/tiles/tile_priority.h"
diff --git a/cc/debug/invalidation_benchmark.cc b/cc/debug/invalidation_benchmark.cc index 8a9fc88..0cd68cb 100644 --- a/cc/debug/invalidation_benchmark.cc +++ b/cc/debug/invalidation_benchmark.cc
@@ -4,10 +4,11 @@ #include "cc/debug/invalidation_benchmark.h" +#include <stdint.h> + #include <algorithm> #include <limits> -#include "base/basictypes.h" #include "base/rand_util.h" #include "base/values.h" #include "cc/layers/layer.h" @@ -126,10 +127,10 @@ // high quality, but they need to be identical in each run. Therefore, we use a // LCG and keep the state locally in the benchmark. float InvalidationBenchmark::LCGRandom() { - const uint32 a = 1664525; - const uint32 c = 1013904223; + const uint32_t a = 1664525; + const uint32_t c = 1013904223; seed_ = a * seed_ + c; - return static_cast<float>(seed_) / std::numeric_limits<uint32>::max(); + return static_cast<float>(seed_) / std::numeric_limits<uint32_t>::max(); } } // namespace cc
diff --git a/cc/debug/invalidation_benchmark.h b/cc/debug/invalidation_benchmark.h index 9423d5d8..9cd2643 100644 --- a/cc/debug/invalidation_benchmark.h +++ b/cc/debug/invalidation_benchmark.h
@@ -5,6 +5,8 @@ #ifndef CC_DEBUG_INVALIDATION_BENCHMARK_H_ #define CC_DEBUG_INVALIDATION_BENCHMARK_H_ +#include <stdint.h> + #include <string> #include "cc/debug/micro_benchmark_controller.h" @@ -36,7 +38,7 @@ Mode mode_; int width_; int height_; - uint32 seed_; + uint32_t seed_; }; } // namespace cc
diff --git a/cc/debug/lap_timer.h b/cc/debug/lap_timer.h index 48f9917..bd1ba4f 100644 --- a/cc/debug/lap_timer.h +++ b/cc/debug/lap_timer.h
@@ -5,6 +5,7 @@ #ifndef CC_DEBUG_LAP_TIMER_H_ #define CC_DEBUG_LAP_TIMER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h index d2f13d4..3b5ba3af 100644 --- a/cc/debug/layer_tree_debug_state.h +++ b/cc/debug/layer_tree_debug_state.h
@@ -5,7 +5,6 @@ #ifndef CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_ #define CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_ -#include "base/basictypes.h" #include "cc/base/cc_export.h" namespace cc {
diff --git a/cc/debug/micro_benchmark_controller.h b/cc/debug/micro_benchmark_controller.h index 8f1cdfc..95000cb 100644 --- a/cc/debug/micro_benchmark_controller.h +++ b/cc/debug/micro_benchmark_controller.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "cc/debug/micro_benchmark.h" namespace base {
diff --git a/cc/debug/micro_benchmark_controller_impl.h b/cc/debug/micro_benchmark_controller_impl.h index 6fdf043..bcb4aa0 100644 --- a/cc/debug/micro_benchmark_controller_impl.h +++ b/cc/debug/micro_benchmark_controller_impl.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/debug/micro_benchmark_impl.h" namespace cc {
diff --git a/cc/debug/picture_debug_util.cc b/cc/debug/picture_debug_util.cc index 5494d99..b1879afb 100644 --- a/cc/debug/picture_debug_util.cc +++ b/cc/debug/picture_debug_util.cc
@@ -4,6 +4,8 @@ #include "cc/debug/picture_debug_util.h" +#include <stddef.h> + #include <vector> #include "base/base64.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc index 41cd9cc1..8e75017 100644 --- a/cc/debug/rasterize_and_record_benchmark.cc +++ b/cc/debug/rasterize_and_record_benchmark.cc
@@ -4,11 +4,12 @@ #include "cc/debug/rasterize_and_record_benchmark.h" +#include <stddef.h> + #include <algorithm> #include <limits> #include <string> -#include "base/basictypes.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "cc/debug/lap_timer.h"
diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h index d96f087..76278ac 100644 --- a/cc/debug/rasterize_and_record_benchmark.h +++ b/cc/debug/rasterize_and_record_benchmark.h
@@ -5,6 +5,8 @@ #ifndef CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_ #define CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_ +#include <stddef.h> + #include <map> #include <utility> #include <vector>
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc index 2d649cc1..de681700 100644 --- a/cc/debug/rasterize_and_record_benchmark_impl.cc +++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
@@ -4,10 +4,11 @@ #include "cc/debug/rasterize_and_record_benchmark_impl.h" +#include <stddef.h> + #include <algorithm> #include <limits> -#include "base/basictypes.h" #include "base/values.h" #include "cc/debug/lap_timer.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.h b/cc/debug/rasterize_and_record_benchmark_impl.h index 99b22f1..bb4d9a09 100644 --- a/cc/debug/rasterize_and_record_benchmark_impl.h +++ b/cc/debug/rasterize_and_record_benchmark_impl.h
@@ -5,6 +5,8 @@ #ifndef CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_IMPL_H_ #define CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_IMPL_H_ +#include <stddef.h> + #include <map> #include <utility> #include <vector>
diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h index fbe0d63..f296447 100644 --- a/cc/debug/rendering_stats.h +++ b/cc/debug/rendering_stats.h
@@ -5,9 +5,10 @@ #ifndef CC_DEBUG_RENDERING_STATS_H_ #define CC_DEBUG_RENDERING_STATS_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/time/time.h" #include "base/trace_event/trace_event_argument.h" #include "base/values.h" @@ -41,12 +42,12 @@ // Note: when adding new members, please remember to update Add in // rendering_stats.cc. - int64 frame_count; - int64 visible_content_area; - int64 approximated_visible_content_area; - int64 checkerboarded_visible_content_area; - int64 checkerboarded_no_recording_content_area; - int64 checkerboarded_needs_raster_content_area; + int64_t frame_count; + int64_t visible_content_area; + int64_t approximated_visible_content_area; + int64_t checkerboarded_visible_content_area; + int64_t checkerboarded_no_recording_content_area; + int64_t checkerboarded_needs_raster_content_area; TimeDeltaList draw_duration; TimeDeltaList draw_duration_estimate;
diff --git a/cc/debug/rendering_stats_instrumentation.cc b/cc/debug/rendering_stats_instrumentation.cc index 94768c65..de7057e7 100644 --- a/cc/debug/rendering_stats_instrumentation.cc +++ b/cc/debug/rendering_stats_instrumentation.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "cc/debug/rendering_stats_instrumentation.h" namespace cc { @@ -37,7 +39,7 @@ impl_thread_rendering_stats_ = RenderingStats(); } -void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) { +void RenderingStatsInstrumentation::IncrementFrameCount(int64_t count) { if (!record_rendering_stats_) return; @@ -45,7 +47,7 @@ impl_thread_rendering_stats_.frame_count += count; } -void RenderingStatsInstrumentation::AddVisibleContentArea(int64 area) { +void RenderingStatsInstrumentation::AddVisibleContentArea(int64_t area) { if (!record_rendering_stats_) return; @@ -54,7 +56,7 @@ } void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -63,7 +65,7 @@ } void RenderingStatsInstrumentation::AddCheckerboardedVisibleContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -72,7 +74,7 @@ } void RenderingStatsInstrumentation::AddCheckerboardedNoRecordingContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -81,7 +83,7 @@ } void RenderingStatsInstrumentation::AddCheckerboardedNeedsRasterContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return;
diff --git a/cc/debug/rendering_stats_instrumentation.h b/cc/debug/rendering_stats_instrumentation.h index 834e10c..9197fb6 100644 --- a/cc/debug/rendering_stats_instrumentation.h +++ b/cc/debug/rendering_stats_instrumentation.h
@@ -5,6 +5,9 @@ #ifndef CC_DEBUG_RENDERING_STATS_INSTRUMENTATION_H_ #define CC_DEBUG_RENDERING_STATS_INSTRUMENTATION_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "cc/debug/rendering_stats.h" @@ -37,12 +40,12 @@ record_rendering_stats_ = record_rendering_stats; } - void IncrementFrameCount(int64 count); - void AddVisibleContentArea(int64 area); - void AddApproximatedVisibleContentArea(int64 area); - void AddCheckerboardedVisibleContentArea(int64 area); - void AddCheckerboardedNoRecordingContentArea(int64 area); - void AddCheckerboardedNeedsRasterContentArea(int64 area); + void IncrementFrameCount(int64_t count); + void AddVisibleContentArea(int64_t area); + void AddApproximatedVisibleContentArea(int64_t area); + void AddCheckerboardedVisibleContentArea(int64_t area); + void AddCheckerboardedNoRecordingContentArea(int64_t area); + void AddCheckerboardedNeedsRasterContentArea(int64_t area); void AddDrawDuration(base::TimeDelta draw_duration, base::TimeDelta draw_duration_estimate); void AddBeginMainFrameToCommitDuration(
diff --git a/cc/debug/ring_buffer.h b/cc/debug/ring_buffer.h index f9a6749..5f7d49a 100644 --- a/cc/debug/ring_buffer.h +++ b/cc/debug/ring_buffer.h
@@ -5,7 +5,10 @@ #ifndef CC_DEBUG_RING_BUFFER_H_ #define CC_DEBUG_RING_BUFFER_H_ +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" namespace cc {
diff --git a/cc/debug/traced_display_item_list.h b/cc/debug/traced_display_item_list.h index f7caa04..6b422435 100644 --- a/cc/debug/traced_display_item_list.h +++ b/cc/debug/traced_display_item_list.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/trace_event/trace_event.h" #include "cc/debug/traced_value.h"
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index 7b09cc16..2d49543 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h
@@ -5,7 +5,7 @@ #ifndef CC_INPUT_INPUT_HANDLER_H_ #define CC_INPUT_INPUT_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/input/page_scale_animation.h b/cc/input/page_scale_animation.h index d73116c..dbe018b 100644 --- a/cc/input/page_scale_animation.h +++ b/cc/input/page_scale_animation.h
@@ -5,7 +5,7 @@ #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_ #define CC_INPUT_PAGE_SCALE_ANIMATION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc index 5fe1267..6547f20 100644 --- a/cc/input/top_controls_manager.cc +++ b/cc/input/top_controls_manager.cc
@@ -4,6 +4,8 @@ #include "cc/input/top_controls_manager.h" +#include <stdint.h> + #include <algorithm> #include "base/logging.h" @@ -19,7 +21,7 @@ namespace { // These constants were chosen empirically for their visually pleasant behavior. // Contact tedchoc@chromium.org for questions about changing these values. -const int64 kShowHideMaxDurationMs = 200; +const int64_t kShowHideMaxDurationMs = 200; } // static
diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h index fc40378..8cd7c29 100644 --- a/cc/input/top_controls_manager.h +++ b/cc/input/top_controls_manager.h
@@ -5,6 +5,7 @@ #ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_ #define CC_INPUT_TOP_CONTROLS_MANAGER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "cc/input/top_controls_state.h"
diff --git a/cc/layers/append_quads_data.h b/cc/layers/append_quads_data.h index 3d05109c..f4e82bc 100644 --- a/cc/layers/append_quads_data.h +++ b/cc/layers/append_quads_data.h
@@ -5,7 +5,8 @@ #ifndef CC_LAYERS_APPEND_QUADS_DATA_H_ #define CC_LAYERS_APPEND_QUADS_DATA_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "cc/quads/render_pass_id.h" namespace cc { @@ -21,19 +22,19 @@ checkerboarded_needs_raster_content_area(0) {} // Set by the layer appending quads. - int64 num_incomplete_tiles; + int64_t num_incomplete_tiles; // Set by the layer appending quads. - int64 num_missing_tiles; + int64_t num_missing_tiles; // Set by the layer appending quads. - int64 visible_layer_area; + int64_t visible_layer_area; // Set by the layer appending quads. - int64 approximated_visible_content_area; + int64_t approximated_visible_content_area; // Set by the layer appending quads. This is total of the following two areas. - int64 checkerboarded_visible_content_area; + int64_t checkerboarded_visible_content_area; // Set by the layer appending quads. This is the area outside interest rect. - int64 checkerboarded_no_recording_content_area; + int64_t checkerboarded_no_recording_content_area; // Set by the layer appending quads. This is the area within interest rect. - int64 checkerboarded_needs_raster_content_area; + int64_t checkerboarded_needs_raster_content_area; }; } // namespace cc
diff --git a/cc/layers/content_layer_client.h b/cc/layers/content_layer_client.h index 6c9983b2..24c37ae 100644 --- a/cc/layers/content_layer_client.h +++ b/cc/layers/content_layer_client.h
@@ -5,6 +5,8 @@ #ifndef CC_LAYERS_CONTENT_LAYER_CLIENT_H_ #define CC_LAYERS_CONTENT_LAYER_CLIENT_H_ +#include <stddef.h> + #include "cc/base/cc_export.h" #include "cc/playback/display_item_list.h"
diff --git a/cc/layers/delegated_frame_provider.cc b/cc/layers/delegated_frame_provider.cc index 06b041f..4923485 100644 --- a/cc/layers/delegated_frame_provider.cc +++ b/cc/layers/delegated_frame_provider.cc
@@ -4,6 +4,8 @@ #include "cc/layers/delegated_frame_provider.h" +#include <stddef.h> + #include "cc/layers/delegated_frame_resource_collection.h" #include "cc/layers/delegated_renderer_layer.h" #include "cc/output/delegated_frame_data.h"
diff --git a/cc/layers/delegated_frame_provider.h b/cc/layers/delegated_frame_provider.h index f3f9373..7757d0c 100644 --- a/cc/layers/delegated_frame_provider.h +++ b/cc/layers/delegated_frame_provider.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/layers/delegated_frame_resource_collection.cc b/cc/layers/delegated_frame_resource_collection.cc index a1bc759..c567b822 100644 --- a/cc/layers/delegated_frame_resource_collection.cc +++ b/cc/layers/delegated_frame_resource_collection.cc
@@ -4,6 +4,8 @@ #include "cc/layers/delegated_frame_resource_collection.h" +#include <stddef.h> + #include "base/bind.h" #include "cc/trees/blocking_task_runner.h"
diff --git a/cc/layers/delegated_frame_resource_collection.h b/cc/layers/delegated_frame_resource_collection.h index afbc355..0e38c68 100644 --- a/cc/layers/delegated_frame_resource_collection.h +++ b/cc/layers/delegated_frame_resource_collection.h
@@ -6,6 +6,7 @@ #define CC_LAYERS_DELEGATED_FRAME_RESOURCE_COLLECTION_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h index 8845258..b71b6ee 100644 --- a/cc/layers/delegated_renderer_layer.h +++ b/cc/layers/delegated_renderer_layer.h
@@ -6,6 +6,7 @@ #define CC_LAYERS_DELEGATED_RENDERER_LAYER_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc index 000a7ea..5d511168 100644 --- a/cc/layers/delegated_renderer_layer_impl.cc +++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/layers/delegated_renderer_layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <utility>
diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h index 5c9b46a..0ca13eb 100644 --- a/cc/layers/delegated_renderer_layer_impl.h +++ b/cc/layers/delegated_renderer_layer_impl.h
@@ -5,7 +5,10 @@ #ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ +#include <stddef.h> + #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc index 725fb79a..b94dedf9 100644 --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/delegated_renderer_layer_impl.h" +#include <stddef.h> + #include "cc/layers/solid_color_layer_impl.h" #include "cc/quads/render_pass_draw_quad.h" #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/layers/draw_properties.h b/cc/layers/draw_properties.h index bcab9103..0c7e479 100644 --- a/cc/layers/draw_properties.h +++ b/cc/layers/draw_properties.h
@@ -5,6 +5,8 @@ #ifndef CC_LAYERS_DRAW_PROPERTIES_H_ #define CC_LAYERS_DRAW_PROPERTIES_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/trees/occlusion.h" #include "third_party/skia/include/core/SkXfermode.h"
diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h index 0760353..5ffa31aa 100644 --- a/cc/layers/heads_up_display_layer.h +++ b/cc/layers/heads_up_display_layer.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc index 4d65a817..dd13298 100644 --- a/cc/layers/heads_up_display_layer_impl.cc +++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/layers/heads_up_display_layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <vector>
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h index e5880c4..07e4bed 100644 --- a/cc/layers/heads_up_display_layer_impl.h +++ b/cc/layers/heads_up_display_layer_impl.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/layers/heads_up_display_layer_impl_unittest.cc b/cc/layers/heads_up_display_layer_impl_unittest.cc index 77cfe55..e104c33d 100644 --- a/cc/layers/heads_up_display_layer_impl_unittest.cc +++ b/cc/layers/heads_up_display_layer_impl_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/layers/append_quads_data.h" #include "cc/layers/heads_up_display_layer_impl.h" #include "cc/test/fake_impl_task_runner_provider.h"
diff --git a/cc/layers/io_surface_layer.cc b/cc/layers/io_surface_layer.cc index c2e35304..7fb3f3f1 100644 --- a/cc/layers/io_surface_layer.cc +++ b/cc/layers/io_surface_layer.cc
@@ -4,6 +4,8 @@ #include "cc/layers/io_surface_layer.h" +#include <stdint.h> + #include "cc/layers/io_surface_layer_impl.h" namespace cc {
diff --git a/cc/layers/io_surface_layer.h b/cc/layers/io_surface_layer.h index 14eabd9..a88492f 100644 --- a/cc/layers/io_surface_layer.h +++ b/cc/layers/io_surface_layer.h
@@ -5,6 +5,9 @@ #ifndef CC_LAYERS_IO_SURFACE_LAYER_H_ #define CC_LAYERS_IO_SURFACE_LAYER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h index 8317760..29e9973 100644 --- a/cc/layers/io_surface_layer_impl.h +++ b/cc/layers/io_surface_layer_impl.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "ui/gfx/geometry/size.h"
diff --git a/cc/layers/io_surface_layer_impl_unittest.cc b/cc/layers/io_surface_layer_impl_unittest.cc index 75c2cf77..ff3e79e 100644 --- a/cc/layers/io_surface_layer_impl_unittest.cc +++ b/cc/layers/io_surface_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/io_surface_layer_impl.h" +#include <stddef.h> + #include "cc/test/layer_test_common.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 526b5dd2..c085f16 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc
@@ -4,6 +4,9 @@ #include "cc/layers/layer.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/atomic_sequence_num.h"
diff --git a/cc/layers/layer.h b/cc/layers/layer.h index c5c031c..6c9036c2 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h
@@ -5,11 +5,15 @@ #ifndef CC_LAYERS_LAYER_H_ #define CC_LAYERS_LAYER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "cc/animation/layer_animation_controller.h"
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 74927e8..3837bca 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/layers/layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/json/json_reader.h"
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h index 8d83a0e..42362c8 100644 --- a/cc/layers/layer_impl.h +++ b/cc/layers/layer_impl.h
@@ -5,12 +5,16 @@ #ifndef CC_LAYERS_LAYER_IMPL_H_ #define CC_LAYERS_LAYER_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "cc/animation/animation_delegate.h"
diff --git a/cc/layers/layer_iterator.h b/cc/layers/layer_iterator.h index 2c129e4..cf01ca1 100644 --- a/cc/layers/layer_iterator.h +++ b/cc/layers/layer_iterator.h
@@ -5,6 +5,8 @@ #ifndef CC_LAYERS_LAYER_ITERATOR_H_ #define CC_LAYERS_LAYER_ITERATOR_H_ +#include <stddef.h> + #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc index 789152ae..a9caa02 100644 --- a/cc/layers/layer_unittest.cc +++ b/cc/layers/layer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/layer.h" +#include <stddef.h> + #include "base/thread_task_runner_handle.h" #include "cc/animation/keyframed_animation_curve.h" #include "cc/animation/mutable_properties.h"
diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h index 714a407..ff766634 100644 --- a/cc/layers/nine_patch_layer.h +++ b/cc/layers/nine_patch_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_NINE_PATCH_LAYER_H_ #define CC_LAYERS_NINE_PATCH_LAYER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h index 948758a..28721b3 100644 --- a/cc/layers/nine_patch_layer_impl.h +++ b/cc/layers/nine_patch_layer_impl.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/layers/ui_resource_layer_impl.h"
diff --git a/cc/layers/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc index e4c779a1..96778724 100644 --- a/cc/layers/nine_patch_layer_impl_unittest.cc +++ b/cc/layers/nine_patch_layer_impl_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/containers/hash_tables.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/nine_patch_layer_impl.h"
diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc index 0d25dbcc..13826e7 100644 --- a/cc/layers/painted_scrollbar_layer.cc +++ b/cc/layers/painted_scrollbar_layer.cc
@@ -7,7 +7,6 @@ #include <algorithm> #include "base/auto_reset.h" -#include "base/basictypes.h" #include "base/trace_event/trace_event.h" #include "cc/base/math_util.h" #include "cc/layers/painted_scrollbar_layer_impl.h"
diff --git a/cc/layers/painted_scrollbar_layer.h b/cc/layers/painted_scrollbar_layer.h index 8f016018..27dc2c3 100644 --- a/cc/layers/painted_scrollbar_layer.h +++ b/cc/layers/painted_scrollbar_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/input/scrollbar.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/painted_scrollbar_layer_impl.h b/cc/layers/painted_scrollbar_layer_impl.h index 190526f..8ea06ab5 100644 --- a/cc/layers/painted_scrollbar_layer_impl.h +++ b/cc/layers/painted_scrollbar_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_IMPL_H_ #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_IMPL_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/input/scrollbar.h" #include "cc/layers/scrollbar_layer_impl_base.h"
diff --git a/cc/layers/painted_scrollbar_layer_impl_unittest.cc b/cc/layers/painted_scrollbar_layer_impl_unittest.cc index 3edc450a..4bc3f06 100644 --- a/cc/layers/painted_scrollbar_layer_impl_unittest.cc +++ b/cc/layers/painted_scrollbar_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/painted_scrollbar_layer_impl.h" +#include <stddef.h> + #include "cc/quads/draw_quad.h" #include "cc/quads/texture_draw_quad.h" #include "cc/test/layer_test_common.h"
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc index 0ca203e..b5a55c2 100644 --- a/cc/layers/picture_image_layer.cc +++ b/cc/layers/picture_image_layer.cc
@@ -4,6 +4,8 @@ #include "cc/layers/picture_image_layer.h" +#include <stddef.h> + #include "cc/layers/picture_image_layer_impl.h" #include "cc/playback/display_item_list_settings.h" #include "cc/playback/drawing_display_item.h"
diff --git a/cc/layers/picture_image_layer.h b/cc/layers/picture_image_layer.h index 146ce83..fd3c1a22 100644 --- a/cc/layers/picture_image_layer.h +++ b/cc/layers/picture_image_layer.h
@@ -5,6 +5,9 @@ #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_H_ #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/picture_layer.h"
diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h index f478951..759606a 100644 --- a/cc/layers/picture_image_layer_impl.h +++ b/cc/layers/picture_image_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_ #define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_ +#include "base/macros.h" #include "cc/layers/picture_layer_impl.h" namespace cc {
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h index 7eb87f0..7f1345e 100644 --- a/cc/layers/picture_layer.h +++ b/cc/layers/picture_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_PICTURE_LAYER_H_ #define CC_LAYERS_PICTURE_LAYER_H_ +#include "base/macros.h" #include "cc/base/invalidation_region.h" #include "cc/debug/devtools_instrumentation.h" #include "cc/debug/micro_benchmark_controller.h"
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 8d2efe0c..b3590d4 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/layers/picture_layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cmath> #include <limits> @@ -347,7 +350,7 @@ append_quads_data->num_missing_tiles++; ++missing_tile_count; } - int64 checkerboarded_area = + int64_t checkerboarded_area = visible_geometry_rect.width() * visible_geometry_rect.height(); append_quads_data->checkerboarded_visible_content_area += checkerboarded_area; @@ -357,7 +360,7 @@ // subtraction. gfx::Rect visible_rect_has_recording = visible_geometry_rect; visible_rect_has_recording.Intersect(scaled_recorded_viewport); - int64 checkerboarded_has_recording_area = + int64_t checkerboarded_has_recording_area = visible_rect_has_recording.width() * visible_rect_has_recording.height(); append_quads_data->checkerboarded_needs_raster_content_area += @@ -977,22 +980,24 @@ if (maximum_scale) { gfx::Size bounds_at_maximum_scale = gfx::ScaleToCeiledSize(raster_source_->GetSize(), maximum_scale); - int64 maximum_area = static_cast<int64>(bounds_at_maximum_scale.width()) * - static_cast<int64>(bounds_at_maximum_scale.height()); + int64_t maximum_area = + static_cast<int64_t>(bounds_at_maximum_scale.width()) * + static_cast<int64_t>(bounds_at_maximum_scale.height()); gfx::Size viewport = layer_tree_impl()->device_viewport_size(); - int64 viewport_area = static_cast<int64>(viewport.width()) * - static_cast<int64>(viewport.height()); + int64_t viewport_area = static_cast<int64_t>(viewport.width()) * + static_cast<int64_t>(viewport.height()); if (maximum_area <= viewport_area) can_raster_at_maximum_scale = true; } if (starting_scale && starting_scale > maximum_scale) { gfx::Size bounds_at_starting_scale = gfx::ScaleToCeiledSize(raster_source_->GetSize(), starting_scale); - int64 start_area = static_cast<int64>(bounds_at_starting_scale.width()) * - static_cast<int64>(bounds_at_starting_scale.height()); + int64_t start_area = + static_cast<int64_t>(bounds_at_starting_scale.width()) * + static_cast<int64_t>(bounds_at_starting_scale.height()); gfx::Size viewport = layer_tree_impl()->device_viewport_size(); - int64 viewport_area = static_cast<int64>(viewport.width()) * - static_cast<int64>(viewport.height()); + int64_t viewport_area = static_cast<int64_t>(viewport.width()) * + static_cast<int64_t>(viewport.height()); if (start_area <= viewport_area) should_raster_at_starting_scale = true; }
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h index 6cbd7a06..8a2465a 100644 --- a/cc/layers/picture_layer_impl.h +++ b/cc/layers/picture_layer_impl.h
@@ -5,10 +5,13 @@ #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_ #define CC_LAYERS_PICTURE_LAYER_IMPL_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/tiles/picture_layer_tiling.h"
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc index 5088df4..c38dd3ea 100644 --- a/cc/layers/picture_layer_impl_perftest.cc +++ b/cc/layers/picture_layer_impl_perftest.cc
@@ -4,6 +4,7 @@ #include "cc/layers/picture_layer_impl.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "cc/debug/lap_timer.h" #include "cc/test/fake_display_list_raster_source.h"
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index c41ff5ab..badd37fc 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -4,12 +4,15 @@ #include "cc/layers/picture_layer_impl.h" +#include <stddef.h> + #include <algorithm> #include <limits> #include <set> #include <utility> #include "base/location.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "cc/base/math_util.h" #include "cc/layers/append_quads_data.h"
diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc index 97751fde..9568bde2 100644 --- a/cc/layers/picture_layer_unittest.cc +++ b/cc/layers/picture_layer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/picture_layer.h" +#include <stddef.h> + #include "base/thread_task_runner_handle.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/layer_settings.h"
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc index d93e052..d329667 100644 --- a/cc/layers/render_surface_impl.cc +++ b/cc/layers/render_surface_impl.cc
@@ -4,6 +4,8 @@ #include "cc/layers/render_surface_impl.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h index 283f0eb..9ba0f18 100644 --- a/cc/layers/render_surface_impl.h +++ b/cc/layers/render_surface_impl.h
@@ -5,10 +5,12 @@ #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_ #define CC_LAYERS_RENDER_SURFACE_IMPL_H_ +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_lists.h"
diff --git a/cc/layers/render_surface_impl_unittest.cc b/cc/layers/render_surface_impl_unittest.cc index 96ca40ba..e8eb2644 100644 --- a/cc/layers/render_surface_impl_unittest.cc +++ b/cc/layers/render_surface_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/render_surface_impl.h" +#include <stddef.h> + #include "cc/layers/append_quads_data.h" #include "cc/quads/render_pass_draw_quad.h" #include "cc/test/fake_mask_layer_impl.h"
diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h index ebe508b..79a18e5 100644 --- a/cc/layers/scrollbar_layer_impl_base.h +++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/input/scrollbar.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/scrollbar_layer_interface.h b/cc/layers/scrollbar_layer_interface.h index a396a5d..5a386b0 100644 --- a/cc/layers/scrollbar_layer_interface.h +++ b/cc/layers/scrollbar_layer_interface.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SCROLLBAR_LAYER_INTERFACE_H_ #define CC_LAYERS_SCROLLBAR_LAYER_INTERFACE_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/input/scrollbar.h"
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc index 99d52b61..0202f4b4 100644 --- a/cc/layers/scrollbar_layer_unittest.cc +++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/containers/hash_tables.h" #include "base/thread_task_runner_handle.h" #include "cc/animation/scrollbar_animation_controller.h"
diff --git a/cc/layers/solid_color_layer.h b/cc/layers/solid_color_layer.h index b544f66..9a16f1a 100644 --- a/cc/layers/solid_color_layer.h +++ b/cc/layers/solid_color_layer.h
@@ -6,6 +6,7 @@ #ifndef CC_LAYERS_SOLID_COLOR_LAYER_H_ #define CC_LAYERS_SOLID_COLOR_LAYER_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h index 2068ac5d..a56b69b 100644 --- a/cc/layers/solid_color_layer_impl.h +++ b/cc/layers/solid_color_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_ #define CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc index a7317ec9..a4d1bfa7 100644 --- a/cc/layers/solid_color_layer_impl_unittest.cc +++ b/cc/layers/solid_color_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/solid_color_layer_impl.h" +#include <stddef.h> + #include <vector> #include "cc/layers/append_quads_data.h"
diff --git a/cc/layers/solid_color_scrollbar_layer.h b/cc/layers/solid_color_scrollbar_layer.h index 8b14bce..8f0c00c 100644 --- a/cc/layers/solid_color_scrollbar_layer.h +++ b/cc/layers/solid_color_scrollbar_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_ #define CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h" #include "cc/layers/scrollbar_layer_interface.h"
diff --git a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc index f141535..a285f443 100644 --- a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc +++ b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/solid_color_scrollbar_layer_impl.h" +#include <stddef.h> + #include "cc/test/layer_test_common.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc index 8d46188..21f9273 100644 --- a/cc/layers/surface_layer.cc +++ b/cc/layers/surface_layer.cc
@@ -4,6 +4,9 @@ #include "cc/layers/surface_layer.h" +#include <stdint.h> + +#include "base/macros.h" #include "cc/layers/surface_layer_impl.h" #include "cc/output/swap_promise.h" #include "cc/trees/layer_tree_host.h" @@ -27,7 +30,7 @@ void DidNotSwap(DidNotSwapReason reason) override { satisfy_callback_.Run(sequence_); } - int64 TraceId() const override { return 0; } + int64_t TraceId() const override { return 0; } SurfaceSequence sequence_; SurfaceLayer::SatisfyCallback satisfy_callback_;
diff --git a/cc/layers/surface_layer.h b/cc/layers/surface_layer.h index e62d6a2..c2e8a2d0 100644 --- a/cc/layers/surface_layer.h +++ b/cc/layers/surface_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SURFACE_LAYER_H_ #define CC_LAYERS_SURFACE_LAYER_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h" #include "cc/surfaces/surface_id.h"
diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc index e0dcadf0..a8a50f33 100644 --- a/cc/layers/surface_layer_impl.cc +++ b/cc/layers/surface_layer_impl.cc
@@ -4,6 +4,8 @@ #include "cc/layers/surface_layer_impl.h" +#include <stdint.h> + #include "base/trace_event/trace_event_argument.h" #include "cc/debug/debug_colors.h" #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/layers/surface_layer_impl.h b/cc/layers/surface_layer_impl.h index 4d2c48b4..819ee73 100644 --- a/cc/layers/surface_layer_impl.h +++ b/cc/layers/surface_layer_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_SURFACE_LAYER_IMPL_H_ #define CC_LAYERS_SURFACE_LAYER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc index 3ff8255..50d4b3a 100644 --- a/cc/layers/surface_layer_impl_unittest.cc +++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/surface_layer_impl.h" +#include <stddef.h> + #include "cc/test/layer_test_common.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc index 23489094..2f8d5cd 100644 --- a/cc/layers/surface_layer_unittest.cc +++ b/cc/layers/surface_layer_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <set> #include <vector>
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h index b1e9243..6b529dd 100644 --- a/cc/layers/texture_layer.h +++ b/cc/layers/texture_layer.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "cc/base/cc_export.h"
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc index 295faf41..0d2f4e7 100644 --- a/cc/layers/texture_layer_impl.cc +++ b/cc/layers/texture_layer_impl.cc
@@ -4,6 +4,9 @@ #include "cc/layers/texture_layer_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/strings/stringprintf.h" @@ -110,8 +113,8 @@ } if (texture_copy_->id()) { - std::vector<uint8> swizzled; - uint8* pixels = texture_mailbox_.shared_bitmap()->pixels(); + std::vector<uint8_t> swizzled; + uint8_t* pixels = texture_mailbox_.shared_bitmap()->pixels(); if (!PlatformColor::SameComponentOrder(texture_copy_->format())) { // Swizzle colors. This is slow, but should be really uncommon.
diff --git a/cc/layers/texture_layer_impl.h b/cc/layers/texture_layer_impl.h index 680aaf0a..e799eff5 100644 --- a/cc/layers/texture_layer_impl.h +++ b/cc/layers/texture_layer_impl.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/texture_layer_impl_unittest.cc b/cc/layers/texture_layer_impl_unittest.cc index fe2e006f..93e3342 100644 --- a/cc/layers/texture_layer_impl_unittest.cc +++ b/cc/layers/texture_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/texture_layer_impl.h" +#include <stddef.h> + #include "cc/output/context_provider.h" #include "cc/output/output_surface.h" #include "cc/test/layer_test_common.h"
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index c7c64b6..31313af 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc
@@ -4,12 +4,16 @@ #include "cc/layers/texture_layer.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> #include "base/bind.h" #include "base/callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" @@ -151,8 +155,8 @@ release_mailbox2_impl_ = base::Bind(&MockMailboxCallback::ReleaseImpl, base::Unretained(&mock_callback_), mailbox_name2_); - const uint32 arbitrary_target1 = GL_TEXTURE_2D; - const uint32 arbitrary_target2 = GL_TEXTURE_EXTERNAL_OES; + const uint32_t arbitrary_target1 = GL_TEXTURE_2D; + const uint32_t arbitrary_target2 = GL_TEXTURE_EXTERNAL_OES; mailbox1_ = TextureMailbox(mailbox_name1_, sync_token1_, arbitrary_target1); mailbox2_ = TextureMailbox(mailbox_name2_, sync_token2_, arbitrary_target2); gfx::Size size(128, 128);
diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h index 600f245..52a45b72 100644 --- a/cc/layers/ui_resource_layer.h +++ b/cc/layers/ui_resource_layer.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_UI_RESOURCE_LAYER_H_ #define CC_LAYERS_UI_RESOURCE_LAYER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/ui_resource_layer_impl.h b/cc/layers/ui_resource_layer_impl.h index 87d77e8..05293e67 100644 --- a/cc/layers/ui_resource_layer_impl.h +++ b/cc/layers/ui_resource_layer_impl.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/resources/resource_provider.h"
diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc index c184dd6..18759a6 100644 --- a/cc/layers/ui_resource_layer_impl_unittest.cc +++ b/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/layers/append_quads_data.h" #include "cc/layers/ui_resource_layer_impl.h" #include "cc/quads/draw_quad.h"
diff --git a/cc/layers/video_frame_provider_client_impl.h b/cc/layers/video_frame_provider_client_impl.h index e626b54..17525ec 100644 --- a/cc/layers/video_frame_provider_client_impl.h +++ b/cc/layers/video_frame_provider_client_impl.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_ #define CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h"
diff --git a/cc/layers/video_frame_provider_client_impl_unittest.cc b/cc/layers/video_frame_provider_client_impl_unittest.cc index 3cc4709..e337baa9 100644 --- a/cc/layers/video_frame_provider_client_impl_unittest.cc +++ b/cc/layers/video_frame_provider_client_impl_unittest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "cc/layers/video_frame_provider_client_impl.h" #include "cc/layers/video_layer_impl.h" #include "cc/output/begin_frame_args.h"
diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h index 575de46..a59f1cc 100644 --- a/cc/layers/video_layer.h +++ b/cc/layers/video_layer.h
@@ -6,6 +6,7 @@ #define CC_LAYERS_VIDEO_LAYER_H_ #include "base/callback.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h" #include "media/base/video_rotation.h"
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc index ca5dd6e..d173cc6c 100644 --- a/cc/layers/video_layer_impl.cc +++ b/cc/layers/video_layer_impl.cc
@@ -4,6 +4,8 @@ #include "cc/layers/video_layer_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" #include "cc/layers/video_frame_provider_client_impl.h"
diff --git a/cc/layers/video_layer_impl.h b/cc/layers/video_layer_impl.h index 127700b..c1688e8 100644 --- a/cc/layers/video_layer_impl.h +++ b/cc/layers/video_layer_impl.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/resources/release_callback_impl.h"
diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc index 48c574b..b5f1c0f 100644 --- a/cc/layers/video_layer_impl_unittest.cc +++ b/cc/layers/video_layer_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/layers/video_layer_impl.h" +#include <stddef.h> + #include "cc/layers/video_frame_provider_client_impl.h" #include "cc/output/context_provider.h" #include "cc/output/output_surface.h"
diff --git a/cc/layers/viewport.h b/cc/layers/viewport.h index 5d96cd3..5052b5e 100644 --- a/cc/layers/viewport.h +++ b/cc/layers/viewport.h
@@ -5,6 +5,7 @@ #ifndef CC_LAYERS_VIEWPORT_H_ #define CC_LAYERS_VIEWPORT_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/layers/layer_impl.h" #include "ui/gfx/geometry/vector2d_f.h"
diff --git a/cc/output/bsp_tree.h b/cc/output/bsp_tree.h index efe4cc51..695c47e5 100644 --- a/cc/output/bsp_tree.h +++ b/cc/output/bsp_tree.h
@@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_BSP_TREE_H_ #define CC_OUTPUT_BSP_TREE_H_ +#include <stddef.h> + #include <deque> #include <vector>
diff --git a/cc/output/bsp_tree_unittest.cc b/cc/output/bsp_tree_unittest.cc index f55577b..1d71413 100644 --- a/cc/output/bsp_tree_unittest.cc +++ b/cc/output/bsp_tree_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <deque> #include "base/macros.h"
diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h index 3ab1e8c2..8a95fff 100644 --- a/cc/output/compositor_frame.h +++ b/cc/output/compositor_frame.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_ #define CC_OUTPUT_COMPOSITOR_FRAME_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/compositor_frame_metadata.h"
diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h index aa48fa1..a4e161b 100644 --- a/cc/output/compositor_frame_ack.h +++ b/cc/output/compositor_frame_ack.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ #define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/gl_frame_data.h"
diff --git a/cc/output/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h index 392c6b0d..ad3cdd8 100644 --- a/cc/output/compositor_frame_metadata.h +++ b/cc/output/compositor_frame_metadata.h
@@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ #define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ +#include <stdint.h> + #include <vector> #include "cc/base/cc_export.h"
diff --git a/cc/output/context_provider.cc b/cc/output/context_provider.cc index 23a8e2c8..5ff7f930 100644 --- a/cc/output/context_provider.cc +++ b/cc/output/context_provider.cc
@@ -4,6 +4,8 @@ #include "cc/output/context_provider.h" +#include <stddef.h> + #include <limits> namespace cc {
diff --git a/cc/output/context_provider.h b/cc/output/context_provider.h index db12706..c560ad0f 100644 --- a/cc/output/context_provider.h +++ b/cc/output/context_provider.h
@@ -5,6 +5,9 @@ #ifndef CC_OUTPUT_CONTEXT_PROVIDER_H_ #define CC_OUTPUT_CONTEXT_PROVIDER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h"
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h index 3cb946cf..8d9d2753 100644 --- a/cc/output/delegated_frame_data.h +++ b/cc/output/delegated_frame_data.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_DELEGATED_FRAME_DATA_H_ #define CC_OUTPUT_DELEGATED_FRAME_DATA_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/quads/render_pass.h" #include "cc/resources/transferable_resource.h"
diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h index b2bc01f..4b0c9cc6 100644 --- a/cc/output/delegating_renderer.h +++ b/cc/output/delegating_renderer.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_DELEGATING_RENDERER_H_ #define CC_OUTPUT_DELEGATING_RENDERER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/compositor_frame.h"
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc index df06696..73dbfdd 100644 --- a/cc/output/delegating_renderer_unittest.cc +++ b/cc/output/delegating_renderer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/output/delegating_renderer.h" +#include <stdint.h> + #include "cc/test/fake_output_surface.h" #include "cc/test/layer_tree_test.h" #include "cc/test/render_pass_test_utils.h"
diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc index d22d7e4..3a10cbe 100644 --- a/cc/output/direct_renderer.cc +++ b/cc/output/direct_renderer.cc
@@ -4,6 +4,8 @@ #include "cc/output/direct_renderer.h" +#include <stddef.h> + #include <utility> #include <vector>
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h index 9c3db40..28f25910 100644 --- a/cc/output/direct_renderer.h +++ b/cc/output/direct_renderer.h
@@ -5,9 +5,9 @@ #ifndef CC_OUTPUT_DIRECT_RENDERER_H_ #define CC_OUTPUT_DIRECT_RENDERER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/output/ca_layer_overlay.h" #include "cc/output/overlay_processor.h"
diff --git a/cc/output/dynamic_geometry_binding.cc b/cc/output/dynamic_geometry_binding.cc index ecdf66e..95fc0fb 100644 --- a/cc/output/dynamic_geometry_binding.cc +++ b/cc/output/dynamic_geometry_binding.cc
@@ -4,6 +4,8 @@ #include "cc/output/dynamic_geometry_binding.h" +#include <stdint.h> + #include "gpu/command_buffer/client/gles2_interface.h" #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/rect_f.h" @@ -50,8 +52,9 @@ GeometryBindingQuad local_quad = {v0, v1, v2, v3}; GeometryBindingQuadIndex quad_index( - static_cast<uint16>(0), static_cast<uint16>(1), static_cast<uint16>(2), - static_cast<uint16>(3), static_cast<uint16>(0), static_cast<uint16>(2)); + static_cast<uint16_t>(0), static_cast<uint16_t>(1), + static_cast<uint16_t>(2), static_cast<uint16_t>(3), + static_cast<uint16_t>(0), static_cast<uint16_t>(2)); gl_->BufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GeometryBindingQuad), &local_quad);
diff --git a/cc/output/dynamic_geometry_binding.h b/cc/output/dynamic_geometry_binding.h index 4e4ea3d..5f3e3ff 100644 --- a/cc/output/dynamic_geometry_binding.h +++ b/cc/output/dynamic_geometry_binding.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_ #define CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_ +#include "base/macros.h" #include "cc/output/geometry_binding.h" namespace cc {
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc index 1579e554..a37d27d 100644 --- a/cc/output/filter_operation.cc +++ b/cc/output/filter_operation.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/output/filter_operations.cc b/cc/output/filter_operations.cc index d734d4b..40bde98 100644 --- a/cc/output/filter_operations.cc +++ b/cc/output/filter_operations.cc
@@ -4,6 +4,8 @@ #include "cc/output/filter_operations.h" +#include <stddef.h> + #include <cmath> #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/output/filter_operations.h b/cc/output/filter_operations.h index 7018b82..6769969 100644 --- a/cc/output/filter_operations.h +++ b/cc/output/filter_operations.h
@@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_FILTER_OPERATIONS_H_ #define CC_OUTPUT_FILTER_OPERATIONS_H_ +#include <stddef.h> + #include <vector> #include "base/logging.h"
diff --git a/cc/output/filter_operations_unittest.cc b/cc/output/filter_operations_unittest.cc index 6ba1349..05c0289 100644 --- a/cc/output/filter_operations_unittest.cc +++ b/cc/output/filter_operations_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/output/filter_operations.h" #include "skia/ext/refptr.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc index 9a87c7f..93b2d19 100644 --- a/cc/output/geometry_binding.cc +++ b/cc/output/geometry_binding.cc
@@ -4,6 +4,8 @@ #include "cc/output/geometry_binding.h" +#include <stdint.h> + #include "gpu/command_buffer/client/gles2_interface.h" #include "ui/gfx/geometry/rect_f.h" @@ -56,12 +58,12 @@ memset(data, 0x0, sizeof(data)); } -GeometryBindingQuadIndex::GeometryBindingQuadIndex(uint16 index0, - uint16 index1, - uint16 index2, - uint16 index3, - uint16 index4, - uint16 index5) { +GeometryBindingQuadIndex::GeometryBindingQuadIndex(uint16_t index0, + uint16_t index1, + uint16_t index2, + uint16_t index3, + uint16_t index4, + uint16_t index5) { data[0] = index0; data[1] = index1; data[2] = index2;
diff --git a/cc/output/geometry_binding.h b/cc/output/geometry_binding.h index de7cfc9..4734216 100644 --- a/cc/output/geometry_binding.h +++ b/cc/output/geometry_binding.h
@@ -5,7 +5,8 @@ #ifndef CC_OUTPUT_GEOMETRY_BINDING_H_ #define CC_OUTPUT_GEOMETRY_BINDING_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" @@ -38,14 +39,14 @@ struct GeometryBindingQuadIndex { GeometryBindingQuadIndex(); - GeometryBindingQuadIndex(uint16 index0, - uint16 index1, - uint16 index2, - uint16 index3, - uint16 index4, - uint16 index5); + GeometryBindingQuadIndex(uint16_t index0, + uint16_t index1, + uint16_t index2, + uint16_t index3, + uint16_t index4, + uint16_t index5); - uint16 data[6]; + uint16_t data[6]; }; class DrawQuad;
diff --git a/cc/output/gl_frame_data.h b/cc/output/gl_frame_data.h index df6227f0..a4f9af4 100644 --- a/cc/output/gl_frame_data.h +++ b/cc/output/gl_frame_data.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/sync_token.h"
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index dda82ef1..977bfe7 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc
@@ -4,6 +4,9 @@ #include "cc/output/gl_renderer.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include <set> @@ -11,12 +14,13 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "build/build_config.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "cc/base/container_util.h" #include "cc/base/math_util.h" #include "cc/output/compositor_frame.h" @@ -2837,19 +2841,19 @@ DCHECK(iter != reverse_end); PendingAsyncReadPixels* current_read = iter->get(); - uint8* src_pixels = NULL; + uint8_t* src_pixels = NULL; scoped_ptr<SkBitmap> bitmap; if (source_buffer != 0) { gl_->BindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, source_buffer); - src_pixels = static_cast<uint8*>(gl_->MapBufferCHROMIUM( + src_pixels = static_cast<uint8_t*>(gl_->MapBufferCHROMIUM( GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, GL_READ_ONLY)); if (src_pixels) { bitmap.reset(new SkBitmap); bitmap->allocN32Pixels(size.width(), size.height()); scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap)); - uint8* dest_pixels = static_cast<uint8*>(bitmap->getPixels()); + uint8_t* dest_pixels = static_cast<uint8_t*>(bitmap->getPixels()); size_t row_bytes = size.width() * 4; int num_rows = size.height();
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h index 233fd3b..8a7694ac 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/cancelable_callback.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/output/direct_renderer.h" #include "cc/output/gl_renderer_draw_cache.h"
diff --git a/cc/output/gl_renderer_draw_cache.h b/cc/output/gl_renderer_draw_cache.h index a16c8a5..e02b73b 100644 --- a/cc/output/gl_renderer_draw_cache.h +++ b/cc/output/gl_renderer_draw_cache.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" namespace cc {
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index 3e8535e..3db6d62 100644 --- a/cc/output/gl_renderer_unittest.cc +++ b/cc/output/gl_renderer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/output/gl_renderer.h" +#include <stdint.h> + #include <set> #include "base/location.h"
diff --git a/cc/output/latency_info_swap_promise.cc b/cc/output/latency_info_swap_promise.cc index 3b26745..f20eb2d4 100644 --- a/cc/output/latency_info_swap_promise.cc +++ b/cc/output/latency_info_swap_promise.cc
@@ -4,6 +4,8 @@ #include "cc/output/latency_info_swap_promise.h" +#include <stdint.h> + #include "base/logging.h" #include "base/trace_event/trace_event.h" @@ -46,7 +48,7 @@ // DCHECK(latency_.terminated); } -int64 LatencyInfoSwapPromise::TraceId() const { +int64_t LatencyInfoSwapPromise::TraceId() const { return latency_.trace_id(); }
diff --git a/cc/output/latency_info_swap_promise.h b/cc/output/latency_info_swap_promise.h index 9a4deb6..23a1c862 100644 --- a/cc/output/latency_info_swap_promise.h +++ b/cc/output/latency_info_swap_promise.h
@@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_LATENCY_INFO_SWAP_PROMISE_H_ #define CC_OUTPUT_LATENCY_INFO_SWAP_PROMISE_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "cc/output/swap_promise.h" #include "ui/events/latency_info.h" @@ -21,7 +23,7 @@ void DidNotSwap(DidNotSwapReason reason) override; void OnCommit() override; - int64 TraceId() const override; + int64_t TraceId() const override; private: ui::LatencyInfo latency_;
diff --git a/cc/output/layer_quad.cc b/cc/output/layer_quad.cc index 537c87bd..450bfbcf 100644 --- a/cc/output/layer_quad.cc +++ b/cc/output/layer_quad.cc
@@ -4,6 +4,8 @@ #include "cc/output/layer_quad.h" +#include <stddef.h> + #include "base/logging.h" #include "ui/gfx/geometry/quad_f.h"
diff --git a/cc/output/layer_quad.h b/cc/output/layer_quad.h index 9ed3ff56..22b9357f 100644 --- a/cc/output/layer_quad.h +++ b/cc/output/layer_quad.h
@@ -6,7 +6,7 @@ #ifndef CC_OUTPUT_LAYER_QUAD_H_ #define CC_OUTPUT_LAYER_QUAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "ui/gfx/geometry/point_f.h"
diff --git a/cc/output/managed_memory_policy.cc b/cc/output/managed_memory_policy.cc index f7ed214..0dc7def6 100644 --- a/cc/output/managed_memory_policy.cc +++ b/cc/output/managed_memory_policy.cc
@@ -4,6 +4,8 @@ #include "cc/output/managed_memory_policy.h" +#include <stddef.h> + #include "base/logging.h" #include "cc/proto/gpu_conversions.h" #include "cc/proto/managed_memory_policy.pb.h"
diff --git a/cc/output/managed_memory_policy.h b/cc/output/managed_memory_policy.h index 2f68e05..54fa271 100644 --- a/cc/output/managed_memory_policy.h +++ b/cc/output/managed_memory_policy.h
@@ -5,7 +5,8 @@ #ifndef CC_OUTPUT_MANAGED_MEMORY_POLICY_H_ #define CC_OUTPUT_MANAGED_MEMORY_POLICY_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "cc/base/cc_export.h" #include "cc/tiles/tile_priority.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h"
diff --git a/cc/output/managed_memory_policy_unittest.cc b/cc/output/managed_memory_policy_unittest.cc index 3ba7546..de2ecfd5 100644 --- a/cc/output/managed_memory_policy_unittest.cc +++ b/cc/output/managed_memory_policy_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/output/managed_memory_policy.h" +#include <stddef.h> + #include "cc/proto/managed_memory_policy.pb.h" #include "cc/proto/memory_allocation.pb.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h"
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc index 108f5562..13e41d3 100644 --- a/cc/output/output_surface.cc +++ b/cc/output/output_surface.cc
@@ -4,8 +4,11 @@ #include "cc/output/output_surface.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" @@ -53,7 +56,7 @@ void setMemoryBacking(const char* dump_name, const char* backing_type, const char* backing_object_id) override { - const uint64 tracing_process_id = + const uint64_t tracing_process_id = base::trace_event::MemoryDumpManager::GetInstance() ->GetTracingProcessId();
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h index 05b6ad3..1ccc9cc 100644 --- a/cc/output/output_surface.h +++ b/cc/output/output_surface.h
@@ -7,7 +7,7 @@ #include <deque> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/output/overlay_processor.h b/cc/output/overlay_processor.h index 8f3704cd..beaae08 100644 --- a/cc/output/overlay_processor.h +++ b/cc/output/overlay_processor.h
@@ -5,7 +5,7 @@ #ifndef CC_OUTPUT_OVERLAY_PROCESSOR_H_ #define CC_OUTPUT_OVERLAY_PROCESSOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/ca_layer_overlay.h"
diff --git a/cc/output/overlay_strategy_sandwich.h b/cc/output/overlay_strategy_sandwich.h index 076ea9de..f46dd03 100644 --- a/cc/output/overlay_strategy_sandwich.h +++ b/cc/output/overlay_strategy_sandwich.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_OVERLAY_STRATEGY_SANDWICH_H_ #define CC_OUTPUT_OVERLAY_STRATEGY_SANDWICH_H_ +#include "base/macros.h" #include "cc/output/overlay_processor.h" namespace cc {
diff --git a/cc/output/overlay_strategy_single_on_top.h b/cc/output/overlay_strategy_single_on_top.h index bdf2cc2f..0613b89 100644 --- a/cc/output/overlay_strategy_single_on_top.h +++ b/cc/output/overlay_strategy_single_on_top.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_ #define CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_ +#include "base/macros.h" #include "cc/output/overlay_processor.h" namespace cc {
diff --git a/cc/output/overlay_strategy_underlay.h b/cc/output/overlay_strategy_underlay.h index f276c1c..806753bd 100644 --- a/cc/output/overlay_strategy_underlay.h +++ b/cc/output/overlay_strategy_underlay.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_OVERLAY_STRATEGY_UNDERLAY_H_ #define CC_OUTPUT_OVERLAY_STRATEGY_UNDERLAY_H_ +#include "base/macros.h" #include "cc/output/overlay_processor.h" namespace cc {
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc index e5250250..8b2333d 100644 --- a/cc/output/overlay_unittest.cc +++ b/cc/output/overlay_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include "cc/base/region.h"
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h index 8018cad..1a29436 100644 --- a/cc/output/program_binding.h +++ b/cc/output/program_binding.h
@@ -8,6 +8,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "cc/output/context_provider.h" #include "cc/output/shader.h"
diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc index 7cccb241..9405474c 100644 --- a/cc/output/render_surface_filters.cc +++ b/cc/output/render_surface_filters.cc
@@ -4,6 +4,8 @@ #include "cc/output/render_surface_filters.h" +#include <stddef.h> + #include <algorithm> #include "cc/output/filter_operation.h"
diff --git a/cc/output/render_surface_filters.h b/cc/output/render_surface_filters.h index 42b6e45..bf54986 100644 --- a/cc/output/render_surface_filters.h +++ b/cc/output/render_surface_filters.h
@@ -6,7 +6,7 @@ #ifndef CC_OUTPUT_RENDER_SURFACE_FILTERS_H_ #define CC_OUTPUT_RENDER_SURFACE_FILTERS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "skia/ext/refptr.h"
diff --git a/cc/output/renderer.h b/cc/output/renderer.h index f91b039..d22d509 100644 --- a/cc/output/renderer.h +++ b/cc/output/renderer.h
@@ -5,7 +5,7 @@ #ifndef CC_OUTPUT_RENDERER_H_ #define CC_OUTPUT_RENDERER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/output/renderer_capabilities.h" #include "cc/output/renderer_settings.h"
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc index 1c7f0864..6c5e2558 100644 --- a/cc/output/renderer_pixeltest.cc +++ b/cc/output/renderer_pixeltest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/message_loop/message_loop.h" #include "cc/output/gl_renderer.h" #include "cc/quads/draw_quad.h" @@ -183,7 +186,7 @@ void CreateTestYUVVideoDrawQuad_FromVideoFrame( const SharedQuadState* shared_state, scoped_refptr<media::VideoFrame> video_frame, - uint8 alpha_value, + uint8_t alpha_value, const gfx::RectF& tex_coord_rect, RenderPass* render_pass, VideoResourceUpdater* video_resource_updater, @@ -304,7 +307,7 @@ v_row[j] = (v_value += 5); } } - uint8 alpha_value = is_transparent ? 0 : 128; + uint8_t alpha_value = is_transparent ? 0 : 128; CreateTestYUVVideoDrawQuad_FromVideoFrame( shared_state, video_frame, alpha_value, tex_coord_rect, render_pass, video_resource_updater, rect, visible_rect, resource_provider); @@ -322,13 +325,13 @@ const gfx::RectF& tex_coord_rect, const gfx::Size& background_size, const gfx::Rect& visible_rect, - uint8 y_background, - uint8 u_background, - uint8 v_background, + uint8_t y_background, + uint8_t u_background, + uint8_t v_background, const gfx::Rect& foreground_rect, - uint8 y_foreground, - uint8 u_foreground, - uint8 v_foreground, + uint8_t y_foreground, + uint8_t u_foreground, + uint8_t v_foreground, RenderPass* render_pass, VideoResourceUpdater* video_resource_updater, ResourceProvider* resource_provider) { @@ -343,8 +346,8 @@ int planes[] = {media::VideoFrame::kYPlane, media::VideoFrame::kUPlane, media::VideoFrame::kVPlane}; - uint8 yuv_background[] = {y_background, u_background, v_background}; - uint8 yuv_foreground[] = {y_foreground, u_foreground, v_foreground}; + uint8_t yuv_background[] = {y_background, u_background, v_background}; + uint8_t yuv_foreground[] = {y_foreground, u_foreground, v_foreground}; int sample_size[] = {1, 2, 2}; for (int i = 0; i < 3; ++i) { @@ -372,7 +375,7 @@ } } - uint8 alpha_value = 255; + uint8_t alpha_value = 255; CreateTestYUVVideoDrawQuad_FromVideoFrame( shared_state, video_frame, alpha_value, tex_coord_rect, render_pass, video_resource_updater, rect, visible_rect, resource_provider); @@ -384,9 +387,9 @@ media::ColorSpace color_space, bool is_transparent, const gfx::RectF& tex_coord_rect, - uint8 y, - uint8 u, - uint8 v, + uint8_t y, + uint8_t u, + uint8_t v, RenderPass* render_pass, VideoResourceUpdater* video_resource_updater, const gfx::Rect& rect, @@ -409,7 +412,7 @@ video_frame->stride(media::VideoFrame::kVPlane) * video_frame->rows(media::VideoFrame::kVPlane)); - uint8 alpha_value = is_transparent ? 0 : 128; + uint8_t alpha_value = is_transparent ? 0 : 128; CreateTestYUVVideoDrawQuad_FromVideoFrame( shared_state, video_frame, alpha_value, tex_coord_rect, render_pass, video_resource_updater, rect, visible_rect, resource_provider);
diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h index 4910a25..46008fe 100644 --- a/cc/output/renderer_settings.h +++ b/cc/output/renderer_settings.h
@@ -5,7 +5,8 @@ #ifndef CC_OUTPUT_RENDERER_SETTINGS_H_ #define CC_OUTPUT_RENDERER_SETTINGS_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "cc/base/cc_export.h" namespace cc {
diff --git a/cc/output/shader.cc b/cc/output/shader.cc index de1ddd4..75cac6cb 100644 --- a/cc/output/shader.cc +++ b/cc/output/shader.cc
@@ -4,9 +4,10 @@ #include "cc/output/shader.h" +#include <stddef.h> + #include <algorithm> -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "cc/output/static_geometry_binding.h"
diff --git a/cc/output/shader.h b/cc/output/shader.h index 448ff07..88b632e8 100644 --- a/cc/output/shader.h +++ b/cc/output/shader.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" namespace gfx {
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h index 127c70a..722a1928 100644 --- a/cc/output/software_output_device.h +++ b/cc/output/software_output_device.h
@@ -5,7 +5,7 @@ #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "skia/ext/refptr.h"
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h index 58d0417c..19143a5 100644 --- a/cc/output/software_renderer.h +++ b/cc/output/software_renderer.h
@@ -5,7 +5,7 @@ #ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_ #define CC_OUTPUT_SOFTWARE_RENDERER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/output/compositor_frame.h" #include "cc/output/direct_renderer.h"
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc index 12976623..7f890c9 100644 --- a/cc/output/software_renderer_unittest.cc +++ b/cc/output/software_renderer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/output/software_renderer.h" +#include <stdint.h> + #include "base/run_loop.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/copy_output_request.h"
diff --git a/cc/output/static_geometry_binding.cc b/cc/output/static_geometry_binding.cc index dc79c1e..df540671 100644 --- a/cc/output/static_geometry_binding.cc +++ b/cc/output/static_geometry_binding.cc
@@ -4,6 +4,9 @@ #include "cc/output/static_geometry_binding.h" +#include <stddef.h> +#include <stdint.h> + #include "gpu/command_buffer/client/gles2_interface.h" #include "ui/gfx/geometry/rect_f.h" @@ -40,9 +43,9 @@ GeometryBindingQuad x(v0, v1, v2, v3); quads[i] = x; GeometryBindingQuadIndex y( - static_cast<uint16>(0 + 4 * i), static_cast<uint16>(1 + 4 * i), - static_cast<uint16>(2 + 4 * i), static_cast<uint16>(3 + 4 * i), - static_cast<uint16>(0 + 4 * i), static_cast<uint16>(2 + 4 * i)); + static_cast<uint16_t>(0 + 4 * i), static_cast<uint16_t>(1 + 4 * i), + static_cast<uint16_t>(2 + 4 * i), static_cast<uint16_t>(3 + 4 * i), + static_cast<uint16_t>(0 + 4 * i), static_cast<uint16_t>(2 + 4 * i)); quad_indices[i] = y; }
diff --git a/cc/output/static_geometry_binding.h b/cc/output/static_geometry_binding.h index 85166ef..86b84ee8 100644 --- a/cc/output/static_geometry_binding.h +++ b/cc/output/static_geometry_binding.h
@@ -5,6 +5,7 @@ #ifndef CC_OUTPUT_STATIC_GEOMETRY_BINDING_H_ #define CC_OUTPUT_STATIC_GEOMETRY_BINDING_H_ +#include "base/macros.h" #include "cc/output/geometry_binding.h" using gpu::gles2::GLES2Interface;
diff --git a/cc/output/swap_promise.h b/cc/output/swap_promise.h index cf0b88d..f3c3fbdd 100644 --- a/cc/output/swap_promise.h +++ b/cc/output/swap_promise.h
@@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_SWAP_PROMISE_H_ #define CC_OUTPUT_SWAP_PROMISE_H_ +#include <stdint.h> + #include "cc/output/compositor_frame_metadata.h" namespace cc { @@ -60,7 +62,7 @@ // A non-zero trace id identifies a trace flow object that is embedded in the // swap promise. This can be used for registering additional flow steps to // visualize the object's path through the system. - virtual int64 TraceId() const = 0; + virtual int64_t TraceId() const = 0; }; } // namespace cc
diff --git a/cc/output/texture_mailbox_deleter.cc b/cc/output/texture_mailbox_deleter.cc index 8585938..2bef8eb 100644 --- a/cc/output/texture_mailbox_deleter.cc +++ b/cc/output/texture_mailbox_deleter.cc
@@ -4,6 +4,8 @@ #include "cc/output/texture_mailbox_deleter.h" +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/playback/clip_display_item.cc b/cc/playback/clip_display_item.cc index 96a2df8..90b8904 100644 --- a/cc/playback/clip_display_item.cc +++ b/cc/playback/clip_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/clip_display_item.h" +#include <stddef.h> + #include <string> #include "base/logging.h"
diff --git a/cc/playback/clip_display_item.h b/cc/playback/clip_display_item.h index 51402139..97e877e4 100644 --- a/cc/playback/clip_display_item.h +++ b/cc/playback/clip_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_ #define CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_ +#include <stddef.h> + #include <vector> #include "base/memory/scoped_ptr.h"
diff --git a/cc/playback/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc index 5b9b3f2..1a39af25 100644 --- a/cc/playback/clip_path_display_item.cc +++ b/cc/playback/clip_path_display_item.cc
@@ -4,6 +4,9 @@ #include "cc/playback/clip_path_display_item.h" +#include <stddef.h> +#include <stdint.h> + #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event_argument.h" #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/clip_path_display_item.h b/cc/playback/clip_path_display_item.h index f3eaa0a..0ad1effc 100644 --- a/cc/playback/clip_path_display_item.h +++ b/cc/playback/clip_path_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_ #define CC_PLAYBACK_CLIP_PATH_DISPLAY_ITEM_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/playback/display_item.h"
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc index 3c6e8b0..6828fcf3c 100644 --- a/cc/playback/compositing_display_item.cc +++ b/cc/playback/compositing_display_item.cc
@@ -4,6 +4,9 @@ #include "cc/playback/compositing_display_item.h" +#include <stddef.h> +#include <stdint.h> + #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event_argument.h" #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h index e0dd8701..4745208 100644 --- a/cc/playback/compositing_display_item.h +++ b/cc/playback/compositing_display_item.h
@@ -5,6 +5,9 @@ #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/playback/display_item.h"
diff --git a/cc/playback/discardable_image_map.cc b/cc/playback/discardable_image_map.cc index e109e2be..93ee2c5e 100644 --- a/cc/playback/discardable_image_map.cc +++ b/cc/playback/discardable_image_map.cc
@@ -4,6 +4,8 @@ #include "cc/playback/discardable_image_map.h" +#include <stddef.h> + #include <algorithm> #include <limits>
diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc index 70253caa..1c7c1fb4 100644 --- a/cc/playback/discardable_image_map_unittest.cc +++ b/cc/playback/discardable_image_map_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/playback/discardable_image_map.h" +#include <stddef.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h"
diff --git a/cc/playback/display_item.h b/cc/playback/display_item.h index aeea050..c4140f33 100644 --- a/cc/playback/display_item.h +++ b/cc/playback/display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_DISPLAY_ITEM_H_ #define CC_PLAYBACK_DISPLAY_ITEM_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/debug/traced_value.h"
diff --git a/cc/playback/display_item_list.cc b/cc/playback/display_item_list.cc index 80c713d8..19b97d8 100644 --- a/cc/playback/display_item_list.cc +++ b/cc/playback/display_item_list.cc
@@ -4,6 +4,8 @@ #include "cc/playback/display_item_list.h" +#include <stddef.h> + #include <string> #include "base/numerics/safe_conversions.h"
diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h index 3ce1662..7b68e07 100644 --- a/cc/playback/display_item_list.h +++ b/cc/playback/display_item_list.h
@@ -5,7 +5,10 @@ #ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ +#include <stddef.h> + #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc index 65d12d6..191b533 100644 --- a/cc/playback/display_item_list_unittest.cc +++ b/cc/playback/display_item_list_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/playback/display_item_list.h" +#include <stddef.h> + #include <vector> #include "cc/output/filter_operation.h"
diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc index cc4f7a7..4fc0f63 100644 --- a/cc/playback/display_list_raster_source.cc +++ b/cc/playback/display_list_raster_source.cc
@@ -4,6 +4,8 @@ #include "cc/playback/display_list_raster_source.h" +#include <stddef.h> + #include "base/trace_event/trace_event.h" #include "cc/base/region.h" #include "cc/debug/debug_colors.h"
diff --git a/cc/playback/display_list_raster_source.h b/cc/playback/display_list_raster_source.h index 8c06c8d6..377e081 100644 --- a/cc/playback/display_list_raster_source.h +++ b/cc/playback/display_list_raster_source.h
@@ -5,8 +5,11 @@ #ifndef CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_ #define CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/debug/rendering_stats_instrumentation.h"
diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc index c7b3af97..ca746fc 100644 --- a/cc/playback/display_list_raster_source_unittest.cc +++ b/cc/playback/display_list_raster_source_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/playback/display_list_raster_source.h" #include "cc/test/fake_display_list_recording_source.h"
diff --git a/cc/playback/display_list_recording_source.cc b/cc/playback/display_list_recording_source.cc index 57602fbb..90542381 100644 --- a/cc/playback/display_list_recording_source.cc +++ b/cc/playback/display_list_recording_source.cc
@@ -4,6 +4,8 @@ #include "cc/playback/display_list_recording_source.h" +#include <stdint.h> + #include <algorithm> #include "base/numerics/safe_math.h"
diff --git a/cc/playback/display_list_recording_source.h b/cc/playback/display_list_recording_source.h index f8d469e..d1caf98e0 100644 --- a/cc/playback/display_list_recording_source.h +++ b/cc/playback/display_list_recording_source.h
@@ -5,6 +5,9 @@ #ifndef CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_ #define CC_PLAYBACK_DISPLAY_LIST_RECORDING_SOURCE_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc index f314608f..78f26fe 100644 --- a/cc/playback/drawing_display_item.cc +++ b/cc/playback/drawing_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/drawing_display_item.h" +#include <stddef.h> + #include <string> #include "base/strings/stringprintf.h"
diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h index 261b3b3c..9e8f110 100644 --- a/cc/playback/drawing_display_item.h +++ b/cc/playback/drawing_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_ #define CC_PLAYBACK_DRAWING_DISPLAY_ITEM_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/playback/display_item.h"
diff --git a/cc/playback/filter_display_item.cc b/cc/playback/filter_display_item.cc index d51da7ce..0c6ebe0a 100644 --- a/cc/playback/filter_display_item.cc +++ b/cc/playback/filter_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/filter_display_item.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event_argument.h" #include "cc/output/render_surface_filters.h"
diff --git a/cc/playback/filter_display_item.h b/cc/playback/filter_display_item.h index c0a8df99..d4506ed 100644 --- a/cc/playback/filter_display_item.h +++ b/cc/playback/filter_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_ #define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/filter_operations.h"
diff --git a/cc/playback/float_clip_display_item.cc b/cc/playback/float_clip_display_item.cc index b57e640..3601e9d 100644 --- a/cc/playback/float_clip_display_item.cc +++ b/cc/playback/float_clip_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/float_clip_display_item.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event_argument.h" #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/float_clip_display_item.h b/cc/playback/float_clip_display_item.h index 6769c98..8c34c5fb 100644 --- a/cc/playback/float_clip_display_item.h +++ b/cc/playback/float_clip_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_ #define CC_PLAYBACK_FLOAT_CLIP_DISPLAY_ITEM_H_ +#include <stddef.h> + #include <vector> #include "base/memory/scoped_ptr.h"
diff --git a/cc/playback/largest_display_item.cc b/cc/playback/largest_display_item.cc index 0ecd3d0..7c761141 100644 --- a/cc/playback/largest_display_item.cc +++ b/cc/playback/largest_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/largest_display_item.h" +#include <stddef.h> + #include <algorithm> #include "cc/playback/clip_display_item.h"
diff --git a/cc/playback/largest_display_item.h b/cc/playback/largest_display_item.h index cce56719..8350c61f 100644 --- a/cc/playback/largest_display_item.h +++ b/cc/playback/largest_display_item.h
@@ -5,7 +5,8 @@ #ifndef CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_ #define CC_PLAYBACK_LARGEST_DISPLAY_ITEM_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "cc/base/cc_export.h" namespace cc {
diff --git a/cc/playback/transform_display_item.cc b/cc/playback/transform_display_item.cc index 8f7303c7..c4625ff 100644 --- a/cc/playback/transform_display_item.cc +++ b/cc/playback/transform_display_item.cc
@@ -4,6 +4,8 @@ #include "cc/playback/transform_display_item.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event_argument.h" #include "cc/proto/display_item.pb.h"
diff --git a/cc/playback/transform_display_item.h b/cc/playback/transform_display_item.h index 7e0a297..5b891361 100644 --- a/cc/playback/transform_display_item.h +++ b/cc/playback/transform_display_item.h
@@ -5,6 +5,8 @@ #ifndef CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_ #define CC_PLAYBACK_TRANSFORM_DISPLAY_ITEM_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/playback/display_item.h"
diff --git a/cc/proto/gpu_conversions_unittest.cc b/cc/proto/gpu_conversions_unittest.cc index f845f81..7ed770b 100644 --- a/cc/proto/gpu_conversions_unittest.cc +++ b/cc/proto/gpu_conversions_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/proto/gpu_conversions.h" +#include <stddef.h> + #include "cc/proto/memory_allocation.pb.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/proto/skia_conversions_unittest.cc b/cc/proto/skia_conversions_unittest.cc index 6785a0c..c8e02a7 100644 --- a/cc/proto/skia_conversions_unittest.cc +++ b/cc/proto/skia_conversions_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/proto/skia_conversions.h" +#include <stddef.h> + #include "cc/proto/skregion.pb.h" #include "cc/proto/skrrect.pb.h" #include "cc/proto/skxfermode.pb.h"
diff --git a/cc/quads/draw_polygon.cc b/cc/quads/draw_polygon.cc index b279fe6..a300c92 100644 --- a/cc/quads/draw_polygon.cc +++ b/cc/quads/draw_polygon.cc
@@ -4,6 +4,8 @@ #include "cc/quads/draw_polygon.h" +#include <stddef.h> + #include <vector> #include "cc/output/bsp_compare_result.h"
diff --git a/cc/quads/draw_polygon_unittest.cc b/cc/quads/draw_polygon_unittest.cc index 95eaf6b..eb6d162 100644 --- a/cc/quads/draw_polygon_unittest.cc +++ b/cc/quads/draw_polygon_unittest.cc
@@ -7,6 +7,8 @@ #define _USE_MATH_DEFINES #endif +#include <stddef.h> + #include <limits> #include <vector>
diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc index f9bf6fc..9bf17f23 100644 --- a/cc/quads/draw_quad.cc +++ b/cc/quads/draw_quad.cc
@@ -4,6 +4,8 @@ #include "cc/quads/draw_quad.h" +#include <stddef.h> + #include "base/logging.h" #include "base/trace_event/trace_event_argument.h" #include "base/values.h"
diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h index 10b0e40..dcc671ac 100644 --- a/cc/quads/draw_quad.h +++ b/cc/quads/draw_quad.h
@@ -5,6 +5,8 @@ #ifndef CC_QUADS_DRAW_QUAD_H_ #define CC_QUADS_DRAW_QUAD_H_ +#include <stddef.h> + #include "base/callback.h" #include "cc/base/cc_export.h" #include "cc/base/resource_id.h"
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc index 838cfe0..cfc20a1 100644 --- a/cc/quads/draw_quad_unittest.cc +++ b/cc/quads/draw_quad_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/quads/draw_quad.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h"
diff --git a/cc/quads/io_surface_draw_quad.h b/cc/quads/io_surface_draw_quad.h index 4a8a072c..9deb8fa 100644 --- a/cc/quads/io_surface_draw_quad.h +++ b/cc/quads/io_surface_draw_quad.h
@@ -5,6 +5,8 @@ #ifndef CC_QUADS_IO_SURFACE_DRAW_QUAD_H_ #define CC_QUADS_IO_SURFACE_DRAW_QUAD_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/largest_draw_quad.cc b/cc/quads/largest_draw_quad.cc index b652638..cd5dd387 100644 --- a/cc/quads/largest_draw_quad.cc +++ b/cc/quads/largest_draw_quad.cc
@@ -4,6 +4,8 @@ #include "cc/quads/largest_draw_quad.h" +#include <stddef.h> + #include <algorithm> #include "cc/quads/debug_border_draw_quad.h"
diff --git a/cc/quads/largest_draw_quad.h b/cc/quads/largest_draw_quad.h index 85d9f17..62593e5c 100644 --- a/cc/quads/largest_draw_quad.h +++ b/cc/quads/largest_draw_quad.h
@@ -5,7 +5,8 @@ #ifndef CC_QUADS_LARGEST_DRAW_QUAD_H_ #define CC_QUADS_LARGEST_DRAW_QUAD_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "cc/base/cc_export.h" namespace cc {
diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc index ba5806f..15ed6a4 100644 --- a/cc/quads/render_pass.cc +++ b/cc/quads/render_pass.cc
@@ -4,6 +4,8 @@ #include "cc/quads/render_pass.h" +#include <stddef.h> + #include <algorithm> #include "base/numerics/safe_conversions.h"
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index e6cc67a6..9ba727e 100644 --- a/cc/quads/render_pass.h +++ b/cc/quads/render_pass.h
@@ -5,12 +5,14 @@ #ifndef CC_QUADS_RENDER_PASS_H_ #define CC_QUADS_RENDER_PASS_H_ +#include <stddef.h> + #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/base/list_container.h" #include "cc/quads/render_pass_id.h"
diff --git a/cc/quads/render_pass_draw_quad.h b/cc/quads/render_pass_draw_quad.h index c0d6b52..08e0cc0 100644 --- a/cc/quads/render_pass_draw_quad.h +++ b/cc/quads/render_pass_draw_quad.h
@@ -5,7 +5,8 @@ #ifndef CC_QUADS_RENDER_PASS_DRAW_QUAD_H_ #define CC_QUADS_RENDER_PASS_DRAW_QUAD_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/filter_operations.h"
diff --git a/cc/quads/render_pass_id.cc b/cc/quads/render_pass_id.cc index 5fea6dc8..0f53e81 100644 --- a/cc/quads/render_pass_id.cc +++ b/cc/quads/render_pass_id.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/quads/render_pass_id.h" namespace cc {
diff --git a/cc/quads/render_pass_id.h b/cc/quads/render_pass_id.h index f6ab9ce..11cb7772 100644 --- a/cc/quads/render_pass_id.h +++ b/cc/quads/render_pass_id.h
@@ -5,9 +5,10 @@ #ifndef CC_QUADS_RENDER_PASS_ID_H_ #define CC_QUADS_RENDER_PASS_ID_H_ +#include <stddef.h> + #include <tuple> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "cc/base/cc_export.h"
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc index 140b7e1..b833a0c 100644 --- a/cc/quads/render_pass_unittest.cc +++ b/cc/quads/render_pass_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/quads/render_pass.h" +#include <stddef.h> + #include "cc/base/math_util.h" #include "cc/output/copy_output_request.h" #include "cc/quads/render_pass_draw_quad.h"
diff --git a/cc/quads/stream_video_draw_quad.h b/cc/quads/stream_video_draw_quad.h index 1044fdc1..8547b66 100644 --- a/cc/quads/stream_video_draw_quad.h +++ b/cc/quads/stream_video_draw_quad.h
@@ -5,6 +5,8 @@ #ifndef CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_ #define CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc index 370277b..46f6be43 100644 --- a/cc/quads/texture_draw_quad.cc +++ b/cc/quads/texture_draw_quad.cc
@@ -4,6 +4,8 @@ #include "cc/quads/texture_draw_quad.h" +#include <stddef.h> + #include "base/logging.h" #include "base/trace_event/trace_event_argument.h" #include "base/values.h"
diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h index 9b9fab9..2ba5b9d 100644 --- a/cc/quads/texture_draw_quad.h +++ b/cc/quads/texture_draw_quad.h
@@ -5,6 +5,8 @@ #ifndef CC_QUADS_TEXTURE_DRAW_QUAD_H_ #define CC_QUADS_TEXTURE_DRAW_QUAD_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h"
diff --git a/cc/quads/tile_draw_quad.h b/cc/quads/tile_draw_quad.h index feb9e87..d13ac97e 100644 --- a/cc/quads/tile_draw_quad.h +++ b/cc/quads/tile_draw_quad.h
@@ -5,6 +5,8 @@ #ifndef CC_QUADS_TILE_DRAW_QUAD_H_ #define CC_QUADS_TILE_DRAW_QUAD_H_ +#include <stddef.h> + #include "cc/quads/content_draw_quad_base.h" namespace cc {
diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h index 3dfd85bb..1a72078d 100644 --- a/cc/quads/yuv_video_draw_quad.h +++ b/cc/quads/yuv_video_draw_quad.h
@@ -5,7 +5,8 @@ #ifndef CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_ #define CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h"
diff --git a/cc/raster/bitmap_tile_task_worker_pool.cc b/cc/raster/bitmap_tile_task_worker_pool.cc index c059483c..88925021 100644 --- a/cc/raster/bitmap_tile_task_worker_pool.cc +++ b/cc/raster/bitmap_tile_task_worker_pool.cc
@@ -4,8 +4,12 @@ #include "cc/raster/bitmap_tile_task_worker_pool.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/raster/bitmap_tile_task_worker_pool.h b/cc/raster/bitmap_tile_task_worker_pool.h index f53768f..4c39a1f 100644 --- a/cc/raster/bitmap_tile_task_worker_pool.h +++ b/cc/raster/bitmap_tile_task_worker_pool.h
@@ -5,6 +5,9 @@ #ifndef CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_ #define CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/values.h" #include "cc/raster/tile_task_runner.h" #include "cc/raster/tile_task_worker_pool.h"
diff --git a/cc/raster/gpu_rasterizer.h b/cc/raster/gpu_rasterizer.h index 04b5c18..e14ea26 100644 --- a/cc/raster/gpu_rasterizer.h +++ b/cc/raster/gpu_rasterizer.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/resources/resource_pool.h" #include "cc/tiles/tile.h"
diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc index 306d5d1..ce5876a 100644 --- a/cc/raster/gpu_tile_task_worker_pool.cc +++ b/cc/raster/gpu_tile_task_worker_pool.cc
@@ -4,8 +4,11 @@ #include "cc/raster/gpu_tile_task_worker_pool.h" +#include <stdint.h> + #include <algorithm> +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "cc/playback/display_list_raster_source.h" #include "cc/raster/gpu_rasterizer.h"
diff --git a/cc/raster/gpu_tile_task_worker_pool.h b/cc/raster/gpu_tile_task_worker_pool.h index 20ac14c0..0577b51 100644 --- a/cc/raster/gpu_tile_task_worker_pool.h +++ b/cc/raster/gpu_tile_task_worker_pool.h
@@ -5,6 +5,9 @@ #ifndef CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_ #define CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "cc/raster/tile_task_runner.h" #include "cc/raster/tile_task_worker_pool.h"
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc index 16ac585..9ca1ae3 100644 --- a/cc/raster/one_copy_tile_task_worker_pool.cc +++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -4,10 +4,13 @@ #include "cc/raster/one_copy_tile_task_worker_pool.h" +#include <stdint.h> + #include <algorithm> #include <limits> #include <utility> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" @@ -160,7 +163,7 @@ in_free_list ? buffer_size_in_bytes : 0); // Emit an ownership edge towards a global allocator dump node. - const uint64 tracing_process_id = + const uint64_t tracing_process_id = base::trace_event::MemoryDumpManager::GetInstance() ->GetTracingProcessId(); base::trace_event::MemoryAllocatorDumpGuid shared_buffer_guid =
diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h index 8dc861f..4196b3a 100644 --- a/cc/raster/one_copy_tile_task_worker_pool.h +++ b/cc/raster/one_copy_tile_task_worker_pool.h
@@ -5,9 +5,12 @@ #ifndef CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_ #define CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_ +#include <stdint.h> + #include <deque> #include <set> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/time/time.h"
diff --git a/cc/raster/raster_buffer.h b/cc/raster/raster_buffer.h index d3dc01c..8bd305d 100644 --- a/cc/raster/raster_buffer.h +++ b/cc/raster/raster_buffer.h
@@ -5,6 +5,8 @@ #ifndef CC_RASTER_RASTER_BUFFER_H_ #define CC_RASTER_RASTER_BUFFER_H_ +#include <stdint.h> + #include "cc/base/cc_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/cc/raster/scoped_gpu_raster.h b/cc/raster/scoped_gpu_raster.h index d9613b3c..274772c 100644 --- a/cc/raster/scoped_gpu_raster.h +++ b/cc/raster/scoped_gpu_raster.h
@@ -6,6 +6,7 @@ #define CC_RASTER_SCOPED_GPU_RASTER_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/context_provider.h"
diff --git a/cc/raster/single_thread_task_graph_runner.cc b/cc/raster/single_thread_task_graph_runner.cc index 80c85db..ba879af 100644 --- a/cc/raster/single_thread_task_graph_runner.cc +++ b/cc/raster/single_thread_task_graph_runner.cc
@@ -4,6 +4,8 @@ #include "cc/raster/single_thread_task_graph_runner.h" +#include <stdint.h> + #include <string> #include "base/threading/simple_thread.h"
diff --git a/cc/raster/synchronous_task_graph_runner.cc b/cc/raster/synchronous_task_graph_runner.cc index 156ef9ac..2f5055d 100644 --- a/cc/raster/synchronous_task_graph_runner.cc +++ b/cc/raster/synchronous_task_graph_runner.cc
@@ -4,6 +4,8 @@ #include "cc/raster/synchronous_task_graph_runner.h" +#include <stdint.h> + #include <algorithm> #include <utility>
diff --git a/cc/raster/task_graph_runner.h b/cc/raster/task_graph_runner.h index 181a455..4b3c664 100644 --- a/cc/raster/task_graph_runner.h +++ b/cc/raster/task_graph_runner.h
@@ -5,6 +5,9 @@ #ifndef CC_RASTER_TASK_GRAPH_RUNNER_H_ #define CC_RASTER_TASK_GRAPH_RUNNER_H_ +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <map> #include <vector>
diff --git a/cc/raster/task_graph_runner_perftest.cc b/cc/raster/task_graph_runner_perftest.cc index b97b93c..f86bae57 100644 --- a/cc/raster/task_graph_runner_perftest.cc +++ b/cc/raster/task_graph_runner_perftest.cc
@@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/completion_event.h"
diff --git a/cc/raster/task_graph_work_queue.cc b/cc/raster/task_graph_work_queue.cc index 95faedca..8780057 100644 --- a/cc/raster/task_graph_work_queue.cc +++ b/cc/raster/task_graph_work_queue.cc
@@ -4,6 +4,9 @@ #include "cc/raster/task_graph_work_queue.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <map> #include <utility>
diff --git a/cc/raster/task_graph_work_queue.h b/cc/raster/task_graph_work_queue.h index 7b6840c..95d3c772c 100644 --- a/cc/raster/task_graph_work_queue.h +++ b/cc/raster/task_graph_work_queue.h
@@ -5,6 +5,8 @@ #ifndef CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_ #define CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_ +#include <stdint.h> + #include <algorithm> #include <map> #include <vector>
diff --git a/cc/raster/texture_compressor_etc1.cc b/cc/raster/texture_compressor_etc1.cc index e02737c..55b0ca46 100644 --- a/cc/raster/texture_compressor_etc1.cc +++ b/cc/raster/texture_compressor_etc1.cc
@@ -7,6 +7,7 @@ #include "cc/raster/texture_compressor_etc1.h" +#include <stdint.h> #include <string.h> #include <limits>
diff --git a/cc/raster/texture_compressor_etc1.h b/cc/raster/texture_compressor_etc1.h index 2d2771a88..311a4c30 100644 --- a/cc/raster/texture_compressor_etc1.h +++ b/cc/raster/texture_compressor_etc1.h
@@ -7,8 +7,11 @@ #include "cc/raster/texture_compressor.h" +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" namespace cc {
diff --git a/cc/raster/texture_compressor_etc1_sse.cc b/cc/raster/texture_compressor_etc1_sse.cc index 6f1005bf..cb8579c 100644 --- a/cc/raster/texture_compressor_etc1_sse.cc +++ b/cc/raster/texture_compressor_etc1_sse.cc
@@ -5,6 +5,7 @@ #include "cc/raster/texture_compressor_etc1_sse.h" #include <emmintrin.h> +#include <stdint.h> #include "base/compiler_specific.h" #include "base/logging.h"
diff --git a/cc/raster/texture_compressor_etc1_sse.h b/cc/raster/texture_compressor_etc1_sse.h index 3822699..3c186c6 100644 --- a/cc/raster/texture_compressor_etc1_sse.h +++ b/cc/raster/texture_compressor_etc1_sse.h
@@ -5,6 +5,9 @@ #ifndef CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_ #define CC_RASTER_TEXTURE_COMPRESSOR_ETC1_SSE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "cc/raster/texture_compressor.h" namespace cc {
diff --git a/cc/raster/texture_compressor_etc1_unittest.cc b/cc/raster/texture_compressor_etc1_unittest.cc index d0c63f4..dc90ebb 100644 --- a/cc/raster/texture_compressor_etc1_unittest.cc +++ b/cc/raster/texture_compressor_etc1_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/raster/texture_compressor.h" +#include <stdint.h> + #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/raster/texture_compressor_perftest.cc b/cc/raster/texture_compressor_perftest.cc index 4b2967c..96ab60db 100644 --- a/cc/raster/texture_compressor_perftest.cc +++ b/cc/raster/texture_compressor_perftest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/logging.h" #include "cc/debug/lap_timer.h" #include "cc/raster/texture_compressor.h"
diff --git a/cc/raster/tile_task_runner.h b/cc/raster/tile_task_runner.h index 1958ca25..ed0f29a 100644 --- a/cc/raster/tile_task_runner.h +++ b/cc/raster/tile_task_runner.h
@@ -5,6 +5,8 @@ #ifndef CC_RASTER_TILE_TASK_RUNNER_H_ #define CC_RASTER_TILE_TASK_RUNNER_H_ +#include <stdint.h> + #include <vector> #include "base/callback.h"
diff --git a/cc/raster/tile_task_worker_pool.cc b/cc/raster/tile_task_worker_pool.cc index b55f69d..46a10ab 100644 --- a/cc/raster/tile_task_worker_pool.cc +++ b/cc/raster/tile_task_worker_pool.cc
@@ -4,6 +4,8 @@ #include "cc/raster/tile_task_worker_pool.h" +#include <stddef.h> + #include "base/trace_event/trace_event.h" #include "cc/playback/display_list_raster_source.h" #include "skia/ext/refptr.h"
diff --git a/cc/raster/tile_task_worker_pool.h b/cc/raster/tile_task_worker_pool.h index 6b550fa2f..5f22961 100644 --- a/cc/raster/tile_task_worker_pool.h +++ b/cc/raster/tile_task_worker_pool.h
@@ -5,6 +5,8 @@ #ifndef CC_RASTER_TILE_TASK_WORKER_POOL_H_ #define CC_RASTER_TILE_TASK_WORKER_POOL_H_ +#include <stddef.h> + #include "cc/raster/tile_task_runner.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h"
diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc index 32be835..0abdf8e 100644 --- a/cc/raster/tile_task_worker_pool_perftest.cc +++ b/cc/raster/tile_task_worker_pool_perftest.cc
@@ -4,6 +4,10 @@ #include "cc/raster/tile_task_worker_pool.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/test/test_simple_task_runner.h" #include "base/time/time.h" #include "cc/debug/lap_timer.h"
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc index 8a2d485..c873089e 100644 --- a/cc/raster/tile_task_worker_pool_unittest.cc +++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -4,12 +4,16 @@ #include "cc/raster/tile_task_worker_pool.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include <vector> #include "base/cancelable_callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "cc/base/unique_notifier.h"
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc index 8830c1f02..4310f96 100644 --- a/cc/raster/zero_copy_tile_task_worker_pool.cc +++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
@@ -4,8 +4,11 @@ #include "cc/raster/zero_copy_tile_task_worker_pool.h" +#include <stdint.h> + #include <algorithm> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h"
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.h b/cc/raster/zero_copy_tile_task_worker_pool.h index 3ca9b06..ffbde20 100644 --- a/cc/raster/zero_copy_tile_task_worker_pool.h +++ b/cc/raster/zero_copy_tile_task_worker_pool.h
@@ -5,6 +5,9 @@ #ifndef CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_ #define CC_RASTER_ZERO_COPY_TILE_TASK_WORKER_POOL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "cc/raster/tile_task_runner.h"
diff --git a/cc/resources/memory_history.h b/cc/resources/memory_history.h index 15ddc75a..cdcc46a 100644 --- a/cc/resources/memory_history.h +++ b/cc/resources/memory_history.h
@@ -5,7 +5,10 @@ #ifndef CC_RESOURCES_MEMORY_HISTORY_H_ #define CC_RESOURCES_MEMORY_HISTORY_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/debug/ring_buffer.h" @@ -26,7 +29,7 @@ had_enough_memory(false) {} size_t total_budget_in_bytes; - int64 total_bytes_used; + int64_t total_bytes_used; bool had_enough_memory; };
diff --git a/cc/resources/platform_color.h b/cc/resources/platform_color.h index 17eddc1f..f7d3705d 100644 --- a/cc/resources/platform_color.h +++ b/cc/resources/platform_color.h
@@ -5,8 +5,8 @@ #ifndef CC_RESOURCES_PLATFORM_COLOR_H_ #define CC_RESOURCES_PLATFORM_COLOR_H_ -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "cc/resources/resource_format.h" #include "third_party/skia/include/core/SkTypes.h"
diff --git a/cc/resources/platform_color_unittest.cc b/cc/resources/platform_color_unittest.cc index 83b2a1e..bbc4c06 100644 --- a/cc/resources/platform_color_unittest.cc +++ b/cc/resources/platform_color_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/resources/platform_color.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/resources/resource.h b/cc/resources/resource.h index 549a314..1a547a7 100644 --- a/cc/resources/resource.h +++ b/cc/resources/resource.h
@@ -5,6 +5,7 @@ #ifndef CC_RESOURCES_RESOURCE_H_ #define CC_RESOURCES_RESOURCE_H_ +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/resources/resource_provider.h" #include "cc/resources/resource_util.h"
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc index 507aa2bc..b9630faf 100644 --- a/cc/resources/resource_pool.cc +++ b/cc/resources/resource_pool.cc
@@ -4,6 +4,9 @@ #include "cc/resources/resource_pool.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <utility>
diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h index e17032b..df95846 100644 --- a/cc/resources/resource_pool.h +++ b/cc/resources/resource_pool.h
@@ -5,9 +5,13 @@ #ifndef CC_RESOURCES_RESOURCE_POOL_H_ #define CC_RESOURCES_RESOURCE_POOL_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <map> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/trace_event/memory_dump_provider.h" #include "cc/base/cc_export.h" @@ -37,7 +41,7 @@ ~ResourcePool() override; Resource* AcquireResource(const gfx::Size& size, ResourceFormat format); - Resource* TryAcquireResourceWithContentId(uint64 content_id); + Resource* TryAcquireResourceWithContentId(uint64_t content_id); void ReleaseResource(Resource* resource, uint64_t content_id); void SetResourceUsageLimits(size_t max_memory_usage_bytes,
diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc index 0dc8806..af86503 100644 --- a/cc/resources/resource_pool_unittest.cc +++ b/cc/resources/resource_pool_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/resources/resource_pool.h" +#include <stddef.h> + #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "cc/resources/resource_util.h"
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 4e490750..c6e5c91 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc
@@ -4,11 +4,15 @@ #include "cc/resources/resource_provider.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include "base/atomic_sequence_num.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/numerics/safe_math.h" #include "base/stl_util.h" @@ -1623,7 +1627,7 @@ base::trace_event::ProcessMemoryDump* pmd) { DCHECK(thread_checker_.CalledOnValidThread()); - const uint64 tracing_process_id = + const uint64_t tracing_process_id = base::trace_event::MemoryDumpManager::GetInstance() ->GetTracingProcessId();
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h index 5a03cda..1aed50f 100644 --- a/cc/resources/resource_provider.h +++ b/cc/resources/resource_provider.h
@@ -5,15 +5,18 @@ #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_ #define CC_RESOURCES_RESOURCE_PROVIDER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <set> #include <string> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc index 90ec427..3374e85 100644 --- a/cc/resources/resource_provider_unittest.cc +++ b/cc/resources/resource_provider_unittest.cc
@@ -4,6 +4,9 @@ #include "cc/resources/resource_provider.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <deque> #include <map> @@ -124,7 +127,7 @@ return make_scoped_ptr(new ContextSharedData()); } - uint32 InsertSyncPoint() { return next_sync_point_++; } + uint32_t InsertSyncPoint() { return next_sync_point_++; } void GenMailbox(GLbyte* mailbox) { memset(mailbox, 0, GL_MAILBOX_SIZE_CHROMIUM); @@ -164,11 +167,11 @@ private: ContextSharedData() : next_sync_point_(1), next_mailbox_(1) {} - uint32 next_sync_point_; + uint32_t next_sync_point_; unsigned next_mailbox_; typedef base::hash_map<unsigned, scoped_refptr<TestTexture>> TextureMap; TextureMap textures_; - base::hash_map<unsigned, uint32> sync_point_for_mailbox_; + base::hash_map<unsigned, uint32_t> sync_point_for_mailbox_; }; class ResourceProviderContext : public TestWebGraphicsContext3D { @@ -179,7 +182,7 @@ } GLuint insertSyncPoint() override { - uint32 sync_point = shared_data_->InsertSyncPoint(); + uint32_t sync_point = shared_data_->InsertSyncPoint(); // Commit the produceTextureCHROMIUM calls at this point, so that // they're associated with the sync point. for (const scoped_ptr<PendingProduceTexture>& pending_texture :
diff --git a/cc/resources/resource_util.h b/cc/resources/resource_util.h index 9d9905b..68a4aa5 100644 --- a/cc/resources/resource_util.h +++ b/cc/resources/resource_util.h
@@ -5,8 +5,11 @@ #ifndef CC_RESOURCES_RESOURCE_UTIL_H_ #define CC_RESOURCES_RESOURCE_UTIL_H_ +#include <stddef.h> + #include <limits> +#include "base/macros.h" #include "base/numerics/safe_math.h" #include "cc/base/cc_export.h" #include "cc/base/math_util.h"
diff --git a/cc/resources/resource_util_unittest.cc b/cc/resources/resource_util_unittest.cc index 1fabc3b..b159d1d 100644 --- a/cc/resources/resource_util_unittest.cc +++ b/cc/resources/resource_util_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" #include "cc/resources/resource_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/resources/returned_resource.h b/cc/resources/returned_resource.h index 92e57ad..35de506a 100644 --- a/cc/resources/returned_resource.h +++ b/cc/resources/returned_resource.h
@@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/base/resource_id.h" #include "gpu/command_buffer/common/sync_token.h"
diff --git a/cc/resources/scoped_resource.h b/cc/resources/scoped_resource.h index 8924ed9..0e50d0a 100644 --- a/cc/resources/scoped_resource.h +++ b/cc/resources/scoped_resource.h
@@ -5,8 +5,8 @@ #ifndef CC_RESOURCES_SCOPED_RESOURCE_H_ #define CC_RESOURCES_SCOPED_RESOURCE_H_ -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/resources/resource.h"
diff --git a/cc/resources/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc index cb41bf6..1133f21 100644 --- a/cc/resources/scoped_resource_unittest.cc +++ b/cc/resources/scoped_resource_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/resources/scoped_resource.h" +#include <stddef.h> + #include "cc/output/renderer.h" #include "cc/test/fake_output_surface.h" #include "cc/test/fake_output_surface_client.h"
diff --git a/cc/resources/scoped_ui_resource.cc b/cc/resources/scoped_ui_resource.cc index e69b4bc..2db3edd 100644 --- a/cc/resources/scoped_ui_resource.cc +++ b/cc/resources/scoped_ui_resource.cc
@@ -4,7 +4,6 @@ #include "cc/resources/scoped_ui_resource.h" -#include "base/basictypes.h" #include "base/bind.h" #include "cc/trees/layer_tree_host.h"
diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h index 0e5a02c..0e1676f 100644 --- a/cc/resources/scoped_ui_resource.h +++ b/cc/resources/scoped_ui_resource.h
@@ -5,6 +5,7 @@ #ifndef CC_RESOURCES_SCOPED_UI_RESOURCE_H_ #define CC_RESOURCES_SCOPED_UI_RESOURCE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h" #include "cc/resources/ui_resource_bitmap.h"
diff --git a/cc/resources/shared_bitmap.cc b/cc/resources/shared_bitmap.cc index fc157363..2eb128a 100644 --- a/cc/resources/shared_bitmap.cc +++ b/cc/resources/shared_bitmap.cc
@@ -4,6 +4,9 @@ #include "cc/resources/shared_bitmap.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/numerics/safe_math.h" #include "base/rand_util.h" @@ -12,9 +15,8 @@ namespace cc { -SharedBitmap::SharedBitmap(uint8* pixels, const SharedBitmapId& id) - : pixels_(pixels), id_(id) { -} +SharedBitmap::SharedBitmap(uint8_t* pixels, const SharedBitmapId& id) + : pixels_(pixels), id_(id) {} SharedBitmap::~SharedBitmap() { }
diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h index 04dab745..c711a8b 100644 --- a/cc/resources/shared_bitmap.h +++ b/cc/resources/shared_bitmap.h
@@ -5,7 +5,10 @@ #ifndef CC_RESOURCES_SHARED_BITMAP_H_ #define CC_RESOURCES_SHARED_BITMAP_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/trace_event/memory_allocator_dump.h" #include "cc/base/cc_export.h" #include "gpu/command_buffer/common/mailbox.h" @@ -19,11 +22,11 @@ class CC_EXPORT SharedBitmap { public: - SharedBitmap(uint8* pixels, const SharedBitmapId& id); + SharedBitmap(uint8_t* pixels, const SharedBitmapId& id); virtual ~SharedBitmap(); - uint8* pixels() { return pixels_; } + uint8_t* pixels() { return pixels_; } const SharedBitmapId& id() { return id_; } @@ -41,7 +44,7 @@ static SharedBitmapId GenerateId(); private: - uint8* pixels_; + uint8_t* pixels_; SharedBitmapId id_; DISALLOW_COPY_AND_ASSIGN(SharedBitmap);
diff --git a/cc/resources/shared_bitmap_manager.h b/cc/resources/shared_bitmap_manager.h index d5239e4..881f6fa 100644 --- a/cc/resources/shared_bitmap_manager.h +++ b/cc/resources/shared_bitmap_manager.h
@@ -5,7 +5,7 @@ #ifndef CC_RESOURCES_SHARED_BITMAP_MANAGER_H_ #define CC_RESOURCES_SHARED_BITMAP_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/resources/shared_bitmap.h"
diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc index 3045671..804080c 100644 --- a/cc/resources/texture_mailbox.cc +++ b/cc/resources/texture_mailbox.cc
@@ -4,6 +4,9 @@ #include "cc/resources/texture_mailbox.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "cc/resources/shared_bitmap.h" @@ -20,7 +23,7 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox, const gpu::SyncToken& sync_token, - uint32 target) + uint32_t target) : mailbox_holder_(mailbox, sync_token, target), shared_bitmap_(NULL), is_overlay_candidate_(false), @@ -28,7 +31,7 @@ TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox, const gpu::SyncToken& sync_token, - uint32 target, + uint32_t target, const gfx::Size& size_in_pixels, bool is_overlay_candidate) : mailbox_holder_(mailbox, sync_token, target),
diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h index 01cc660..42109c68 100644 --- a/cc/resources/texture_mailbox.h +++ b/cc/resources/texture_mailbox.h
@@ -5,6 +5,9 @@ #ifndef CC_RESOURCES_TEXTURE_MAILBOX_H_ #define CC_RESOURCES_TEXTURE_MAILBOX_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/memory/shared_memory.h" @@ -23,10 +26,10 @@ explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder); TextureMailbox(const gpu::Mailbox& mailbox, const gpu::SyncToken& sync_token, - uint32 target); + uint32_t target); TextureMailbox(const gpu::Mailbox& mailbox, const gpu::SyncToken& sync_token, - uint32 target, + uint32_t target, const gfx::Size& size_in_pixels, bool is_overlay_candidate); TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size_in_pixels); @@ -40,8 +43,8 @@ bool Equals(const TextureMailbox&) const; const gpu::Mailbox& mailbox() const { return mailbox_holder_.mailbox; } - const int8* name() const { return mailbox().name; } - uint32 target() const { return mailbox_holder_.texture_target; } + const int8_t* name() const { return mailbox().name; } + uint32_t target() const { return mailbox_holder_.texture_target; } const gpu::SyncToken& sync_token() const { return mailbox_holder_.sync_token; }
diff --git a/cc/resources/transferable_resource.h b/cc/resources/transferable_resource.h index a3231bc3..55d2216a 100644 --- a/cc/resources/transferable_resource.h +++ b/cc/resources/transferable_resource.h
@@ -5,9 +5,10 @@ #ifndef CC_RESOURCES_TRANSFERABLE_RESOURCE_H_ #define CC_RESOURCES_TRANSFERABLE_RESOURCE_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/base/resource_id.h" #include "cc/resources/resource_format.h" @@ -31,7 +32,7 @@ ResourceId id; ResourceFormat format; - uint32 filter; + uint32_t filter; gfx::Size size; gpu::MailboxHolder mailbox_holder; bool read_lock_fences_enabled;
diff --git a/cc/resources/ui_resource_bitmap.cc b/cc/resources/ui_resource_bitmap.cc index 953d4199..b8fbf31a 100644 --- a/cc/resources/ui_resource_bitmap.cc +++ b/cc/resources/ui_resource_bitmap.cc
@@ -4,6 +4,8 @@ #include "cc/resources/ui_resource_bitmap.h" +#include <stdint.h> + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h index 129be967..34e73ee6 100644 --- a/cc/resources/ui_resource_bitmap.h +++ b/cc/resources/ui_resource_bitmap.h
@@ -5,6 +5,8 @@ #ifndef CC_RESOURCES_UI_RESOURCE_BITMAP_H_ #define CC_RESOURCES_UI_RESOURCE_BITMAP_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/resources/ui_resource_client.h b/cc/resources/ui_resource_client.h index 24309a5..07d5fd8 100644 --- a/cc/resources/ui_resource_client.h +++ b/cc/resources/ui_resource_client.h
@@ -5,7 +5,6 @@ #ifndef CC_RESOURCES_UI_RESOURCE_CLIENT_H_ #define CC_RESOURCES_UI_RESOURCE_CLIENT_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h"
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index 4936dae..7d57a41f 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc
@@ -4,6 +4,9 @@ #include "cc/resources/video_resource_updater.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/bind.h"
diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h index 3da2023f..1044518 100644 --- a/cc/resources/video_resource_updater.h +++ b/cc/resources/video_resource_updater.h
@@ -5,10 +5,13 @@ #ifndef CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_ #define CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc index 689de68..064829e 100644 --- a/cc/resources/video_resource_updater_unittest.cc +++ b/cc/resources/video_resource_updater_unittest.cc
@@ -4,6 +4,9 @@ #include "cc/resources/video_resource_updater.h" +#include <stddef.h> +#include <stdint.h> + #include "cc/resources/resource_provider.h" #include "cc/test/fake_output_surface.h" #include "cc/test/fake_output_surface_client.h" @@ -80,9 +83,9 @@ scoped_refptr<media::VideoFrame> CreateTestYUVVideoFrame() { const int kDimension = 10; gfx::Size size(kDimension, kDimension); - static uint8 y_data[kDimension * kDimension] = { 0 }; - static uint8 u_data[kDimension * kDimension / 2] = { 0 }; - static uint8 v_data[kDimension * kDimension / 2] = { 0 }; + static uint8_t y_data[kDimension * kDimension] = {0}; + static uint8_t u_data[kDimension * kDimension / 2] = {0}; + static uint8_t v_data[kDimension * kDimension / 2] = {0}; return media::VideoFrame::WrapExternalYuvData( media::PIXEL_FORMAT_YV16, // format
diff --git a/cc/scheduler/begin_frame_source.cc b/cc/scheduler/begin_frame_source.cc index 26819831..17b4a26 100644 --- a/cc/scheduler/begin_frame_source.cc +++ b/cc/scheduler/begin_frame_source.cc
@@ -4,6 +4,8 @@ #include "cc/scheduler/begin_frame_source.h" +#include <stddef.h> + #include "base/auto_reset.h" #include "base/location.h" #include "base/logging.h"
diff --git a/cc/scheduler/begin_frame_source.h b/cc/scheduler/begin_frame_source.h index 87ed17f6..ec8aaa5 100644 --- a/cc/scheduler/begin_frame_source.h +++ b/cc/scheduler/begin_frame_source.h
@@ -5,10 +5,14 @@ #ifndef CC_SCHEDULER_BEGIN_FRAME_SOURCE_H_ #define CC_SCHEDULER_BEGIN_FRAME_SOURCE_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "cc/output/begin_frame_args.h" #include "cc/scheduler/delay_based_time_source.h"
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc index afc3b30..43ba4fa7 100644 --- a/cc/scheduler/begin_frame_source_unittest.cc +++ b/cc/scheduler/begin_frame_source_unittest.cc
@@ -4,7 +4,8 @@ #include "cc/scheduler/begin_frame_source.h" -#include "base/basictypes.h" +#include <stdint.h> + #include "base/test/test_simple_task_runner.h" #include "cc/test/begin_frame_args_test.h" #include "cc/test/begin_frame_source_test.h"
diff --git a/cc/scheduler/compositor_timing_history.cc b/cc/scheduler/compositor_timing_history.cc index d21696d..f3ac067 100644 --- a/cc/scheduler/compositor_timing_history.cc +++ b/cc/scheduler/compositor_timing_history.cc
@@ -4,6 +4,9 @@ #include "cc/scheduler/compositor_timing_history.h" +#include <stddef.h> +#include <stdint.h> + #include "base/metrics/histogram.h" #include "base/trace_event/trace_event.h" #include "cc/debug/rendering_stats_instrumentation.h" @@ -66,7 +69,7 @@ const double kDrawEstimationPercentile = 90.0; const int kUmaDurationMinMicros = 1; -const int64 kUmaDurationMaxMicros = 1 * base::Time::kMicrosecondsPerSecond; +const int64_t kUmaDurationMaxMicros = 1 * base::Time::kMicrosecondsPerSecond; const size_t kUmaDurationBucketCount = 100; // Deprecated because they combine Browser and Renderer stats and have low
diff --git a/cc/scheduler/compositor_timing_history.h b/cc/scheduler/compositor_timing_history.h index 1523aeb4..b64dc056 100644 --- a/cc/scheduler/compositor_timing_history.h +++ b/cc/scheduler/compositor_timing_history.h
@@ -5,6 +5,7 @@ #ifndef CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_ #define CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/rolling_time_delta_history.h"
diff --git a/cc/scheduler/compositor_timing_history_unittest.cc b/cc/scheduler/compositor_timing_history_unittest.cc index 70710db..2cbc8a869 100644 --- a/cc/scheduler/compositor_timing_history_unittest.cc +++ b/cc/scheduler/compositor_timing_history_unittest.cc
@@ -4,6 +4,7 @@ #include "cc/scheduler/compositor_timing_history.h" +#include "base/macros.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/scheduler/delay_based_time_source.h b/cc/scheduler/delay_based_time_source.h index cd474a5..7f97a91 100644 --- a/cc/scheduler/delay_based_time_source.h +++ b/cc/scheduler/delay_based_time_source.h
@@ -8,6 +8,7 @@ #include <string> #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "cc/base/cc_export.h"
diff --git a/cc/scheduler/delay_based_time_source_unittest.cc b/cc/scheduler/delay_based_time_source_unittest.cc index 948e020..5e224e6 100644 --- a/cc/scheduler/delay_based_time_source_unittest.cc +++ b/cc/scheduler/delay_based_time_source_unittest.cc
@@ -4,7 +4,8 @@ #include "cc/scheduler/delay_based_time_source.h" -#include "base/basictypes.h" +#include <stdint.h> + #include "base/test/test_simple_task_runner.h" #include "cc/test/scheduler_test_common.h" #include "testing/gtest/include/gtest/gtest.h" @@ -429,7 +430,7 @@ double total_frame_time = 0.0; for (int i = 0; i < num_iterations; ++i) { - int64 delay_ms = task_runner->NextPendingTaskDelay().InMilliseconds(); + int64_t delay_ms = task_runner->NextPendingTaskDelay().InMilliseconds(); // accumulate the "delay" total_frame_time += delay_ms / 1000.0;
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h index cbb30d1..e1a067c 100644 --- a/cc/scheduler/scheduler.h +++ b/cc/scheduler/scheduler.h
@@ -8,8 +8,8 @@ #include <deque> #include <string> -#include "base/basictypes.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h"
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h index 2cc4c63..22c58d0e 100644 --- a/cc/scheduler/scheduler_state_machine.h +++ b/cc/scheduler/scheduler_state_machine.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h"
diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc index 44d16c1..668f515 100644 --- a/cc/scheduler/scheduler_state_machine_unittest.cc +++ b/cc/scheduler/scheduler_state_machine_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/scheduler/scheduler_state_machine.h" +#include <stddef.h> + #include "base/trace_event/trace_event.h" #include "cc/scheduler/scheduler.h" #include "cc/test/begin_frame_args_test.h"
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc index 17935ac..7f577a64 100644 --- a/cc/scheduler/scheduler_unittest.cc +++ b/cc/scheduler/scheduler_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/scheduler/scheduler.h" +#include <stddef.h> + #include <string> #include <vector>
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc index 1344847f..64a2906 100644 --- a/cc/surfaces/display.cc +++ b/cc/surfaces/display.cc
@@ -4,6 +4,8 @@ #include "cc/surfaces/display.h" +#include <stddef.h> + #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "cc/debug/benchmark_instrumentation.h"
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h index 7bbcd6e..6c29dc86 100644 --- a/cc/surfaces/display.h +++ b/cc/surfaces/display.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/output/output_surface_client.h" #include "cc/output/renderer.h"
diff --git a/cc/surfaces/display_scheduler.h b/cc/surfaces/display_scheduler.h index 7b043c0..838af40 100644 --- a/cc/surfaces/display_scheduler.h +++ b/cc/surfaces/display_scheduler.h
@@ -6,6 +6,7 @@ #define CC_SURFACES_DISPLAY_SCHEDULER_H_ #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h index 3094306..80d6c52 100644 --- a/cc/surfaces/onscreen_display_client.h +++ b/cc/surfaces/onscreen_display_client.h
@@ -8,6 +8,7 @@ #include "cc/surfaces/display_client.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc index 29d2c47..b60a64f 100644 --- a/cc/surfaces/surface.cc +++ b/cc/surfaces/surface.cc
@@ -4,6 +4,9 @@ #include "cc/surfaces/surface.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "cc/base/container_util.h"
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h index 267983d..a83aee38 100644 --- a/cc/surfaces/surface.h +++ b/cc/surfaces/surface.h
@@ -5,6 +5,9 @@ #ifndef CC_SURFACES_SURFACE_H_ #define CC_SURFACES_SURFACE_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <vector>
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc index 3c97bdc2..9901d00 100644 --- a/cc/surfaces/surface_aggregator.cc +++ b/cc/surfaces/surface_aggregator.cc
@@ -4,11 +4,14 @@ #include "cc/surfaces/surface_aggregator.h" +#include <stddef.h> + #include <map> #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/trace_event/trace_event.h" #include "cc/base/math_util.h"
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h index 6df7e6ba..0b640a9 100644 --- a/cc/surfaces/surface_aggregator.h +++ b/cc/surfaces/surface_aggregator.h
@@ -9,6 +9,7 @@ #include "base/containers/hash_tables.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/quads/draw_quad.h" #include "cc/quads/render_pass.h"
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc index a0ac9f0..95f02611 100644 --- a/cc/surfaces/surface_aggregator_unittest.cc +++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -4,8 +4,12 @@ #include "cc/surfaces/surface_aggregator.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> +#include "base/macros.h" #include "cc/output/compositor_frame.h" #include "cc/output/delegated_frame_data.h" #include "cc/quads/render_pass.h"
diff --git a/cc/surfaces/surface_display_output_surface.h b/cc/surfaces/surface_display_output_surface.h index 5dbbbe0..d173218 100644 --- a/cc/surfaces/surface_display_output_surface.h +++ b/cc/surfaces/surface_display_output_surface.h
@@ -5,6 +5,7 @@ #ifndef CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ +#include "base/macros.h" #include "cc/output/output_surface.h" #include "cc/surfaces/surface_factory.h" #include "cc/surfaces/surface_factory_client.h"
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h index 1347728..fdfad17 100644 --- a/cc/surfaces/surface_factory.h +++ b/cc/surfaces/surface_factory.h
@@ -9,6 +9,7 @@ #include "base/callback_forward.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc index cf242c3..540d9da 100644 --- a/cc/surfaces/surface_factory_unittest.cc +++ b/cc/surfaces/surface_factory_unittest.cc
@@ -4,9 +4,13 @@ #include "cc/surfaces/surface_factory.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "cc/output/compositor_frame.h" #include "cc/output/copy_output_request.h" #include "cc/output/copy_output_result.h" @@ -400,7 +404,7 @@ factory_->Destroy(surface_id); } -void DrawCallback(uint32* execute_count, +void DrawCallback(uint32_t* execute_count, SurfaceDrawStatus* result, SurfaceDrawStatus drawn) { *execute_count += 1; @@ -419,7 +423,7 @@ frame_data->resource_list.push_back(resource); scoped_ptr<CompositorFrame> frame(new CompositorFrame); frame->delegated_frame_data = std::move(frame_data); - uint32 execute_count = 0; + uint32_t execute_count = 0; SurfaceDrawStatus drawn = SurfaceDrawStatus::DRAW_SKIPPED; factory_->SubmitCompositorFrame(
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc index 144d0d6e..5970d45 100644 --- a/cc/surfaces/surface_hittest_unittest.cc +++ b/cc/surfaces/surface_hittest_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/output/compositor_frame.h" #include "cc/surfaces/surface.h" #include "cc/surfaces/surface_factory.h"
diff --git a/cc/surfaces/surface_id.h b/cc/surfaces/surface_id.h index 070265a..0ade6ab 100644 --- a/cc/surfaces/surface_id.h +++ b/cc/surfaces/surface_id.h
@@ -5,6 +5,9 @@ #ifndef CC_SURFACES_SURFACE_ID_H_ #define CC_SURFACES_SURFACE_ID_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/containers/hash_tables.h" namespace cc {
diff --git a/cc/surfaces/surface_id_allocator.cc b/cc/surfaces/surface_id_allocator.cc index 04f60d9f..d7146756 100644 --- a/cc/surfaces/surface_id_allocator.cc +++ b/cc/surfaces/surface_id_allocator.cc
@@ -4,6 +4,8 @@ #include "cc/surfaces/surface_id_allocator.h" +#include <stdint.h> + #include "cc/surfaces/surface_manager.h" namespace cc {
diff --git a/cc/surfaces/surface_id_allocator.h b/cc/surfaces/surface_id_allocator.h index 31b1e8717..b0f8bf4 100644 --- a/cc/surfaces/surface_id_allocator.h +++ b/cc/surfaces/surface_id_allocator.h
@@ -5,6 +5,9 @@ #ifndef CC_SURFACES_SURFACE_ID_ALLOCATOR_H_ #define CC_SURFACES_SURFACE_ID_ALLOCATOR_H_ +#include <stdint.h> + +#include "base/macros.h" #include "cc/surfaces/surface_id.h" #include "cc/surfaces/surfaces_export.h"
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc index 9ced46e..03951e41 100644 --- a/cc/surfaces/surface_manager.cc +++ b/cc/surfaces/surface_manager.cc
@@ -4,6 +4,9 @@ #include "cc/surfaces/surface_manager.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "cc/surfaces/surface.h" #include "cc/surfaces/surface_id_allocator.h"
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h index 8430ea61..74665015 100644 --- a/cc/surfaces/surface_manager.h +++ b/cc/surfaces/surface_manager.h
@@ -5,6 +5,8 @@ #ifndef CC_SURFACES_SURFACE_MANAGER_H_ #define CC_SURFACES_SURFACE_MANAGER_H_ +#include <stdint.h> + #include <list> #include <vector>
diff --git a/cc/surfaces/surface_sequence.h b/cc/surfaces/surface_sequence.h index b579296..21decf6 100644 --- a/cc/surfaces/surface_sequence.h +++ b/cc/surfaces/surface_sequence.h
@@ -5,6 +5,9 @@ #ifndef CC_SURFACES_SURFACE_SEQUENCE_H_ #define CC_SURFACES_SURFACE_SEQUENCE_H_ +#include <stddef.h> +#include <stdint.h> + #include <tuple> #include "base/containers/hash_tables.h"
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc index 9212da61..6df5bd18 100644 --- a/cc/test/animation_timelines_test_common.cc +++ b/cc/test/animation_timelines_test_common.cc
@@ -197,9 +197,11 @@ host_impl_(nullptr), timeline_id_(AnimationIdProvider::NextTimelineId()), player_id_(AnimationIdProvider::NextPlayerId()), - layer_id_(1) { + next_test_layer_id_(0) { host_ = client_.host(); host_impl_ = client_impl_.host(); + + layer_id_ = NextTestLayerId(); } AnimationTimelinesTest::~AnimationTimelinesTest() { @@ -258,4 +260,9 @@ : nullptr; } +int AnimationTimelinesTest::NextTestLayerId() { + next_test_layer_id_++; + return next_test_layer_id_; +} + } // namespace cc
diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h index 8b3996b3..518929d6 100644 --- a/cc/test/animation_timelines_test_common.h +++ b/cc/test/animation_timelines_test_common.h
@@ -174,6 +174,8 @@ AnimationPlayer* GetPlayerForLayerId(int layer_id); AnimationPlayer* GetImplPlayerForLayerId(int layer_id); + int NextTestLayerId(); + TestHostClient client_; TestHostClient client_impl_; @@ -182,7 +184,9 @@ const int timeline_id_; const int player_id_; - const int layer_id_; + int layer_id_; + + int next_test_layer_id_; scoped_refptr<AnimationTimeline> timeline_; scoped_refptr<AnimationPlayer> player_;
diff --git a/cc/test/begin_frame_args_test.cc b/cc/test/begin_frame_args_test.cc index 4c3b5a4..8b4dfd3b 100644 --- a/cc/test/begin_frame_args_test.cc +++ b/cc/test/begin_frame_args_test.cc
@@ -4,6 +4,8 @@ #include "cc/test/begin_frame_args_test.h" +#include <stdint.h> + #include "base/time/time.h" #include "cc/output/begin_frame_args.h" @@ -26,9 +28,9 @@ BeginFrameArgs CreateBeginFrameArgsForTesting( BeginFrameArgs::CreationLocation location, - int64 frame_time, - int64 deadline, - int64 interval) { + int64_t frame_time, + int64_t deadline, + int64_t interval) { return BeginFrameArgs::Create( location, base::TimeTicks::FromInternalValue(frame_time), base::TimeTicks::FromInternalValue(deadline), @@ -37,9 +39,9 @@ BeginFrameArgs CreateBeginFrameArgsForTesting( BeginFrameArgs::CreationLocation location, - int64 frame_time, - int64 deadline, - int64 interval, + int64_t frame_time, + int64_t deadline, + int64_t interval, BeginFrameArgs::BeginFrameArgsType type) { return BeginFrameArgs::Create( location, base::TimeTicks::FromInternalValue(frame_time),
diff --git a/cc/test/begin_frame_args_test.h b/cc/test/begin_frame_args_test.h index 9ef5d531..d798094 100644 --- a/cc/test/begin_frame_args_test.h +++ b/cc/test/begin_frame_args_test.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_BEGIN_FRAME_ARGS_TEST_H_ #define CC_TEST_BEGIN_FRAME_ARGS_TEST_H_ +#include <stdint.h> + #include <iosfwd> #include "base/test/simple_test_tick_clock.h" @@ -22,14 +24,14 @@ base::TimeTicks frame_time); BeginFrameArgs CreateBeginFrameArgsForTesting( BeginFrameArgs::CreationLocation location, - int64 frame_time, - int64 deadline, - int64 interval); + int64_t frame_time, + int64_t deadline, + int64_t interval); BeginFrameArgs CreateBeginFrameArgsForTesting( BeginFrameArgs::CreationLocation location, - int64 frame_time, - int64 deadline, - int64 interval, + int64_t frame_time, + int64_t deadline, + int64_t interval, BeginFrameArgs::BeginFrameArgsType type); // Creates a BeginFrameArgs using the fake Now value stored on the
diff --git a/cc/test/begin_frame_source_test.h b/cc/test/begin_frame_source_test.h index 98f5d90f..1de8b99 100644 --- a/cc/test/begin_frame_source_test.h +++ b/cc/test/begin_frame_source_test.h
@@ -5,7 +5,6 @@ #ifndef CC_TEST_BEGIN_FRAME_SOURCE_TEST_H_ #define CC_TEST_BEGIN_FRAME_SOURCE_TEST_H_ -#include "base/basictypes.h" #include "base/trace_event/trace_event_argument.h" #include "cc/scheduler/begin_frame_source.h" #include "cc/test/begin_frame_args_test.h"
diff --git a/cc/test/failure_output_surface.h b/cc/test/failure_output_surface.h index 4878ea50..a7aca5b 100644 --- a/cc/test/failure_output_surface.h +++ b/cc/test/failure_output_surface.h
@@ -5,6 +5,7 @@ #ifndef CC_TEST_FAILURE_OUTPUT_SURFACE_H_ #define CC_TEST_FAILURE_OUTPUT_SURFACE_H_ +#include "base/macros.h" #include "cc/test/fake_output_surface.h" namespace cc {
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc index 6ffa8fef..7876d29 100644 --- a/cc/test/fake_content_layer_client.cc +++ b/cc/test/fake_content_layer_client.cc
@@ -4,6 +4,8 @@ #include "cc/test/fake_content_layer_client.h" +#include <stddef.h> + #include "cc/playback/clip_display_item.h" #include "cc/playback/display_item_list_settings.h" #include "cc/playback/drawing_display_item.h"
diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index c63f5d2b..53548338c 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_ #define CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_ +#include <stddef.h> + #include <utility> #include <vector>
diff --git a/cc/test/fake_display_list_recording_source.h b/cc/test/fake_display_list_recording_source.h index cb526ad..158c053 100644 --- a/cc/test/fake_display_list_recording_source.h +++ b/cc/test/fake_display_list_recording_source.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_ #define CC_TEST_FAKE_DISPLAY_LIST_RECORDING_SOURCE_H_ +#include <stddef.h> + #include "cc/base/region.h" #include "cc/playback/display_list_recording_source.h" #include "cc/test/fake_content_layer_client.h"
diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc index e837ab7..ae477040 100644 --- a/cc/test/fake_layer_tree_host_impl.cc +++ b/cc/test/fake_layer_tree_host_impl.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/test/begin_frame_args_test.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/layer_tree_settings_for_testing.h"
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index 6804b13..a7a68bd 100644 --- a/cc/test/fake_output_surface.h +++ b/cc/test/fake_output_surface.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_ #define CC_TEST_FAKE_OUTPUT_SURFACE_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/logging.h" #include "base/time/time.h"
diff --git a/cc/test/fake_painted_scrollbar_layer.h b/cc/test/fake_painted_scrollbar_layer.h index 72ea250d..95ed921 100644 --- a/cc/test/fake_painted_scrollbar_layer.h +++ b/cc/test/fake_painted_scrollbar_layer.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_ #define CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/layers/painted_scrollbar_layer.h" #include "cc/test/fake_scrollbar.h"
diff --git a/cc/test/fake_picture_layer.h b/cc/test/fake_picture_layer.h index 96dae06..6bb9b175 100644 --- a/cc/test/fake_picture_layer.h +++ b/cc/test/fake_picture_layer.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_PICTURE_LAYER_H_ #define CC_TEST_FAKE_PICTURE_LAYER_H_ +#include <stddef.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/layers/picture_layer.h"
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc index 8743287..545cc89 100644 --- a/cc/test/fake_picture_layer_impl.cc +++ b/cc/test/fake_picture_layer_impl.cc
@@ -4,6 +4,8 @@ #include "cc/test/fake_picture_layer_impl.h" +#include <stddef.h> + #include <vector> #include "cc/tiles/tile.h" #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h index 3d8431ea..759bb83 100644 --- a/cc/test/fake_picture_layer_impl.h +++ b/cc/test/fake_picture_layer_impl.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_ #define CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_ +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "cc/layers/picture_layer_impl.h" #include "cc/playback/display_list_raster_source.h"
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc index 67785ca..aa76d6a5 100644 --- a/cc/test/fake_picture_layer_tiling_client.cc +++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -4,6 +4,8 @@ #include "cc/test/fake_picture_layer_tiling_client.h" +#include <stddef.h> + #include <limits> #include "base/thread_task_runner_handle.h"
diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h index 4ad254f..0279d73 100644 --- a/cc/test/fake_resource_provider.h +++ b/cc/test/fake_resource_provider.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_FAKE_RESOURCE_PROVIDER_H_ #define CC_TEST_FAKE_RESOURCE_PROVIDER_H_ +#include <stddef.h> + #include "cc/resources/resource_provider.h" #include "ui/gfx/buffer_types.h"
diff --git a/cc/test/fake_scrollbar.h b/cc/test/fake_scrollbar.h index 8ae49e441..6dccdc3 100644 --- a/cc/test/fake_scrollbar.h +++ b/cc/test/fake_scrollbar.h
@@ -6,6 +6,7 @@ #define CC_TEST_FAKE_SCROLLBAR_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "cc/input/scrollbar.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc index 1025192..9dde7495 100644 --- a/cc/test/fake_tile_manager.cc +++ b/cc/test/fake_tile_manager.cc
@@ -4,6 +4,9 @@ #include "cc/test/fake_tile_manager.h" +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <limits>
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index a2559769..f482544f0 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc
@@ -4,6 +4,8 @@ #include "cc/test/layer_test_common.h" +#include <stddef.h> + #include "cc/base/math_util.h" #include "cc/base/region.h" #include "cc/layers/append_quads_data.h"
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h index a0256296..80c1980 100644 --- a/cc/test/layer_test_common.h +++ b/cc/test/layer_test_common.h
@@ -5,9 +5,10 @@ #ifndef CC_TEST_LAYER_TEST_COMMON_H_ #define CC_TEST_LAYER_TEST_COMMON_H_ +#include <stddef.h> + #include <utility> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/quads/render_pass.h" #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc index 02b66ac2..0f07a43 100644 --- a/cc/test/layer_tree_host_common_test.cc +++ b/cc/test/layer_tree_host_common_test.cc
@@ -4,6 +4,8 @@ #include "cc/test/layer_tree_host_common_test.h" +#include <stddef.h> + #include "cc/layers/layer.h" #include "cc/layers/layer_impl.h" #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc index f2dc8a8..4dd3d66 100644 --- a/cc/test/layer_tree_json_parser.cc +++ b/cc/test/layer_tree_json_parser.cc
@@ -4,6 +4,8 @@ #include "cc/test/layer_tree_json_parser.h" +#include <stddef.h> + #include "base/test/values_test_util.h" #include "base/values.h" #include "cc/layers/layer.h"
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc index d0f7544..f1110329 100644 --- a/cc/test/layer_tree_json_parser_unittest.cc +++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/test/layer_tree_json_parser.h" +#include <stddef.h> + #include "cc/layers/layer.h" #include "cc/test/fake_impl_task_runner_provider.h" #include "cc/test/fake_layer_tree_host.h"
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index fa2549e..48a5dbbd 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc
@@ -4,6 +4,9 @@ #include "cc/test/layer_tree_pixel_test.h" +#include <stddef.h> +#include <stdint.h> + #include "base/command_line.h" #include "base/path_service.h" #include "cc/base/switches.h" @@ -232,7 +235,7 @@ EXPECT_EQ(static_cast<unsigned>(GL_FRAMEBUFFER_COMPLETE), gl->CheckFramebufferStatus(GL_FRAMEBUFFER)); - scoped_ptr<uint8[]> pixels(new uint8[size.GetArea() * 4]); + scoped_ptr<uint8_t[]> pixels(new uint8_t[size.GetArea() * 4]); gl->ReadPixels(0, 0, size.width(), @@ -247,7 +250,7 @@ scoped_ptr<SkBitmap> bitmap(new SkBitmap); bitmap->allocN32Pixels(size.width(), size.height()); - uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels()); + uint8_t* out_pixels = static_cast<uint8_t*>(bitmap->getPixels()); size_t row_bytes = size.width() * 4; size_t total_bytes = size.height() * row_bytes;
diff --git a/cc/test/mock_occlusion_tracker.h b/cc/test/mock_occlusion_tracker.h index b291bf5..47f1f0e 100644 --- a/cc/test/mock_occlusion_tracker.h +++ b/cc/test/mock_occlusion_tracker.h
@@ -5,6 +5,7 @@ #ifndef CC_TEST_MOCK_OCCLUSION_TRACKER_H_ #define CC_TEST_MOCK_OCCLUSION_TRACKER_H_ +#include "base/macros.h" #include "cc/trees/occlusion_tracker.h" namespace cc {
diff --git a/cc/test/ordered_simple_task_runner.cc b/cc/test/ordered_simple_task_runner.cc index 3e0864c..dea8556 100644 --- a/cc/test/ordered_simple_task_runner.cc +++ b/cc/test/ordered_simple_task_runner.cc
@@ -4,6 +4,9 @@ #include "cc/test/ordered_simple_task_runner.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> #include <set> #include <sstream>
diff --git a/cc/test/ordered_simple_task_runner.h b/cc/test/ordered_simple_task_runner.h index 91ea4be..c7abe40 100644 --- a/cc/test/ordered_simple_task_runner.h +++ b/cc/test/ordered_simple_task_runner.h
@@ -5,13 +5,15 @@ #ifndef CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_ #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_ +#include <stddef.h> + #include <limits> #include <set> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_simple_task_runner.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/test/ordered_simple_task_runner_unittest.cc b/cc/test/ordered_simple_task_runner_unittest.cc index 437235e..cb3c4c54 100644 --- a/cc/test/ordered_simple_task_runner_unittest.cc +++ b/cc/test/ordered_simple_task_runner_unittest.cc
@@ -6,6 +6,7 @@ #include "base/cancelable_callback.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/test/test_pending_task.h"
diff --git a/cc/test/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc index 649700c..a474dbf 100644 --- a/cc/test/ordered_texture_map.cc +++ b/cc/test/ordered_texture_map.cc
@@ -4,6 +4,8 @@ #include "cc/test/ordered_texture_map.h" +#include <stddef.h> + #include "base/logging.h" #include "cc/test/test_texture.h"
diff --git a/cc/test/ordered_texture_map.h b/cc/test/ordered_texture_map.h index 2aa3111..8b2a6ca9 100644 --- a/cc/test/ordered_texture_map.h +++ b/cc/test/ordered_texture_map.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_ORDERED_TEXTURE_MAP_H_ #define CC_TEST_ORDERED_TEXTURE_MAP_H_ +#include <stddef.h> + #include <vector> #include "base/containers/hash_tables.h"
diff --git a/cc/test/pixel_comparator.cc b/cc/test/pixel_comparator.cc index 4067787..4b43188 100644 --- a/cc/test/pixel_comparator.cc +++ b/cc/test/pixel_comparator.cc
@@ -4,6 +4,8 @@ #include "cc/test/pixel_comparator.h" +#include <stdint.h> + #include <algorithm> #include "base/logging.h" @@ -75,10 +77,10 @@ // Number of pixels with a small error int small_error_pixels_count = 0; // The per channel sums of absolute errors over all pixels. - int64 sum_abs_error_r = 0; - int64 sum_abs_error_g = 0; - int64 sum_abs_error_b = 0; - int64 sum_abs_error_a = 0; + int64_t sum_abs_error_r = 0; + int64_t sum_abs_error_g = 0; + int64_t sum_abs_error_b = 0; + int64_t sum_abs_error_a = 0; // The per channel maximum absolute errors over all pixels. int max_abs_error_r = 0; int max_abs_error_g = 0;
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index 1bb99665..b0464c24 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc
@@ -4,6 +4,8 @@ #include "cc/test/render_pass_test_utils.h" +#include <stdint.h> + #include "base/bind.h" #include "cc/quads/debug_border_draw_quad.h" #include "cc/quads/io_surface_draw_quad.h"
diff --git a/cc/test/render_pass_test_utils.h b/cc/test/render_pass_test_utils.h index 9182b5a..3cf34ee 100644 --- a/cc/test/render_pass_test_utils.h +++ b/cc/test/render_pass_test_utils.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_RENDER_PASS_TEST_UTILS_H_ #define CC_TEST_RENDER_PASS_TEST_UTILS_H_ +#include <stdint.h> + #include "cc/output/filter_operations.h" #include "cc/quads/render_pass.h" #include "cc/resources/resource_provider.h"
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc index c04c1e00..4d7f06d 100644 --- a/cc/test/scheduler_test_common.cc +++ b/cc/test/scheduler_test_common.cc
@@ -4,6 +4,8 @@ #include "cc/test/scheduler_test_common.h" +#include <stddef.h> + #include <string> #include "base/logging.h"
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index 5cb3377c..e561d82 100644 --- a/cc/test/scheduler_test_common.h +++ b/cc/test/scheduler_test_common.h
@@ -5,9 +5,11 @@ #ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_ #define CC_TEST_SCHEDULER_TEST_COMMON_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/scheduler/compositor_timing_history.h"
diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc index aed4025..c237c39e 100644 --- a/cc/test/skia_common.cc +++ b/cc/test/skia_common.cc
@@ -4,6 +4,8 @@ #include "cc/test/skia_common.h" +#include <stddef.h> + #include "cc/playback/display_item_list.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc index a4f01ca..2973afff 100644 --- a/cc/test/solid_color_content_layer_client.cc +++ b/cc/test/solid_color_content_layer_client.cc
@@ -4,6 +4,8 @@ #include "cc/test/solid_color_content_layer_client.h" +#include <stddef.h> + #include "cc/playback/display_item_list_settings.h" #include "cc/playback/drawing_display_item.h" #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/test/solid_color_content_layer_client.h b/cc/test/solid_color_content_layer_client.h index 1176abe..d765f94 100644 --- a/cc/test/solid_color_content_layer_client.h +++ b/cc/test/solid_color_content_layer_client.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_SOLID_COLOR_CONTENT_LAYER_CLIENT_H_ #define CC_TEST_SOLID_COLOR_CONTENT_LAYER_CLIENT_H_ +#include <stddef.h> + #include "base/compiler_specific.h" #include "cc/layers/content_layer_client.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/test/surface_aggregator_test_helpers.cc b/cc/test/surface_aggregator_test_helpers.cc index 05e54b7a..2b0aff5 100644 --- a/cc/test/surface_aggregator_test_helpers.cc +++ b/cc/test/surface_aggregator_test_helpers.cc
@@ -4,6 +4,8 @@ #include "cc/test/surface_aggregator_test_helpers.h" +#include <stddef.h> + #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "cc/layers/append_quads_data.h"
diff --git a/cc/test/surface_aggregator_test_helpers.h b/cc/test/surface_aggregator_test_helpers.h index ae3347c..356033d 100644 --- a/cc/test/surface_aggregator_test_helpers.h +++ b/cc/test/surface_aggregator_test_helpers.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ #define CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_ +#include <stddef.h> + #include <vector> #include "cc/quads/draw_quad.h"
diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc index 3a570cab..c9de320 100644 --- a/cc/test/test_context_provider.cc +++ b/cc/test/test_context_provider.cc
@@ -4,6 +4,9 @@ #include "cc/test/test_context_provider.h" +#include <stddef.h> +#include <stdint.h> + #include <set> #include <vector>
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h index 1b7a915..b0ac88ea 100644 --- a/cc/test/test_context_provider.h +++ b/cc/test/test_context_provider.h
@@ -5,7 +5,11 @@ #ifndef CC_TEST_TEST_CONTEXT_PROVIDER_H_ #define CC_TEST_TEST_CONTEXT_PROVIDER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/cc/test/test_context_support.cc b/cc/test/test_context_support.cc index 0c74ec8..bf033fc6 100644 --- a/cc/test/test_context_support.cc +++ b/cc/test/test_context_support.cc
@@ -4,6 +4,9 @@ #include "cc/test/test_context_support.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -16,7 +19,7 @@ TestContextSupport::~TestContextSupport() {} -void TestContextSupport::SignalSyncPoint(uint32 sync_point, +void TestContextSupport::SignalSyncPoint(uint32_t sync_point, const base::Closure& callback) { sync_point_callbacks_.push_back(callback); base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -32,7 +35,7 @@ weak_ptr_factory_.GetWeakPtr())); } -void TestContextSupport::SignalQuery(uint32 query, +void TestContextSupport::SignalQuery(uint32_t query, const base::Closure& callback) { sync_point_callbacks_.push_back(callback); base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -68,12 +71,12 @@ void TestContextSupport::Swap() { } -uint32 TestContextSupport::InsertFutureSyncPointCHROMIUM() { +uint32_t TestContextSupport::InsertFutureSyncPointCHROMIUM() { NOTIMPLEMENTED(); return 0; } -void TestContextSupport::RetireSyncPointCHROMIUM(uint32 sync_point) { +void TestContextSupport::RetireSyncPointCHROMIUM(uint32_t sync_point) { NOTIMPLEMENTED(); }
diff --git a/cc/test/test_context_support.h b/cc/test/test_context_support.h index f619ac1..d82c7ae4 100644 --- a/cc/test/test_context_support.h +++ b/cc/test/test_context_support.h
@@ -5,8 +5,11 @@ #ifndef CC_TEST_TEST_CONTEXT_SUPPORT_H_ #define CC_TEST_TEST_CONTEXT_SUPPORT_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "gpu/command_buffer/client/context_support.h" @@ -23,17 +26,17 @@ ~TestContextSupport() override; // gpu::ContextSupport implementation. - void SignalSyncPoint(uint32 sync_point, + void SignalSyncPoint(uint32_t sync_point, const base::Closure& callback) override; void SignalSyncToken(const gpu::SyncToken& sync_token, const base::Closure& callback) override; - void SignalQuery(uint32 query, const base::Closure& callback) override; + void SignalQuery(uint32_t query, const base::Closure& callback) override; void SetAggressivelyFreeResources(bool aggressively_free_resources) override; void Swap() override; void PartialSwapBuffers(const gfx::Rect& sub_buffer) override; void CommitOverlayPlanes() override; - uint32 InsertFutureSyncPointCHROMIUM() override; - void RetireSyncPointCHROMIUM(uint32 sync_point) override; + uint32_t InsertFutureSyncPointCHROMIUM() override; + void RetireSyncPointCHROMIUM(uint32_t sync_point) override; void ScheduleOverlayPlane(int plane_z_order, gfx::OverlayTransform plane_transform, unsigned overlay_texture_id,
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc index 273ed36..e1e6e89 100644 --- a/cc/test/test_gpu_memory_buffer_manager.cc +++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -4,6 +4,9 @@ #include "cc/test/test_gpu_memory_buffer_manager.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "ui/gfx/buffer_format_util.h"
diff --git a/cc/test/test_gpu_memory_buffer_manager.h b/cc/test/test_gpu_memory_buffer_manager.h index 85f642cb..fcaaa32a 100644 --- a/cc/test/test_gpu_memory_buffer_manager.h +++ b/cc/test/test_gpu_memory_buffer_manager.h
@@ -5,6 +5,7 @@ #ifndef CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_ #define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_ +#include "base/macros.h" #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" namespace cc {
diff --git a/cc/test/test_image_factory.cc b/cc/test/test_image_factory.cc index 79c2e7e..e9a09bee 100644 --- a/cc/test/test_image_factory.cc +++ b/cc/test/test_image_factory.cc
@@ -4,6 +4,8 @@ #include "cc/test/test_image_factory.h" +#include <stddef.h> + #include "base/numerics/safe_conversions.h" #include "ui/gl/gl_image_shared_memory.h"
diff --git a/cc/test/test_image_factory.h b/cc/test/test_image_factory.h index 3cf0c19..42a92e3 100644 --- a/cc/test/test_image_factory.h +++ b/cc/test/test_image_factory.h
@@ -5,6 +5,7 @@ #ifndef CC_TEST_TEST_IMAGE_FACTORY_H_ #define CC_TEST_TEST_IMAGE_FACTORY_H_ +#include "base/macros.h" #include "gpu/command_buffer/service/image_factory.h" namespace cc {
diff --git a/cc/test/test_in_process_context_provider.cc b/cc/test/test_in_process_context_provider.cc index a0b4c28..fd1745e2 100644 --- a/cc/test/test_in_process_context_provider.cc +++ b/cc/test/test_in_process_context_provider.cc
@@ -4,7 +4,10 @@ #include "cc/test/test_in_process_context_provider.h" +#include <stdint.h> + #include "base/lazy_instance.h" +#include "base/macros.h" #include "cc/resources/platform_color.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gl_in_process_context.h"
diff --git a/cc/test/test_in_process_context_provider.h b/cc/test/test_in_process_context_provider.h index 904ac6d1..b8e1bf8 100644 --- a/cc/test/test_in_process_context_provider.h +++ b/cc/test/test_in_process_context_provider.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ #define CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ +#include <stdint.h> + #include "base/synchronization/lock.h" #include "cc/output/context_provider.h" #include "cc/test/test_gpu_memory_buffer_manager.h"
diff --git a/cc/test/test_occlusion_tracker.h b/cc/test/test_occlusion_tracker.h index 7697bd1e1..d074168 100644 --- a/cc/test/test_occlusion_tracker.h +++ b/cc/test/test_occlusion_tracker.h
@@ -5,6 +5,8 @@ #ifndef CC_TEST_TEST_OCCLUSION_TRACKER_H_ #define CC_TEST_TEST_OCCLUSION_TRACKER_H_ +#include <stddef.h> + #include "cc/layers/render_surface_impl.h" #include "cc/trees/occlusion_tracker.h"
diff --git a/cc/test/test_shared_bitmap_manager.cc b/cc/test/test_shared_bitmap_manager.cc index ef3b484..589a782 100644 --- a/cc/test/test_shared_bitmap_manager.cc +++ b/cc/test/test_shared_bitmap_manager.cc
@@ -4,6 +4,8 @@ #include "cc/test/test_shared_bitmap_manager.h" +#include <stdint.h> + #include "base/memory/shared_memory.h" namespace cc { @@ -13,7 +15,7 @@ public: OwnedSharedBitmap(scoped_ptr<base::SharedMemory> shared_memory, const SharedBitmapId& id) - : SharedBitmap(static_cast<uint8*>(shared_memory->memory()), id), + : SharedBitmap(static_cast<uint8_t*>(shared_memory->memory()), id), shared_memory_(std::move(shared_memory)) {} ~OwnedSharedBitmap() override {} @@ -44,7 +46,7 @@ base::AutoLock lock(lock_); if (bitmap_map_.find(id) == bitmap_map_.end()) return nullptr; - uint8* pixels = static_cast<uint8*>(bitmap_map_[id]->memory()); + uint8_t* pixels = static_cast<uint8_t*>(bitmap_map_[id]->memory()); return make_scoped_ptr(new SharedBitmap(pixels, id)); }
diff --git a/cc/test/test_task_graph_runner.h b/cc/test/test_task_graph_runner.h index 60ddca1..b0e9bc40 100644 --- a/cc/test/test_task_graph_runner.h +++ b/cc/test/test_task_graph_runner.h
@@ -5,6 +5,7 @@ #ifndef CC_TEST_TEST_TASK_GRAPH_RUNNER_H_ #define CC_TEST_TEST_TASK_GRAPH_RUNNER_H_ +#include "base/macros.h" #include "base/threading/simple_thread.h" #include "cc/raster/single_thread_task_graph_runner.h"
diff --git a/cc/test/test_texture.cc b/cc/test/test_texture.cc index b9fff8d..fea16fbd 100644 --- a/cc/test/test_texture.cc +++ b/cc/test/test_texture.cc
@@ -4,6 +4,9 @@ #include "cc/test/test_texture.h" +#include <stddef.h> +#include <stdint.h> + #include "gpu/GLES2/gl2extchromium.h" #include "third_party/khronos/GLES2/gl2ext.h"
diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h index 9265589..c5b6e21 100644 --- a/cc/test/test_texture.h +++ b/cc/test/test_texture.h
@@ -5,6 +5,9 @@ #ifndef CC_TEST_TEST_TEXTURE_H_ #define CC_TEST_TEST_TEXTURE_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc index 72ac8ad..96b11b4a 100644 --- a/cc/test/test_web_graphics_context_3d.cc +++ b/cc/test/test_web_graphics_context_3d.cc
@@ -4,6 +4,9 @@ #include "cc/test/test_web_graphics_context_3d.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> @@ -548,7 +551,7 @@ size_t old_size = buffer->size; - buffer->pixels.reset(new uint8[size]); + buffer->pixels.reset(new uint8_t[size]); buffer->size = size; if (data != NULL) memcpy(buffer->pixels.get(), data, size);
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h index 4e6d7611..08447f7c 100644 --- a/cc/test/test_web_graphics_context_3d.h +++ b/cc/test/test_web_graphics_context_3d.h
@@ -5,12 +5,16 @@ #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -407,7 +411,7 @@ ~Buffer(); GLenum target; - scoped_ptr<uint8[]> pixels; + scoped_ptr<uint8_t[]> pixels; size_t size; private: @@ -418,7 +422,7 @@ Image(); ~Image(); - scoped_ptr<uint8[]> pixels; + scoped_ptr<uint8_t[]> pixels; private: DISALLOW_COPY_AND_ASSIGN(Image);
diff --git a/cc/tiles/eviction_tile_priority_queue.h b/cc/tiles/eviction_tile_priority_queue.h index 3198889..558c1fe 100644 --- a/cc/tiles/eviction_tile_priority_queue.h +++ b/cc/tiles/eviction_tile_priority_queue.h
@@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/picture_layer_impl.h" #include "cc/tiles/tile_priority.h"
diff --git a/cc/tiles/image_decode_controller.cc b/cc/tiles/image_decode_controller.cc index 70b6dc7..914f7e5 100644 --- a/cc/tiles/image_decode_controller.cc +++ b/cc/tiles/image_decode_controller.cc
@@ -4,6 +4,9 @@ #include "cc/tiles/image_decode_controller.h" +#include <stdint.h> + +#include "base/macros.h" #include "cc/debug/devtools_instrumentation.h" namespace cc {
diff --git a/cc/tiles/image_decode_controller.h b/cc/tiles/image_decode_controller.h index f07892c1..f63361a 100644 --- a/cc/tiles/image_decode_controller.h +++ b/cc/tiles/image_decode_controller.h
@@ -5,6 +5,8 @@ #ifndef CC_TILES_IMAGE_DECODE_CONTROLLER_H_ #define CC_TILES_IMAGE_DECODE_CONTROLLER_H_ +#include <stdint.h> + #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h"
diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc index 747dd94..7390913 100644 --- a/cc/tiles/picture_layer_tiling.cc +++ b/cc/tiles/picture_layer_tiling.cc
@@ -4,6 +4,8 @@ #include "cc/tiles/picture_layer_tiling.h" +#include <stddef.h> + #include <algorithm> #include <cmath> #include <limits>
diff --git a/cc/tiles/picture_layer_tiling.h b/cc/tiles/picture_layer_tiling.h index 0d38f1e..9185d5d 100644 --- a/cc/tiles/picture_layer_tiling.h +++ b/cc/tiles/picture_layer_tiling.h
@@ -5,12 +5,15 @@ #ifndef CC_TILES_PICTURE_LAYER_TILING_H_ #define CC_TILES_PICTURE_LAYER_TILING_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/base/region.h" @@ -70,9 +73,9 @@ template <> struct hash<cc::TileMapKey> { size_t operator()(const cc::TileMapKey& key) const { - uint16 value1 = static_cast<uint16>(key.index_x); - uint16 value2 = static_cast<uint16>(key.index_y); - uint32 value1_32 = value1; + uint16_t value1 = static_cast<uint16_t>(key.index_x); + uint16_t value2 = static_cast<uint16_t>(key.index_y); + uint32_t value1_32 = value1; return (value1_32 << 16) | value2; } };
diff --git a/cc/tiles/picture_layer_tiling_set.cc b/cc/tiles/picture_layer_tiling_set.cc index 77589c1..014e281 100644 --- a/cc/tiles/picture_layer_tiling_set.cc +++ b/cc/tiles/picture_layer_tiling_set.cc
@@ -4,6 +4,8 @@ #include "cc/tiles/picture_layer_tiling_set.h" +#include <stddef.h> + #include <limits> #include <set> #include <vector>
diff --git a/cc/tiles/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h index ed1038f..56122870 100644 --- a/cc/tiles/picture_layer_tiling_set.h +++ b/cc/tiles/picture_layer_tiling_set.h
@@ -5,9 +5,12 @@ #ifndef CC_TILES_PICTURE_LAYER_TILING_SET_H_ #define CC_TILES_PICTURE_LAYER_TILING_SET_H_ +#include <stddef.h> + #include <set> #include <vector> +#include "base/macros.h" #include "cc/base/region.h" #include "cc/tiles/picture_layer_tiling.h" #include "ui/gfx/geometry/size.h"
diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc index b3aeecc..b937804 100644 --- a/cc/tiles/picture_layer_tiling_unittest.cc +++ b/cc/tiles/picture_layer_tiling_unittest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <limits> #include <set> +#include "base/macros.h" #include "cc/base/math_util.h" #include "cc/test/fake_display_list_raster_source.h" #include "cc/test/fake_output_surface.h"
diff --git a/cc/tiles/raster_tile_priority_queue.h b/cc/tiles/raster_tile_priority_queue.h index e2187d2c..828f3cf 100644 --- a/cc/tiles/raster_tile_priority_queue.h +++ b/cc/tiles/raster_tile_priority_queue.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/picture_layer_impl.h" #include "cc/tiles/tile_priority.h"
diff --git a/cc/tiles/raster_tile_priority_queue_all.h b/cc/tiles/raster_tile_priority_queue_all.h index 10dc1f7..275a731 100644 --- a/cc/tiles/raster_tile_priority_queue_all.h +++ b/cc/tiles/raster_tile_priority_queue_all.h
@@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/picture_layer_impl.h" #include "cc/tiles/raster_tile_priority_queue.h"
diff --git a/cc/tiles/raster_tile_priority_queue_required.h b/cc/tiles/raster_tile_priority_queue_required.h index 3719d95..f88993f 100644 --- a/cc/tiles/raster_tile_priority_queue_required.h +++ b/cc/tiles/raster_tile_priority_queue_required.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "cc/layers/picture_layer_impl.h" #include "cc/tiles/raster_tile_priority_queue.h" #include "cc/tiles/tiling_set_raster_queue_required.h"
diff --git a/cc/tiles/tile.cc b/cc/tiles/tile.cc index 87ec3f7..81dce76 100644 --- a/cc/tiles/tile.cc +++ b/cc/tiles/tile.cc
@@ -4,6 +4,8 @@ #include "cc/tiles/tile.h" +#include <stddef.h> + #include <algorithm> #include "base/numerics/safe_conversions.h"
diff --git a/cc/tiles/tile.h b/cc/tiles/tile.h index e245e011..6ca9e87e 100644 --- a/cc/tiles/tile.h +++ b/cc/tiles/tile.h
@@ -5,6 +5,10 @@ #ifndef CC_TILES_TILE_H_ #define CC_TILES_TILE_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/tiles/tile_draw_info.h" #include "ui/gfx/geometry/rect.h" @@ -45,7 +49,7 @@ enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0, IS_OPAQUE = 1 << 1 }; - typedef uint64 Id; + typedef uint64_t Id; Id id() const { return id_;
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc index 0e9cb1c..400fff2 100644 --- a/cc/tiles/tile_manager.cc +++ b/cc/tiles/tile_manager.cc
@@ -4,6 +4,9 @@ #include "cc/tiles/tile_manager.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include <string> @@ -11,6 +14,7 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event_argument.h" @@ -1102,14 +1106,14 @@ TileManager::MemoryUsage::MemoryUsage(size_t memory_bytes, size_t resource_count) - : memory_bytes_(static_cast<int64>(memory_bytes)), + : memory_bytes_(static_cast<int64_t>(memory_bytes)), resource_count_(static_cast<int>(resource_count)) { // MemoryUsage is constructed using size_ts, since it deals with memory and // the inputs are typically size_t. However, during the course of usage (in // particular operator-=) can cause internal values to become negative. Thus, // member variables are signed. DCHECK_LE(memory_bytes, - static_cast<size_t>(std::numeric_limits<int64>::max())); + static_cast<size_t>(std::numeric_limits<int64_t>::max())); DCHECK_LE(resource_count, static_cast<size_t>(std::numeric_limits<int>::max())); }
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h index c041ce24..00f22e3 100644 --- a/cc/tiles/tile_manager.h +++ b/cc/tiles/tile_manager.h
@@ -5,11 +5,15 @@ #ifndef CC_TILES_TILE_MANAGER_H_ #define CC_TILES_TILE_MANAGER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <utility> #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "cc/base/unique_notifier.h" @@ -228,10 +232,10 @@ MemoryUsage operator-(const MemoryUsage& other); bool Exceeds(const MemoryUsage& limit) const; - int64 memory_bytes() const { return memory_bytes_; } + int64_t memory_bytes() const { return memory_bytes_; } private: - int64 memory_bytes_; + int64_t memory_bytes_; int resource_count_; };
diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc index 2806b04..07bbb2b 100644 --- a/cc/tiles/tile_manager_perftest.cc +++ b/cc/tiles/tile_manager_perftest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/lazy_instance.h" #include "base/location.h" #include "base/thread_task_runner_handle.h"
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc index 2c69999b..ff67be2 100644 --- a/cc/tiles/tile_manager_unittest.cc +++ b/cc/tiles/tile_manager_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "cc/playback/display_list_raster_source.h"
diff --git a/cc/tiles/tile_priority.h b/cc/tiles/tile_priority.h index 184fc2dd..023fac53 100644 --- a/cc/tiles/tile_priority.h +++ b/cc/tiles/tile_priority.h
@@ -5,6 +5,8 @@ #ifndef CC_TILES_TILE_PRIORITY_H_ #define CC_TILES_TILE_PRIORITY_H_ +#include <stddef.h> + #include <algorithm> #include <limits> #include <string>
diff --git a/cc/tiles/tiling_set_eviction_queue.cc b/cc/tiles/tiling_set_eviction_queue.cc index 4b314d7..45bab03 100644 --- a/cc/tiles/tiling_set_eviction_queue.cc +++ b/cc/tiles/tiling_set_eviction_queue.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include "cc/tiles/tiling_set_eviction_queue.h"
diff --git a/cc/tiles/tiling_set_eviction_queue.h b/cc/tiles/tiling_set_eviction_queue.h index dc9b686..493d74a 100644 --- a/cc/tiles/tiling_set_eviction_queue.h +++ b/cc/tiles/tiling_set_eviction_queue.h
@@ -5,6 +5,8 @@ #ifndef CC_TILES_TILING_SET_EVICTION_QUEUE_H_ #define CC_TILES_TILING_SET_EVICTION_QUEUE_H_ +#include <stddef.h> + #include <vector> #include "cc/base/cc_export.h"
diff --git a/cc/tiles/tiling_set_raster_queue_all.cc b/cc/tiles/tiling_set_raster_queue_all.cc index 1cac85d..1ed618a 100644 --- a/cc/tiles/tiling_set_raster_queue_all.cc +++ b/cc/tiles/tiling_set_raster_queue_all.cc
@@ -4,6 +4,8 @@ #include "cc/tiles/tiling_set_raster_queue_all.h" +#include <stddef.h> + #include <utility> #include "cc/tiles/picture_layer_tiling_set.h"
diff --git a/cc/tiles/tiling_set_raster_queue_all.h b/cc/tiles/tiling_set_raster_queue_all.h index d6f7946..c49a37e 100644 --- a/cc/tiles/tiling_set_raster_queue_all.h +++ b/cc/tiles/tiling_set_raster_queue_all.h
@@ -5,7 +5,10 @@ #ifndef CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_ #define CC_TILES_TILING_SET_RASTER_QUEUE_ALL_H_ +#include <stddef.h> + #include "base/containers/stack_container.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/tiles/picture_layer_tiling_set.h" #include "cc/tiles/prioritized_tile.h"
diff --git a/cc/tiles/tiling_set_raster_queue_required.cc b/cc/tiles/tiling_set_raster_queue_required.cc index 59696e40..b0173c9 100644 --- a/cc/tiles/tiling_set_raster_queue_required.cc +++ b/cc/tiles/tiling_set_raster_queue_required.cc
@@ -4,6 +4,8 @@ #include "cc/tiles/tiling_set_raster_queue_required.h" +#include <stddef.h> + #include <utility> #include "cc/tiles/picture_layer_tiling_set.h"
diff --git a/cc/trees/blocking_task_runner.cc b/cc/trees/blocking_task_runner.cc index b0a935e..c276044 100644 --- a/cc/trees/blocking_task_runner.cc +++ b/cc/trees/blocking_task_runner.cc
@@ -4,6 +4,8 @@ #include "cc/trees/blocking_task_runner.h" +#include <stddef.h> + #include <utility> #include "base/callback.h"
diff --git a/cc/trees/blocking_task_runner.h b/cc/trees/blocking_task_runner.h index eb43b91..a0101766 100644 --- a/cc/trees/blocking_task_runner.h +++ b/cc/trees/blocking_task_runner.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h"
diff --git a/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc index 6c90c6c6..f534c73 100644 --- a/cc/trees/damage_tracker.cc +++ b/cc/trees/damage_tracker.cc
@@ -4,6 +4,8 @@ #include "cc/trees/damage_tracker.h" +#include <stddef.h> + #include <algorithm> #include "cc/base/math_util.h"
diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h index aafbd03..6550db16 100644 --- a/cc/trees/damage_tracker.h +++ b/cc/trees/damage_tracker.h
@@ -6,6 +6,7 @@ #define CC_TREES_DAMAGE_TRACKER_H_ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_lists.h"
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index 9a00403..c8a3d3f33 100644 --- a/cc/trees/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/damage_tracker.h" +#include <stddef.h> + #include "cc/base/math_util.h" #include "cc/layers/layer_impl.h" #include "cc/output/filter_operation.h"
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc index 7a086a7..2d79a5e 100644 --- a/cc/trees/draw_property_utils.cc +++ b/cc/trees/draw_property_utils.cc
@@ -4,6 +4,8 @@ #include "cc/trees/draw_property_utils.h" +#include <stddef.h> + #include <vector> #include "cc/base/math_util.h"
diff --git a/cc/trees/latency_info_swap_promise_monitor.cc b/cc/trees/latency_info_swap_promise_monitor.cc index 9f2bc82..23635cd 100644 --- a/cc/trees/latency_info_swap_promise_monitor.cc +++ b/cc/trees/latency_info_swap_promise_monitor.cc
@@ -4,6 +4,8 @@ #include "cc/trees/latency_info_swap_promise_monitor.h" +#include <stdint.h> + #include "base/threading/platform_thread.h" #include "cc/output/latency_info_swap_promise.h" #include "cc/trees/layer_tree_host.h" @@ -70,14 +72,14 @@ void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() { if (AddForwardingScrollUpdateToMainComponent(latency_)) { - int64 new_sequence_number = 0; + int64_t new_sequence_number = 0; for (ui::LatencyInfo::LatencyMap::const_iterator it = latency_->latency_components().begin(); it != latency_->latency_components().end(); ++it) { if (it->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT) { new_sequence_number = - ((static_cast<int64>(base::PlatformThread::CurrentId()) << 32) ^ - (reinterpret_cast<uint64>(this) << 32)) | + ((static_cast<int64_t>(base::PlatformThread::CurrentId()) << 32) ^ + (reinterpret_cast<uint64_t>(this) << 32)) | (it->second.sequence_number & 0xffffffff); if (new_sequence_number == it->second.sequence_number) return;
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index 2ef633b..7074093 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc
@@ -4,6 +4,9 @@ #include "cc/trees/layer_tree_host.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <stack> #include <string>
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index e7e3318f..f7bd43368 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h
@@ -5,14 +5,17 @@ #ifndef CC_TREES_LAYER_TREE_HOST_H_ #define CC_TREES_LAYER_TREE_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include <limits> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index ff6ba40..c1e3d10 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host_common.h" +#include <stddef.h> + #include <algorithm> #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h index 6ebd86a..df747215 100644 --- a/cc/trees/layer_tree_host_common.h +++ b/cc/trees/layer_tree_host_common.h
@@ -5,6 +5,8 @@ #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ +#include <stddef.h> + #include <limits> #include <vector>
diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc index 9bb4550..3cf35fb 100644 --- a/cc/trees/layer_tree_host_common_perftest.cc +++ b/cc/trees/layer_tree_host_common_perftest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host_common.h" +#include <stddef.h> + #include <deque> #include <sstream>
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index c4e46ed8..bbe4ec5 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host_common.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <vector>
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 14c167e..203670f 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -4,13 +4,15 @@ #include "cc/trees/layer_tree_host_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include <map> #include <set> #include "base/auto_reset.h" -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/containers/small_map.h" #include "base/json/json_writer.h" @@ -823,7 +825,7 @@ TRACE_EVENT_BEGIN2( "cc", "LayerTreeHostImpl::CalculateRenderPasses", "render_surface_layer_list.size()", - static_cast<uint64>(frame->render_surface_layer_list->size()), + static_cast<uint64_t>(frame->render_surface_layer_list->size()), "RequiresHighResToDraw", RequiresHighResToDraw()); // Create the render passes in dependency order. @@ -885,8 +887,8 @@ int num_missing_tiles = 0; int num_incomplete_tiles = 0; - int64 checkerboarded_no_recording_content_area = 0; - int64 checkerboarded_needs_raster_content_area = 0; + int64_t checkerboarded_no_recording_content_area = 0; + int64_t checkerboarded_needs_raster_content_area = 0; bool have_copy_request = false; bool have_missing_animated_tiles = false; @@ -1269,7 +1271,7 @@ global_tile_state_.hard_memory_limit_in_bytes = policy.bytes_limit_when_visible; global_tile_state_.soft_memory_limit_in_bytes = - (static_cast<int64>(global_tile_state_.hard_memory_limit_in_bytes) * + (static_cast<int64_t>(global_tile_state_.hard_memory_limit_in_bytes) * settings_.max_memory_for_prepaint_percentage) / 100; }
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 7f2cc346..f7391beb 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h
@@ -5,12 +5,14 @@ #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_ #define CC_TREES_LAYER_TREE_HOST_IMPL_H_ +#include <stddef.h> + #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/animation/animation_events.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 066302b..78be80f89 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host_impl.h" +#include <stddef.h> + #include <algorithm> #include <cmath> #include <utility>
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index 3acd9a5..9f3f3ac 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host.h" +#include <stdint.h> + #include <sstream> #include "base/files/file_path.h" @@ -291,7 +293,7 @@ std::ostringstream name_stream; name_stream << "name" << next_sync_point_; gpu_mailbox.SetName( - reinterpret_cast<const int8*>(name_stream.str().c_str())); + reinterpret_cast<const int8_t*>(name_stream.str().c_str())); scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create( base::Bind(&EmptyReleaseCallback)); TextureMailbox mailbox(gpu_mailbox, gpu::SyncToken(next_sync_point_),
diff --git a/cc/trees/layer_tree_host_pixeltest_blending.cc b/cc/trees/layer_tree_host_pixeltest_blending.cc index 29ab0d0a..980d692 100644 --- a/cc/trees/layer_tree_host_pixeltest_blending.cc +++ b/cc/trees/layer_tree_host_pixeltest_blending.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "cc/layers/picture_image_layer.h" #include "cc/layers/solid_color_layer.h" #include "cc/test/layer_tree_pixel_resource_test.h" @@ -50,11 +52,11 @@ const int kBlendModesCount = arraysize(kBlendModes); const int kCSSTestColorsCount = arraysize(kCSSTestColors); -using RenderPassOptions = uint32; -const uint32 kUseMasks = 1 << 0; -const uint32 kUseAntialiasing = 1 << 1; -const uint32 kUseColorMatrix = 1 << 2; -const uint32 kForceShaders = 1 << 3; +using RenderPassOptions = uint32_t; +const uint32_t kUseMasks = 1 << 0; +const uint32_t kUseAntialiasing = 1 << 1; +const uint32_t kUseColorMatrix = 1 << 2; +const uint32_t kForceShaders = 1 << 3; class LayerTreeHostBlendingPixelTest : public LayerTreeHostPixelResourceTest { public:
diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc index 33a7683..971fc375 100644 --- a/cc/trees/layer_tree_host_pixeltest_filters.cc +++ b/cc/trees/layer_tree_host_pixeltest_filters.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "build/build_config.h" #include "cc/layers/solid_color_layer.h" #include "cc/test/layer_tree_pixel_test.h"
diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc index f913d51..a79186d 100644 --- a/cc/trees/layer_tree_host_pixeltest_masks.cc +++ b/cc/trees/layer_tree_host_pixeltest_masks.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "build/build_config.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/picture_image_layer.h"
diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc index 51457be..fa31599 100644 --- a/cc/trees/layer_tree_host_pixeltest_tiles.cc +++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/layers/content_layer_client.h" #include "cc/layers/picture_layer.h" #include "cc/output/copy_output_request.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index de59950..6974c92a 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4,6 +4,9 @@ #include "cc/trees/layer_tree_host.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/auto_reset.h" @@ -4095,7 +4098,7 @@ result_->reason = reason; } - int64 TraceId() const override { return 0; } + int64_t TraceId() const override { return 0; } private: // Not owned.
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index b6d8505..624aa68 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host.h" +#include <stdint.h> + #include "cc/animation/animation_curve.h" #include "cc/animation/layer_animation_controller.h" #include "cc/animation/scroll_offset_animation_curve.h" @@ -1302,8 +1304,8 @@ Animation::TargetProperty target_property, int group) override { called_animation_started_ = true; - layer_tree_host()->AnimateLayers( - base::TimeTicks::FromInternalValue(std::numeric_limits<int64>::max())); + layer_tree_host()->AnimateLayers(base::TimeTicks::FromInternalValue( + std::numeric_limits<int64_t>::max())); PostSetNeedsCommitToMainThread(); }
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc index 8c5dd8aa..c7ce754 100644 --- a/cc/trees/layer_tree_host_unittest_context.cc +++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -4,7 +4,9 @@ #include "cc/trees/layer_tree_host.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "cc/layers/delegated_frame_provider.h" #include "cc/layers/delegated_frame_resource_collection.h" #include "cc/layers/heads_up_display_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc index 96b18da3..97362f4 100644 --- a/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/cc/trees/layer_tree_host_unittest_copyrequest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/layers/layer_iterator.h" #include "cc/output/copy_output_request.h" #include "cc/output/copy_output_result.h"
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc index 897f225..b0ddf865 100644 --- a/cc/trees/layer_tree_host_unittest_delegated.cc +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -4,6 +4,8 @@ #include "cc/trees/layer_tree_host.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h"
diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc index e00b0854..4136221 100644 --- a/cc/trees/layer_tree_host_unittest_proxy.cc +++ b/cc/trees/layer_tree_host_unittest_proxy.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_picture_layer.h" #include "cc/test/layer_tree_test.h"
diff --git a/cc/trees/layer_tree_host_unittest_video.cc b/cc/trees/layer_tree_host_unittest_video.cc index 9488cad..c1c3cb4d 100644 --- a/cc/trees/layer_tree_host_unittest_video.cc +++ b/cc/trees/layer_tree_host_unittest_video.cc
@@ -4,7 +4,6 @@ #include "cc/trees/layer_tree_host.h" -#include "base/basictypes.h" #include "cc/layers/render_surface_impl.h" #include "cc/layers/video_layer.h" #include "cc/layers/video_layer_impl.h"
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 93e8145..3519f29 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc
@@ -4,6 +4,9 @@ #include "cc/trees/layer_tree_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> #include <set>
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index a70351a..6d4ba267 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h
@@ -5,12 +5,16 @@ #ifndef CC_TREES_LAYER_TREE_IMPL_H_ #define CC_TREES_LAYER_TREE_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/values.h" #include "cc/base/synced_property.h" #include "cc/input/layer_selection_bound.h"
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index 7c27273..0eb18491 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc
@@ -5,6 +5,7 @@ #include "cc/trees/layer_tree_settings.h" #include <GLES2/gl2.h> +#include <stddef.h> #include <limits> #include "base/command_line.h"
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index 0939ba07..b5e983b 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h
@@ -5,9 +5,10 @@ #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_ #define CC_TREES_LAYER_TREE_SETTINGS_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/debug/layer_tree_debug_state.h" #include "cc/output/managed_memory_policy.h"
diff --git a/cc/trees/occlusion.h b/cc/trees/occlusion.h index fec4915e..7e856aa 100644 --- a/cc/trees/occlusion.h +++ b/cc/trees/occlusion.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/base/simple_enclosed_region.h" #include "ui/gfx/geometry/rect.h"
diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc index 38015a4..250ac4d0 100644 --- a/cc/trees/occlusion_tracker.cc +++ b/cc/trees/occlusion_tracker.cc
@@ -4,6 +4,8 @@ #include "cc/trees/occlusion_tracker.h" +#include <stddef.h> + #include <algorithm> #include "cc/base/math_util.h"
diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h index 9a9294c..847de7b 100644 --- a/cc/trees/occlusion_tracker.h +++ b/cc/trees/occlusion_tracker.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/base/simple_enclosed_region.h" #include "cc/layers/layer_iterator.h"
diff --git a/cc/trees/occlusion_tracker_perftest.cc b/cc/trees/occlusion_tracker_perftest.cc index 3ae39e67..ccaa75ae 100644 --- a/cc/trees/occlusion_tracker_perftest.cc +++ b/cc/trees/occlusion_tracker_perftest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/occlusion_tracker.h" +#include <stddef.h> + #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "cc/debug/lap_timer.h"
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc index 5c658c33..5bfd312 100644 --- a/cc/trees/occlusion_tracker_unittest.cc +++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/occlusion_tracker.h" +#include <stddef.h> + #include "cc/animation/layer_animation_controller.h" #include "cc/base/math_util.h" #include "cc/layers/layer.h"
diff --git a/cc/trees/occlusion_unittest.cc b/cc/trees/occlusion_unittest.cc index becc7a3..da2f6fd 100644 --- a/cc/trees/occlusion_unittest.cc +++ b/cc/trees/occlusion_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/occlusion.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index 9c0e616..1120d30c 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <set> #include <vector>
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h index 5afbcac48..ff5c8a5a 100644 --- a/cc/trees/property_tree.h +++ b/cc/trees/property_tree.h
@@ -5,9 +5,10 @@ #ifndef CC_TREES_PROPERTY_TREE_H_ #define CC_TREES_PROPERTY_TREE_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/scroll_offset.h"
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc index 7c59807..3a41a56 100644 --- a/cc/trees/property_tree_builder.cc +++ b/cc/trees/property_tree_builder.cc
@@ -4,6 +4,8 @@ #include "cc/trees/property_tree_builder.h" +#include <stddef.h> + #include <map> #include <set>
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h index 5798fa8..f4d7bec 100644 --- a/cc/trees/proxy.h +++ b/cc/trees/proxy.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/cc/trees/proxy_common.h b/cc/trees/proxy_common.h index 5fce5e4..a9e991c 100644 --- a/cc/trees/proxy_common.h +++ b/cc/trees/proxy_common.h
@@ -5,6 +5,8 @@ #ifndef CC_TREES_PROXY_COMMON_H_ #define CC_TREES_PROXY_COMMON_H_ +#include <stddef.h> + #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/trees/scoped_abort_remaining_swap_promises.h b/cc/trees/scoped_abort_remaining_swap_promises.h index e35fbf9..1d46ec4 100644 --- a/cc/trees/scoped_abort_remaining_swap_promises.h +++ b/cc/trees/scoped_abort_remaining_swap_promises.h
@@ -5,6 +5,7 @@ #ifndef CC_TREES_SCOPED_ABORT_REMAINING_SWAP_PROMISES_H_ #define CC_TREES_SCOPED_ABORT_REMAINING_SWAP_PROMISES_H_ +#include "base/macros.h" #include "cc/output/swap_promise.h" #include "cc/trees/layer_tree_host.h"
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h index e7bcd6dc..ec82b70 100644 --- a/cc/trees/single_thread_proxy.h +++ b/cc/trees/single_thread_proxy.h
@@ -8,6 +8,7 @@ #include <limits> #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/output/begin_frame_args.h"
diff --git a/cc/trees/task_runner_provider.h b/cc/trees/task_runner_provider.h index 38ca31f..cab850e5 100644 --- a/cc/trees/task_runner_provider.h +++ b/cc/trees/task_runner_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/cc/trees/threaded_channel.h b/cc/trees/threaded_channel.h index 5d10f4af..71d2c54 100644 --- a/cc/trees/threaded_channel.h +++ b/cc/trees/threaded_channel.h
@@ -5,6 +5,7 @@ #ifndef CC_TREES_THREADED_CHANNEL_H_ #define CC_TREES_THREADED_CHANNEL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/trees/threaded_channel_unittest.cc b/cc/trees/threaded_channel_unittest.cc index 17350d84..359a7f9 100644 --- a/cc/trees/threaded_channel_unittest.cc +++ b/cc/trees/threaded_channel_unittest.cc
@@ -4,6 +4,7 @@ #include "cc/trees/threaded_channel.h" +#include "base/macros.h" #include "cc/test/layer_tree_test.h" #include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc index 99351471..72b6daad 100644 --- a/cc/trees/tree_synchronizer.cc +++ b/cc/trees/tree_synchronizer.cc
@@ -4,6 +4,8 @@ #include "cc/trees/tree_synchronizer.h" +#include <stddef.h> + #include <set> #include "base/containers/hash_tables.h"
diff --git a/cc/trees/tree_synchronizer.h b/cc/trees/tree_synchronizer.h index ef13b1d..a580362c 100644 --- a/cc/trees/tree_synchronizer.h +++ b/cc/trees/tree_synchronizer.h
@@ -5,7 +5,7 @@ #ifndef CC_TREES_TREE_SYNCHRONIZER_H_ #define CC_TREES_TREE_SYNCHRONIZER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h"
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc index 8782d5d..a288da3 100644 --- a/cc/trees/tree_synchronizer_unittest.cc +++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -4,6 +4,8 @@ #include "cc/trees/tree_synchronizer.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <vector>
diff --git a/chrome/VERSION b/chrome/VERSION index 6a97c19b..f0192b48 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=49 MINOR=0 -BUILD=2598 +BUILD=2599 PATCH=0
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java index c3375b6..a68d4c84 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java
@@ -206,6 +206,7 @@ EnhancedBookmarkAddEditFolderActivity.startAddFolderActivity(this, mBookmarksToMove); } else if (entry.mType == FolderListEntry.TYPE_NORMAL) { mEnhancedBookmarksModel.moveBookmarks(mBookmarksToMove, entry.mId); + EnhancedBookmarkUtils.setLastUsedParent(this, entry.mId); finish(); } } @@ -218,6 +219,7 @@ BookmarkId createdBookmark = BookmarkId.getBookmarkIdFromString(data.getStringExtra( EnhancedBookmarkAddEditFolderActivity.INTENT_CREATED_BOOKMARK)); mEnhancedBookmarksModel.moveBookmarks(mBookmarksToMove, createdBookmark); + EnhancedBookmarkUtils.setLastUsedParent(this, createdBookmark); finish(); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java index b7f9769..2214561 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
@@ -7,7 +7,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.graphics.Bitmap; +import android.content.SharedPreferences; import android.net.Uri; import android.os.AsyncTask; import android.preference.PreferenceManager; @@ -25,7 +25,6 @@ import org.chromium.chrome.browser.bookmark.BookmarksBridge; import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.AddBookmarkCallback; -import org.chromium.chrome.browser.favicon.FaviconHelper; import org.chromium.chrome.browser.ntp.NewTabPageUma; import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; import org.chromium.chrome.browser.offlinepages.OfflinePageFreeUpSpaceCallback; @@ -48,6 +47,7 @@ */ public class EnhancedBookmarkUtils { private static final String PREF_LAST_USED_URL = "enhanced_bookmark_last_used_url"; + private static final String PREF_LAST_USED_PARENT = "enhanced_bookmark_last_used_parent_folder"; /** * @return True if enhanced bookmark feature is enabled. @@ -73,7 +73,7 @@ return; } - BookmarkId parent = bookmarkModel.getDefaultFolder(); + BookmarkId parent = getLastUsedParent(activity, bookmarkModel); bookmarkModel.addBookmarkAsync(parent, bookmarkModel.getChildCount(parent), tab.getTitle(), tab.getUrl(), tab.getWebContents(), tab.isShowingErrorPage(), createAddBookmarkCallback(bookmarkModel, snackbarManager, activity)); @@ -104,42 +104,45 @@ private static void showSnackbarForAddingBookmark(final EnhancedBookmarksModel bookmarkModel, final SnackbarManager snackbarManager, final Activity activity, final BookmarkId bookmarkId, final int saveResult, boolean isStorageAlmostFull) { - SnackbarController snackbarController = null; - int messageId; - int buttonId = 0; - + Snackbar snackbar; OfflinePageBridge offlinePageBridge = bookmarkModel.getOfflinePageBridge(); if (offlinePageBridge == null) { - messageId = R.string.enhanced_bookmark_page_saved; - } else if (saveResult == AddBookmarkCallback.SKIPPED) { - messageId = R.string.offline_pages_page_skipped; - } else if (isStorageAlmostFull) { - messageId = saveResult == AddBookmarkCallback.SAVED - ? R.string.offline_pages_page_saved_storage_near_full - : R.string.offline_pages_page_failed_to_save_storage_near_full; - // Show "Free up space" button. - buttonId = R.string.offline_pages_free_up_space_title; - snackbarController = createSnackbarControllerForFreeUpSpaceButton( - bookmarkModel, snackbarManager, activity); - } else { - messageId = saveResult == AddBookmarkCallback.SAVED - ? R.string.offline_pages_page_saved - : R.string.offline_pages_page_failed_to_save; - } - - // Show "Edit" button when "Free up space" button is not desired, regardless - // whether the offline page was saved successfuly, because a bookmark was - // created and user might want to edit title. - if (buttonId == 0) { - buttonId = R.string.enhanced_bookmark_item_edit; - snackbarController = createSnackbarControllerForEditButton( + String folderName = bookmarkModel + .getBookmarkTitle(bookmarkModel.getBookmarkById(bookmarkId).getParentId()); + SnackbarController snackbarController = createSnackbarControllerForEditButton( bookmarkModel, activity, bookmarkId); + snackbar = Snackbar.make(folderName, snackbarController) + .setTemplateText(activity.getString(R.string.enhanced_bookmark_page_saved)) + .setAction(activity.getString(R.string.enhanced_bookmark_item_edit), null); + } else { + SnackbarController snackbarController = null; + int messageId; + int buttonId = R.string.enhanced_bookmark_item_edit; + + if (saveResult == AddBookmarkCallback.SKIPPED) { + messageId = R.string.offline_pages_page_skipped; + } else if (isStorageAlmostFull) { + messageId = saveResult == AddBookmarkCallback.SAVED + ? R.string.offline_pages_page_saved_storage_near_full + : R.string.offline_pages_page_failed_to_save_storage_near_full; + // Show "Free up space" button. + buttonId = R.string.offline_pages_free_up_space_title; + snackbarController = createSnackbarControllerForFreeUpSpaceButton( + bookmarkModel, snackbarManager, activity); + } else { + messageId = saveResult == AddBookmarkCallback.SAVED + ? R.string.offline_pages_page_saved + : R.string.offline_pages_page_failed_to_save; + } + if (snackbarController == null) { + snackbarController = createSnackbarControllerForEditButton( + bookmarkModel, activity, bookmarkId); + } + snackbar = Snackbar.make(activity.getString(messageId), snackbarController) + .setAction(activity.getString(buttonId), null).setSingleLine(false); } - snackbarManager.showSnackbar( - Snackbar.make(activity.getString(messageId), snackbarController) - .setAction(activity.getString(buttonId), null) - .setSingleLine(false)); + snackbarManager.showSnackbar(snackbar); } private static AddBookmarkCallback createAddBookmarkCallback( @@ -195,7 +198,6 @@ @Override public void onAction(Object actionData) { RecordUserAction.record("EnhancedBookmarks.EditAfterCreateButtonClicked"); - // Show edit activity with the name of parent folder highlighted. startEditActivity(activity, bookmarkId, null); bookmarkModel.destroy(); } @@ -322,6 +324,31 @@ } /** + * Save the last used {@link BookmarkId} as a folder to put new bookmarks to. + */ + static void setLastUsedParent(Context context, BookmarkId bookmarkId) { + PreferenceManager.getDefaultSharedPreferences(context).edit() + .putString(PREF_LAST_USED_PARENT, bookmarkId.toString()).apply(); + } + + /** + * @return The parent {@link BookmarkId} that the user used the last time, + * or the default folder if no previous user action has been recorded. + */ + static BookmarkId getLastUsedParent(Context context, EnhancedBookmarksModel model) { + BookmarkId parentId = null; + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); + if (preferences.contains(PREF_LAST_USED_PARENT)) { + parentId = BookmarkId + .getBookmarkIdFromString(preferences.getString(PREF_LAST_USED_PARENT, null)); + } + if (parentId == null || !model.doesBookmarkExist(parentId)) { + parentId = model.getDefaultFolder(); + } + return parentId; + } + + /** * Starts an {@link EnhancedBookmarkEditActivity} for the given {@link BookmarkId}. */ public static void startEditActivity( @@ -380,21 +407,6 @@ } /** - * Get dominant color from bitmap. This function uses favicon helper to fulfil its task. - * @param bitmap The bitmap to extract color from. - * @return The dominant color in ARGB format. - */ - public static int getDominantColorForBitmap(Bitmap bitmap) { - int mDominantColor = FaviconHelper.getDominantColorForBitmap(bitmap); - // FaviconHelper returns color in ABGR format, do a manual conversion here. - int red = (mDominantColor & 0xff) << 16; - int green = mDominantColor & 0xff00; - int blue = (mDominantColor & 0xff0000) >> 16; - int alpha = mDominantColor & 0xff000000; - return alpha + red + green + blue; - } - - /** * Updates the title of chrome shown in recent tasks. It only takes effect in document mode. */ public static void setTaskDescriptionInDocumentMode(Activity activity, String description) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/Snackbar.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/Snackbar.java index 69f0285..21908ae5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/Snackbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/Snackbar.java
@@ -57,7 +57,7 @@ /** * Sets the action button to show on the snackbar. * @param actionText The text to show on the button. If null, the button will not be shown. - * @param actionData An object to be passed to {@linkSnackbarController#onAction} or + * @param actionData An object to be passed to {@link SnackbarController#onAction} or * {@link SnackbarController#onDismissNoAction} when the button is pressed or the * snackbar is dismissed. */ @@ -68,9 +68,9 @@ } /** - * Sets the identity profileImage (profile image) which should be displayed in the snackbar. - * If null, snackbar will have no profileImage. Ability to have an icon is specific to the - * identity snackbars and should be used only there. + * Sets the identity profile image that will be displayed at the beginning of the snackbar. + * If null, there won't be a profile image. The ability to have an icon is exclusive to + * identity snackbars. */ public Snackbar setProfileImage(Bitmap profileImage) { mProfileImage = profileImage;
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd index b0c45d80..4e21f20 100644 --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1845,7 +1845,7 @@ Sign in </message> <message name="IDS_ENHANCED_BOOKMARK_PAGE_SAVED" desc="Message shown after user adds a new bookmark. [CHAR-LIMIT=32]"> - Bookmarked + Bookmarked to <ph name="FOLDER_NAME">%1$s<ex>Mobile bookmarks</ex></ph> </message> <message name="IDS_ENHANCED_BOOKMARK_DRAWER_ALL_ITEMS" desc="Menu item for showing all bookmark items in the enhanced bookmarks UI [CHAR-LIMIT=24]"> All bookmarks
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index df3b5c9c..80fb43b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -12927,9 +12927,12 @@ <message name="IDS_PROFILES_CREATE_SIGN_IN_ERROR" desc="Message shown when a sign-in error occurs during creation of a new supervised user."> Oops! The new supervised user couldn't be created. Please make sure you're signed in properly and try again. </message> - <message name="IDS_PROFILES_CREATE_EXISTING_LEGACY_SUPERVISED_USER_ERROR" desc="Message shown when the user enters the name of a supervised user that can be imported."> + <message name="IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_REMOTELY" desc="Message shown when the user enters the name of a supervised user that can be imported."> Looks like you're already managing a user by that name.<ph name="LINE_BREAK"><br/></ph>Did you want to <ph name="BEGIN_LINK"><a is="action-link" id="supervised-user-import-existing"></ph>import <ph name="PROFILE_NAME">$1<ex>John</ex></ph> to this device<ph name="END_LINK"></a></ph>? </message> + <message name="IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_LOCALLY" desc="Message shown when the user enters the name of a supervised user that we already have locally."> + Looks like you already have a supervised user with this name. + </message> <message name="IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL" desc="Label for the 'Supervised user' checkbox in the create-profile dialog when the current user is signed in."> Control and view the websites this person visits from <ph name="CUSTODIAN_EMAIL">$1<ex>user@gmail.com</ex></ph>. </message>
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc index 1d745f4..e12d457 100644 --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -413,8 +413,7 @@ base::CompareCase::SENSITIVE)) return scoped_ptr<net::test_server::HttpResponse>(); - std::map<std::string, std::string>::const_iterator it = - request.headers.find("User-Agent"); + auto it = request.headers.find("User-Agent"); EXPECT_TRUE(it != request.headers.end()); if (!base::StartsWith("foobar", it->second, base::CompareCase::SENSITIVE))
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 8590545..fb198c79 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc
@@ -68,8 +68,7 @@ request.relative_url.substr(query_string_pos + 1); std::string header_value; - std::map<std::string, std::string>::const_iterator it = request.headers.find( - header_name); + auto it = request.headers.find(header_name); if (it != request.headers.end()) header_value = it->second;
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 255cda6..1408c0c 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -52,8 +52,7 @@ http_response->set_code(net::HTTP_OK); std::string request_cookies; - std::map<std::string, std::string>::const_iterator it = - request.headers.find("Cookie"); + auto it = request.headers.find("Cookie"); if (it != request.headers.end()) request_cookies = it->second;
diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc index 3180a19..b9c30e5 100644 --- a/chrome/browser/net/sdch_browsertest.cc +++ b/chrome/browser/net/sdch_browsertest.cc
@@ -53,7 +53,7 @@ namespace { typedef std::vector<net::test_server::HttpRequest> RequestVector; -typedef std::map<std::string, std::string> HttpRequestHeaderMap; +typedef net::test_server::HttpRequest::HeaderMap HttpRequestHeaderMap; // Credit Alfred, Lord Tennyson static const char kSampleData[] = "<html><body><pre>"
diff --git a/chrome/browser/resources/options/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js index df9862b..4e9ae66 100644 --- a/chrome/browser/resources/options/manage_profile_overlay.js +++ b/chrome/browser/resources/options/manage_profile_overlay.js
@@ -379,27 +379,37 @@ var newName = $('create-profile-name').value; var i; for (i = 0; i < supervisedUsers.length; ++i) { - if (supervisedUsers[i].name == newName && - !supervisedUsers[i].onCurrentDevice) { - var errorHtml = loadTimeData.getStringF( - 'manageProfilesExistingSupervisedUser', - HTMLEscape(elide(newName, /* maxLength */ 50))); - this.showErrorBubble_(errorHtml, 'create', true); - - // Check if another supervised user also exists with that name. - var nameIsUnique = true; - var j; - for (j = i + 1; j < supervisedUsers.length; ++j) { - if (supervisedUsers[j].name == newName) { - nameIsUnique = false; - break; - } + if (supervisedUsers[i].name != newName) + continue; + // Check if another supervised user also exists with that name. + var nameIsUnique = true; + // Handling the case when multiple supervised users with the same + // name exist, but not all of them are on the device. + // If at least one is not imported, we want to offer that + // option to the user. This could happen due to a bug that allowed + // creating SUs with the same name (https://crbug.com/557445). + var allOnCurrentDevice = supervisedUsers[i].onCurrentDevice; + var j; + for (j = i + 1; j < supervisedUsers.length; ++j) { + if (supervisedUsers[j].name == newName) { + nameIsUnique = false; + allOnCurrentDevice = allOnCurrentDevice && + supervisedUsers[j].onCurrentDevice; } - $('supervised-user-import-existing').onclick = - this.getImportHandler_(supervisedUsers[i], nameIsUnique); - $('create-profile-ok').disabled = true; - return; } + + var errorHtml = allOnCurrentDevice ? + loadTimeData.getStringF( + 'managedProfilesExistingLocalSupervisedUser') : + loadTimeData.getStringF( + 'manageProfilesExistingSupervisedUser', + HTMLEscape(elide(newName, /* maxLength */ 50))); + this.showErrorBubble_(errorHtml, 'create', true); + + $('supervised-user-import-existing').onclick = + this.getImportHandler_(supervisedUsers[i], nameIsUnique); + $('create-profile-ok').disabled = true; + return; } },
diff --git a/chrome/browser/ui/webui/options/manage_profile_browsertest.js b/chrome/browser/ui/webui/options/manage_profile_browsertest.js index c587573..d4144e0 100644 --- a/chrome/browser/ui/webui/options/manage_profile_browsertest.js +++ b/chrome/browser/ui/webui/options/manage_profile_browsertest.js
@@ -202,7 +202,14 @@ }, { id: 'supervisedUser4', - name: 'SameName', + name: 'RepeatingName', + iconURL: 'chrome://path/to/icon/image', + onCurrentDevice: true, + needAvatar: false + }, + { + id: 'supervisedUser5', + name: 'RepeatingName', iconURL: 'chrome://path/to/icon/image', onCurrentDevice: false, needAvatar: false @@ -218,10 +225,10 @@ CreateProfileOverlay.getInstance().signedInEmail_); this.setProfileSupervised_(false, 'create'); - // Also add the names 'Test' and 'SameName' to |existingProfileNames_| to + // Also add the names 'Test' and 'RepeatingName' to |existingProfileNames_| to // simulate that profiles with those names exist on the device. ManageProfileOverlay.getInstance().existingProfileNames_.Test = true; - ManageProfileOverlay.getInstance().existingProfileNames_.SameName = true; + ManageProfileOverlay.getInstance().existingProfileNames_.RepeatingName = true; // Initially, the ok button should be enabled and the import link should not // exist. @@ -252,12 +259,13 @@ ManageProfileOverlay.getInstance().onNameChanged_('create'); return options.SupervisedUserListData.getInstance().promise_; }).then(function() { - assertFalse($('create-profile-ok').disabled); + assertTrue($('create-profile-ok').disabled); assertTrue($('supervised-user-import-existing') == null); - // A profile which does not exist on the device, but there is a profile with - // the same name already on the device. - nameField.value = 'SameName'; + // A supervised user profile that is on the device, but has the same name + // as a supervised user profile that is not imported. + // This can happen due to a bug (https://crbug.com/557445) + nameField.value = 'RepeatingName'; ManageProfileOverlay.getInstance().onNameChanged_('create'); return options.SupervisedUserListData.getInstance().promise_; }).then(function() {
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index 43e5f87..f2aa14c7 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -91,7 +91,9 @@ { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL }, { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL }, { "manageProfilesExistingSupervisedUser", - IDS_PROFILES_CREATE_EXISTING_LEGACY_SUPERVISED_USER_ERROR }, + IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_REMOTELY }, + { "managedProfilesExistingLocalSupervisedUser", + IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_LOCALLY }, { "manageProfilesSupervisedSignedInLabel", IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL }, { "manageProfilesSupervisedNotSignedIn",
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index ce70b2b..9f19508 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -192,8 +192,7 @@ scoped_ptr<net::test_server::HttpResponse> HandleRequest( const net::test_server::HttpRequest& request) { - std::map<std::string, std::string>::const_iterator host_it = - request.headers.find("Host"); + auto host_it = request.headers.find("Host"); if (host_it == request.headers.end()) return scoped_ptr<net::test_server::HttpResponse>();
diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index 06414c3..ab32c03 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
@@ -136,8 +136,7 @@ scoped_ptr<net::test_server::HttpResponse> HandleRequest( const net::test_server::HttpRequest& request) { - std::map<std::string, std::string>::const_iterator host_it = - request.headers.find("Host"); + auto host_it = request.headers.find("Host"); if (host_it == request.headers.end()) return scoped_ptr<net::test_server::HttpResponse>();
diff --git a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js index 9cc1005b..07697b6 100644 --- a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js +++ b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
@@ -1718,7 +1718,7 @@ webview.request.onBeforeSendHeaders.addListener(function(details) { var headers = details.requestHeaders; for( var i = 0, l = headers.length; i < l; ++i ) { - if (headers[i].name == 'User-Agent') { + if (headers[i].name.toLowerCase() == 'user-agent') { headers[i].value = 'foobar'; break; }
diff --git a/chrome/test/nacl/pnacl_header_test.cc b/chrome/test/nacl/pnacl_header_test.cc index b7d32a09..a301a32 100644 --- a/chrome/test/nacl/pnacl_header_test.cc +++ b/chrome/test/nacl/pnacl_header_test.cc
@@ -109,8 +109,7 @@ // For pexe files, check for the special Accept header, // along with the expected ResourceType of the URL request. EXPECT_NE(0U, request.headers.count("Accept")); - std::map<std::string, std::string>::const_iterator it = - request.headers.find("Accept"); + auto it = request.headers.find("Accept"); EXPECT_NE(std::string::npos, it->second.find("application/x-pnacl")); EXPECT_NE(std::string::npos, it->second.find("*/*")); EXPECT_TRUE(test_delegate_.found_pnacl_header());
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc index 4fad1de..38d683d 100644 --- a/chromeos/accelerometer/accelerometer_reader.cc +++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -4,6 +4,9 @@ #include "chromeos/accelerometer/accelerometer_reader.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> @@ -11,6 +14,7 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -444,7 +448,7 @@ } for (AccelerometerSource source : reading_data.sources) { DCHECK(configuration_.has[source]); - int16* values = reinterpret_cast<int16*>(reading); + int16_t* values = reinterpret_cast<int16_t*>(reading); update_->Set(source, values[configuration_.index[source][0]] * configuration_.scale[source][0], values[configuration_.index[source][1]] *
diff --git a/chromeos/accelerometer/accelerometer_reader.h b/chromeos/accelerometer/accelerometer_reader.h index 15732c4..5c3a8810 100644 --- a/chromeos/accelerometer/accelerometer_reader.h +++ b/chromeos/accelerometer/accelerometer_reader.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_ACCELEROMETER_ACCELEROMETER_READER_H_ #define CHROMEOS_ACCELEROMETER_ACCELEROMETER_READER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" #include "chromeos/accelerometer/accelerometer_types.h"
diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.h b/chromeos/app_mode/kiosk_oem_manifest_parser.h index 05b7e0a..92998c6 100644 --- a/chromeos/app_mode/kiosk_oem_manifest_parser.h +++ b/chromeos/app_mode/kiosk_oem_manifest_parser.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" namespace chromeos {
diff --git a/chromeos/attestation/attestation_flow.h b/chromeos/attestation/attestation_flow.h index a6c6cd2..a5ced3c 100644 --- a/chromeos/attestation/attestation_flow.h +++ b/chromeos/attestation/attestation_flow.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/attestation/attestation_constants.h"
diff --git a/chromeos/attestation/mock_attestation_flow.h b/chromeos/attestation/mock_attestation_flow.h index efefd94f..fad04f0d 100644 --- a/chromeos/attestation/mock_attestation_flow.h +++ b/chromeos/attestation/mock_attestation_flow.h
@@ -7,8 +7,8 @@ #include "chromeos/attestation/attestation_flow.h" -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "testing/gmock/include/gmock/gmock.h" namespace chromeos {
diff --git a/chromeos/audio/audio_device.cc b/chromeos/audio/audio_device.cc index 27109ed..5374194e 100644 --- a/chromeos/audio/audio_device.cc +++ b/chromeos/audio/audio_device.cc
@@ -4,6 +4,8 @@ #include "chromeos/audio/audio_device.h" +#include <stdint.h> + #include "base/format_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -15,7 +17,7 @@ // Get the priority for a particular device type. The priority returned // will be between 0 to 3, the higher number meaning a higher priority. -uint8 GetDevicePriority(AudioDeviceType type, bool is_input) { +uint8_t GetDevicePriority(AudioDeviceType type, bool is_input) { // Lower the priority of bluetooth mic to prevent unexpected bad eperience // to user because of bluetooth audio profile switching. Make priority to // zero so this mic will never be automatically chosen.
diff --git a/chromeos/audio/audio_device.h b/chromeos/audio/audio_device.h index 240f892b1..ee47ee5e 100644 --- a/chromeos/audio/audio_device.h +++ b/chromeos/audio/audio_device.h
@@ -5,11 +5,12 @@ #ifndef CHROMEOS_AUDIO_AUDIO_DEVICE_H_ #define CHROMEOS_AUDIO_AUDIO_DEVICE_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/audio_node.h" @@ -56,18 +57,18 @@ } bool is_input; - uint64 id; + uint64_t id; std::string display_name; std::string device_name; std::string mic_positions; AudioDeviceType type; - uint8 priority; + uint8_t priority; bool active; - uint64 plugged_time; + uint64_t plugged_time; }; typedef std::vector<AudioDevice> AudioDeviceList; -typedef std::map<uint64, AudioDevice> AudioDeviceMap; +typedef std::map<uint64_t, AudioDevice> AudioDeviceMap; struct AudioDeviceCompare { // Rules used to discern which device is higher,
diff --git a/chromeos/audio/audio_devices_pref_handler.h b/chromeos/audio/audio_devices_pref_handler.h index dfa582e..2347aad 100644 --- a/chromeos/audio/audio_devices_pref_handler.h +++ b/chromeos/audio/audio_devices_pref_handler.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_AUDIO_AUDIO_DEVICES_PREF_HANDLER_H_ #define CHROMEOS_AUDIO_AUDIO_DEVICES_PREF_HANDLER_H_ -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "chromeos/audio/audio_pref_observer.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/audio/audio_devices_pref_handler_impl.cc b/chromeos/audio/audio_devices_pref_handler_impl.cc index 17b5681e..45aa433 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl.cc +++ b/chromeos/audio/audio_devices_pref_handler_impl.cc
@@ -4,6 +4,8 @@ #include "chromeos/audio/audio_devices_pref_handler_impl.h" +#include <stdint.h> + #include <algorithm> #include "base/bind.h" @@ -32,7 +34,7 @@ std::string GetDeviceIdString(const chromeos::AudioDevice& device) { std::string device_id_string = device.device_name + " : " + - base::Uint64ToString(device.id & static_cast<uint64>(0xffffffff)) + + base::Uint64ToString(device.id & static_cast<uint64_t>(0xffffffff)) + " : " + (device.is_input ? "1" : "0"); // Replace any periods from the device id string with a space, since setting // names cannot contain periods.
diff --git a/chromeos/audio/audio_devices_pref_handler_impl.h b/chromeos/audio/audio_devices_pref_handler_impl.h index 72dc335..7d30552 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl.h +++ b/chromeos/audio/audio_devices_pref_handler_impl.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" #include "base/values.h"
diff --git a/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc b/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc index ba87132..a4a97da 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc +++ b/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc
@@ -4,6 +4,9 @@ #include "chromeos/audio/audio_devices_pref_handler_impl.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/testing_pref_service.h" #include "chromeos/audio/audio_device.h" @@ -14,11 +17,11 @@ namespace chromeos { -const uint64 kInternalMicId = 10003; -const uint64 kHeadphoneId = 10002; -const uint64 kHDMIOutputId = 10006; -const uint64 kOtherTypeOutputId = 90001; -const uint64 kOtherTypeInputId = 90002; +const uint64_t kInternalMicId = 10003; +const uint64_t kHeadphoneId = 10002; +const uint64_t kHDMIOutputId = 10006; +const uint64_t kOtherTypeOutputId = 90001; +const uint64_t kOtherTypeInputId = 90002; const AudioDevice kInternalMic(AudioNode(true, kInternalMicId,
diff --git a/chromeos/audio/audio_devices_pref_handler_stub.h b/chromeos/audio/audio_devices_pref_handler_stub.h index 4cb5d5f7..6efe238 100644 --- a/chromeos/audio/audio_devices_pref_handler_stub.h +++ b/chromeos/audio/audio_devices_pref_handler_stub.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_AUDIO_AUDIO_DEVICES_PREF_HANDLER_STUB_H_ #define CHROMEOS_AUDIO_AUDIO_DEVICES_PREF_HANDLER_STUB_H_ +#include <stdint.h> + #include <map> #include "base/macros.h"
diff --git a/chromeos/audio/audio_pref_observer.h b/chromeos/audio/audio_pref_observer.h index 52393d40..b183ebfe 100644 --- a/chromeos/audio/audio_pref_observer.h +++ b/chromeos/audio/audio_pref_observer.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_AUDIO_AUDIO_PREF_OBSERVER_H_ #define CHROMEOS_AUDIO_AUDIO_PREF_OBSERVER_H_ -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc index 8ee6009..970c78c7 100644 --- a/chromeos/audio/cras_audio_handler.cc +++ b/chromeos/audio/cras_audio_handler.cc
@@ -4,6 +4,9 @@ #include "chromeos/audio/cras_audio_handler.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cmath>
diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h index a12e5ae4..39e4ac84 100644 --- a/chromeos/audio/cras_audio_handler.h +++ b/chromeos/audio/cras_audio_handler.h
@@ -5,9 +5,11 @@ #ifndef CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_ #define CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_ +#include <stddef.h> #include <stdint.h> #include <queue> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/audio/cras_audio_handler_unittest.cc b/chromeos/audio/cras_audio_handler_unittest.cc index 4633d87..46e7d3e8 100644 --- a/chromeos/audio/cras_audio_handler_unittest.cc +++ b/chromeos/audio/cras_audio_handler_unittest.cc
@@ -4,7 +4,11 @@ #include "chromeos/audio/cras_audio_handler.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -20,23 +24,23 @@ namespace chromeos { namespace { -const uint64 kInternalSpeakerId = 10001; -const uint64 kHeadphoneId = 10002; -const uint64 kInternalMicId = 10003; -const uint64 kUSBMicId = 10004; -const uint64 kBluetoothHeadsetId = 10005; -const uint64 kHDMIOutputId = 10006; -const uint64 kUSBHeadphoneId1 = 10007; -const uint64 kUSBHeadphoneId2 = 10008; -const uint64 kMicJackId = 10009; -const uint64 kKeyboardMicId = 10010; -const uint64 kOtherTypeOutputId = 90001; -const uint64 kOtherTypeInputId = 90002; -const uint64 kUSBJabraSpeakerOutputId1 = 90003; -const uint64 kUSBJabraSpeakerOutputId2 = 90004; -const uint64 kUSBJabraSpeakerInputId1 = 90005; -const uint64 kUSBJabraSpeakerInputId2 = 90006; -const uint64 kUSBCameraInputId = 90007; +const uint64_t kInternalSpeakerId = 10001; +const uint64_t kHeadphoneId = 10002; +const uint64_t kInternalMicId = 10003; +const uint64_t kUSBMicId = 10004; +const uint64_t kBluetoothHeadsetId = 10005; +const uint64_t kHDMIOutputId = 10006; +const uint64_t kUSBHeadphoneId1 = 10007; +const uint64_t kUSBHeadphoneId2 = 10008; +const uint64_t kMicJackId = 10009; +const uint64_t kKeyboardMicId = 10010; +const uint64_t kOtherTypeOutputId = 90001; +const uint64_t kOtherTypeInputId = 90002; +const uint64_t kUSBJabraSpeakerOutputId1 = 90003; +const uint64_t kUSBJabraSpeakerOutputId2 = 90004; +const uint64_t kUSBJabraSpeakerInputId1 = 90005; +const uint64_t kUSBJabraSpeakerInputId2 = 90006; +const uint64_t kUSBCameraInputId = 90007; const AudioNode kInternalSpeaker( false, @@ -265,12 +269,12 @@ ++input_mute_changed_count_; } - void OnOutputNodeVolumeChanged(uint64 /* node_id */, + void OnOutputNodeVolumeChanged(uint64_t /* node_id */, int /* volume */) override { ++output_volume_changed_count_; } - void OnInputNodeGainChanged(uint64 /* node_id */, int /* gain */) override { + void OnInputNodeGainChanged(uint64_t /* node_id */, int /* gain */) override { ++input_gain_changed_count_; } @@ -341,7 +345,7 @@ message_loop_.RunUntilIdle(); } - const AudioDevice* GetDeviceFromId(uint64 id) { + const AudioDevice* GetDeviceFromId(uint64_t id) { return cras_audio_handler_->GetDeviceFromId(id); }
diff --git a/chromeos/binder/buffer_reader.h b/chromeos/binder/buffer_reader.h index 0de70c12..12a26f3 100644 --- a/chromeos/binder/buffer_reader.h +++ b/chromeos/binder/buffer_reader.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_BINDER_BUFFER_READER_H_ #define CHROMEOS_BINDER_BUFFER_READER_H_ +#include <stddef.h> + #include "base/macros.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/binder/buffer_reader_unittest.cc b/chromeos/binder/buffer_reader_unittest.cc index 7e5c3c7d..487855db 100644 --- a/chromeos/binder/buffer_reader_unittest.cc +++ b/chromeos/binder/buffer_reader_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chromeos/binder/buffer_reader.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/binder/command_broker.cc b/chromeos/binder/command_broker.cc index ada6c8e8..0a5393f 100644 --- a/chromeos/binder/command_broker.cc +++ b/chromeos/binder/command_broker.cc
@@ -5,6 +5,8 @@ #include "chromeos/binder/command_broker.h" #include <linux/android/binder.h> +#include <stddef.h> +#include <stdint.h> #include "base/logging.h" #include "chromeos/binder/driver.h" @@ -42,7 +44,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); } -bool CommandBroker::Transact(int32 handle, +bool CommandBroker::Transact(int32_t handle, const TransactionData& request, scoped_ptr<TransactionData>* reply) { DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/chromeos/binder/command_broker.h b/chromeos/binder/command_broker.h index 86e0324..4f3ae2d1 100644 --- a/chromeos/binder/command_broker.h +++ b/chromeos/binder/command_broker.h
@@ -5,9 +5,10 @@ #ifndef CHROMEOS_BINDER_COMMAND_BROKER_H_ #define CHROMEOS_BINDER_COMMAND_BROKER_H_ +#include <stdint.h> + #include <utility> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" @@ -32,7 +33,7 @@ // Performs transaction with the remote object specified by the handle. // Returns true on success. If not one-way transaction, this method blocks // until the target object sends a reply. - bool Transact(int32 handle, + bool Transact(int32_t handle, const TransactionData& request, scoped_ptr<TransactionData>* reply);
diff --git a/chromeos/binder/command_stream.cc b/chromeos/binder/command_stream.cc index 3a0d00c3..e80c346a 100644 --- a/chromeos/binder/command_stream.cc +++ b/chromeos/binder/command_stream.cc
@@ -5,6 +5,8 @@ #include "chromeos/binder/command_stream.h" #include <linux/android/binder.h> +#include <stddef.h> +#include <stdint.h> #include "base/bind.h" #include "chromeos/binder/buffer_reader.h" @@ -52,7 +54,7 @@ bool CommandStream::ProcessIncomingCommand() { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(CanProcessIncomingCommand()); - uint32 command = 0; + uint32_t command = 0; if (!incoming_data_reader_->Read(&command, sizeof(command)) || !OnIncomingCommand(command, incoming_data_reader_.get())) { LOG(ERROR) << "Error while handling command: " << command; @@ -61,7 +63,7 @@ return true; } -void CommandStream::AppendOutgoingCommand(uint32 command, +void CommandStream::AppendOutgoingCommand(uint32_t command, const void* data, size_t size) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -93,14 +95,14 @@ return true; } -bool CommandStream::OnIncomingCommand(uint32 command, BufferReader* reader) { +bool CommandStream::OnIncomingCommand(uint32_t command, BufferReader* reader) { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(hashimoto): Replace all NOTIMPLEMENTED with logic to handle incoming // commands. VLOG(1) << "Processing " << CommandToString(command) << ", this = " << this; switch (command) { case BR_ERROR: { - int32 error = 0; + int32_t error = 0; if (!reader->Read(&error, sizeof(error))) { LOG(ERROR) << "Failed to read error code."; return false;
diff --git a/chromeos/binder/command_stream.h b/chromeos/binder/command_stream.h index 3ce431a..cd85343 100644 --- a/chromeos/binder/command_stream.h +++ b/chromeos/binder/command_stream.h
@@ -5,9 +5,11 @@ #ifndef CHROMEOS_BINDER_COMMAND_STREAM_H_ #define CHROMEOS_BINDER_COMMAND_STREAM_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -59,7 +61,7 @@ bool ProcessIncomingCommand(); // Appends a command to the outgoing command buffer. - void AppendOutgoingCommand(uint32 command, const void* data, size_t size); + void AppendOutgoingCommand(uint32_t command, const void* data, size_t size); // Writes buffered outgoing commands to the driver, and returns true on // success. @@ -67,7 +69,7 @@ private: // Calls the appropriate delegate method to handle the incoming command. - bool OnIncomingCommand(uint32 command, BufferReader* reader); + bool OnIncomingCommand(uint32_t command, BufferReader* reader); // Frees the buffer used by the driver to pass transaction data payload. void FreeTransactionBuffer(const void* ptr);
diff --git a/chromeos/binder/constants.h b/chromeos/binder/constants.h index d039b18..531021d5 100644 --- a/chromeos/binder/constants.h +++ b/chromeos/binder/constants.h
@@ -11,12 +11,12 @@ namespace binder { // Context manager's handle is always 0. -const uint32 kContextManagerHandle = 0; +const uint32_t kContextManagerHandle = 0; // Transaction code constants. -const uint32 kFirstTransactionCode = 0x00000001; -const uint32 kLastTransactionCode = 0x00ffffff; -const uint32 kPingTransactionCode = BINDER_PACK_CHARS('_', 'P', 'N', 'G'); +const uint32_t kFirstTransactionCode = 0x00000001; +const uint32_t kLastTransactionCode = 0x00ffffff; +const uint32_t kPingTransactionCode = BINDER_PACK_CHARS('_', 'P', 'N', 'G'); } // namespace binder
diff --git a/chromeos/binder/driver.cc b/chromeos/binder/driver.cc index f82470c..be917db 100644 --- a/chromeos/binder/driver.cc +++ b/chromeos/binder/driver.cc
@@ -7,6 +7,7 @@ #include <errno.h> #include <fcntl.h> #include <linux/android/binder.h> +#include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/user.h>
diff --git a/chromeos/binder/driver.h b/chromeos/binder/driver.h index da7479e03..ccc6e2e 100644 --- a/chromeos/binder/driver.h +++ b/chromeos/binder/driver.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_BINDER_DRIVER_H_ #define CHROMEOS_BINDER_DRIVER_H_ +#include <stddef.h> + #include "base/files/scoped_file.h" #include "base/macros.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/binder/status.h b/chromeos/binder/status.h index 0bcf4fa..346211e1 100644 --- a/chromeos/binder/status.h +++ b/chromeos/binder/status.h
@@ -6,14 +6,13 @@ #define CHROMEOS_BINDER_STATUS_H_ #include <errno.h> - -#include "base/basictypes.h" +#include <stdint.h> namespace binder { // Status code. // Using the same values as used by libbinder. -enum class Status : int32 { +enum class Status : int32_t { OK = 0, UNKNOWN_ERROR = INT32_MIN,
diff --git a/chromeos/binder/transaction_data.h b/chromeos/binder/transaction_data.h index c7602c0..d43fc69 100644 --- a/chromeos/binder/transaction_data.h +++ b/chromeos/binder/transaction_data.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_DATA_H_ #define CHROMEOS_BINDER_TRANSACTION_DATA_H_ -#include "base/basictypes.h" #include "chromeos/binder/status.h" namespace binder { @@ -19,7 +18,7 @@ virtual uintptr_t GetCookie() const = 0; // Returns the transaction code. - virtual uint32 GetCode() const = 0; + virtual uint32_t GetCode() const = 0; // Returns the PID of the sender. virtual pid_t GetSenderPID() const = 0;
diff --git a/chromeos/binder/transaction_data_from_driver.cc b/chromeos/binder/transaction_data_from_driver.cc index 9b76ebf..b14c324e 100644 --- a/chromeos/binder/transaction_data_from_driver.cc +++ b/chromeos/binder/transaction_data_from_driver.cc
@@ -4,6 +4,9 @@ #include "chromeos/binder/transaction_data_from_driver.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/logging.h" @@ -44,7 +47,7 @@ return data_.cookie; } -uint32 TransactionDataFromDriver::GetCode() const { +uint32_t TransactionDataFromDriver::GetCode() const { return data_.code; }
diff --git a/chromeos/binder/transaction_data_from_driver.h b/chromeos/binder/transaction_data_from_driver.h index 96aee9a..cf7837c 100644 --- a/chromeos/binder/transaction_data_from_driver.h +++ b/chromeos/binder/transaction_data_from_driver.h
@@ -5,8 +5,10 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_DATA_FROM_DRIVER_H_ #define CHROMEOS_BINDER_TRANSACTION_DATA_FROM_DRIVER_H_ -#include <unistd.h> #include <linux/android/binder.h> +#include <stddef.h> +#include <stdint.h> +#include <unistd.h> #include "base/callback.h" #include "base/macros.h" @@ -33,7 +35,7 @@ // TransactionData override: uintptr_t GetCookie() const override; - uint32 GetCode() const override; + uint32_t GetCode() const override; pid_t GetSenderPID() const override; uid_t GetSenderEUID() const override; bool IsOneWay() const override;
diff --git a/chromeos/binder/transaction_data_reader.cc b/chromeos/binder/transaction_data_reader.cc index cf206ae..450591165 100644 --- a/chromeos/binder/transaction_data_reader.cc +++ b/chromeos/binder/transaction_data_reader.cc
@@ -4,6 +4,9 @@ #include "chromeos/binder/transaction_data_reader.h" +#include <stddef.h> +#include <stdint.h> + #include "chromeos/binder/transaction_data.h" namespace binder { @@ -32,19 +35,19 @@ return reader_.Read(buf, n) && reader_.Skip(AddPadding(n) - n); } -bool TransactionDataReader::ReadInt32(int32* value) { +bool TransactionDataReader::ReadInt32(int32_t* value) { return ReadData(value, sizeof(*value)); } -bool TransactionDataReader::ReadUint32(uint32* value) { +bool TransactionDataReader::ReadUint32(uint32_t* value) { return ReadData(value, sizeof(*value)); } -bool TransactionDataReader::ReadInt64(int64* value) { +bool TransactionDataReader::ReadInt64(int64_t* value) { return ReadData(value, sizeof(*value)); } -bool TransactionDataReader::ReadUint64(uint64* value) { +bool TransactionDataReader::ReadUint64(uint64_t* value) { return ReadData(value, sizeof(*value)); }
diff --git a/chromeos/binder/transaction_data_reader.h b/chromeos/binder/transaction_data_reader.h index 22dddef..26cb916d 100644 --- a/chromeos/binder/transaction_data_reader.h +++ b/chromeos/binder/transaction_data_reader.h
@@ -5,7 +5,9 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_DATA_READER_H_ #define CHROMEOS_BINDER_TRANSACTION_DATA_READER_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "chromeos/binder/buffer_reader.h" #include "chromeos/chromeos_export.h" @@ -28,17 +30,17 @@ // Reads the specified number of bytes with appropriate padding. bool ReadData(void* buf, size_t n); - // Reads an int32 value. - bool ReadInt32(int32* value); + // Reads an int32_t value. + bool ReadInt32(int32_t* value); - // Reads an uint32 value. - bool ReadUint32(uint32* value); + // Reads an uint32_t value. + bool ReadUint32(uint32_t* value); - // Reads an int64 value. - bool ReadInt64(int64* value); + // Reads an int64_t value. + bool ReadInt64(int64_t* value); - // Reads an uint64 value. - bool ReadUint64(uint64* value); + // Reads an uint64_t value. + bool ReadUint64(uint64_t* value); // Reads a float value. bool ReadFloat(float* value);
diff --git a/chromeos/binder/transaction_data_reader_unittest.cc b/chromeos/binder/transaction_data_reader_unittest.cc index 21c90ec5..8bed9ea 100644 --- a/chromeos/binder/transaction_data_reader_unittest.cc +++ b/chromeos/binder/transaction_data_reader_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "chromeos/binder/transaction_data_reader.h" @@ -31,10 +34,10 @@ } TEST(BinderTransactionDataReaderTest, ReadScalarValues) { - const int32 kInt32Value = -1; - const uint32 kUint32Value = 2; - const int64 kInt64Value = -3; - const uint64 kUint64Value = 4; + const int32_t kInt32Value = -1; + const uint32_t kUint32Value = 2; + const int64_t kInt64Value = -3; + const uint64_t kUint64Value = 4; const float kFloatValue = 5.55; const double kDoubleValue = 6.66; @@ -49,22 +52,22 @@ TransactionDataReader reader(data); EXPECT_TRUE(reader.HasMoreData()); { - int32 result = 0; + int32_t result = 0; EXPECT_TRUE(reader.ReadInt32(&result)); EXPECT_EQ(kInt32Value, result); } { - uint32 result = 0; + uint32_t result = 0; EXPECT_TRUE(reader.ReadUint32(&result)); EXPECT_EQ(kUint32Value, result); } { - int64 result = 0; + int64_t result = 0; EXPECT_TRUE(reader.ReadInt64(&result)); EXPECT_EQ(kInt64Value, result); } { - uint64 result = 0; + uint64_t result = 0; EXPECT_TRUE(reader.ReadUint64(&result)); EXPECT_EQ(kUint64Value, result); }
diff --git a/chromeos/binder/transaction_status.cc b/chromeos/binder/transaction_status.cc index cdf0d39..20f997c 100644 --- a/chromeos/binder/transaction_status.cc +++ b/chromeos/binder/transaction_status.cc
@@ -14,7 +14,7 @@ return 0; } -uint32 TransactionStatus::GetCode() const { +uint32_t TransactionStatus::GetCode() const { return 0; }
diff --git a/chromeos/binder/transaction_status.h b/chromeos/binder/transaction_status.h index c239e73e..088d173 100644 --- a/chromeos/binder/transaction_status.h +++ b/chromeos/binder/transaction_status.h
@@ -5,7 +5,9 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_STATUS_H_ #define CHROMEOS_BINDER_TRANSACTION_STATUS_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "chromeos/binder/status.h" #include "chromeos/binder/transaction_data.h" @@ -23,7 +25,7 @@ // TransactionData override: uintptr_t GetCookie() const override; - uint32 GetCode() const override; + uint32_t GetCode() const override; pid_t GetSenderPID() const override; uid_t GetSenderEUID() const override; bool IsOneWay() const override;
diff --git a/chromeos/binder/util.cc b/chromeos/binder/util.cc index e5788a3..cd9802d 100644 --- a/chromeos/binder/util.cc +++ b/chromeos/binder/util.cc
@@ -5,12 +5,13 @@ #include "chromeos/binder/util.h" #include <linux/android/binder.h> +#include <stdint.h> #include "base/logging.h" namespace binder { -const char* CommandToString(uint32 command) { +const char* CommandToString(uint32_t command) { switch (command) { case BR_ERROR: return "BR_ERROR";
diff --git a/chromeos/binder/util.h b/chromeos/binder/util.h index 6801d240..461d4e0 100644 --- a/chromeos/binder/util.h +++ b/chromeos/binder/util.h
@@ -5,14 +5,13 @@ #ifndef CHROMEOS_BINDER_UTIL_H_ #define CHROMEOS_BINDER_UTIL_H_ -#include "base/basictypes.h" #include "chromeos/chromeos_export.h" namespace binder { // Returns the string representation of the given binder command or "UNKNOWN" // if command is unknown, never returns null. -CHROMEOS_EXPORT const char* CommandToString(uint32 command); +CHROMEOS_EXPORT const char* CommandToString(uint32_t command); } // namespace binder
diff --git a/chromeos/binder/writable_transaction_data.cc b/chromeos/binder/writable_transaction_data.cc index 07c4bd6..1afbdc0b5 100644 --- a/chromeos/binder/writable_transaction_data.cc +++ b/chromeos/binder/writable_transaction_data.cc
@@ -14,7 +14,7 @@ return 0; } -uint32 WritableTransactionData::GetCode() const { +uint32_t WritableTransactionData::GetCode() const { return code_; } @@ -66,21 +66,21 @@ } } -void WritableTransactionData::WriteInt32(int32 value) { +void WritableTransactionData::WriteInt32(int32_t value) { // Binder is not used for inter-device communication, so no endian conversion. // The same applies to other Write() methods. WriteData(&value, sizeof(value)); } -void WritableTransactionData::WriteUint32(uint32 value) { +void WritableTransactionData::WriteUint32(uint32_t value) { WriteData(&value, sizeof(value)); } -void WritableTransactionData::WriteInt64(int64 value) { +void WritableTransactionData::WriteInt64(int64_t value) { WriteData(&value, sizeof(value)); } -void WritableTransactionData::WriteUint64(uint64 value) { +void WritableTransactionData::WriteUint64(uint64_t value) { WriteData(&value, sizeof(value)); }
diff --git a/chromeos/binder/writable_transaction_data.h b/chromeos/binder/writable_transaction_data.h index f32eff8..9001ad3 100644 --- a/chromeos/binder/writable_transaction_data.h +++ b/chromeos/binder/writable_transaction_data.h
@@ -5,9 +5,11 @@ #ifndef CHROMEOS_BINDER_WRITABLE_TRANSACTION_DATA_H_ #define CHROMEOS_BINDER_WRITABLE_TRANSACTION_DATA_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/macros.h" #include "chromeos/binder/transaction_data.h" #include "chromeos/chromeos_export.h" @@ -24,7 +26,7 @@ // TransactionData override: uintptr_t GetCookie() const override; - uint32 GetCode() const override; + uint32_t GetCode() const override; pid_t GetSenderPID() const override; uid_t GetSenderEUID() const override; bool IsOneWay() const override; @@ -39,7 +41,7 @@ void Reserve(size_t n); // Sets the transaction code returned by GetCode(). - void SetCode(uint32 code) { code_ = code; } + void SetCode(uint32_t code) { code_ = code; } // Sets the value returned by IsOneWay(). void SetIsOneWay(bool is_one_way) { is_one_way_ = is_one_way; } @@ -47,17 +49,17 @@ // Appends the specified data with appropriate padding. void WriteData(const void* data, size_t n); - // Appends an int32 value. - void WriteInt32(int32 value); + // Appends an int32_t value. + void WriteInt32(int32_t value); - // Appends a uint32 value. - void WriteUint32(uint32 value); + // Appends a uint32_t value. + void WriteUint32(uint32_t value); - // Appends an int64 vlaue. - void WriteInt64(int64 value); + // Appends an int64_t vlaue. + void WriteInt64(int64_t value); - // Appends a uint64 value. - void WriteUint64(uint64 value); + // Appends a uint64_t value. + void WriteUint64(uint64_t value); // Appends a float value. void WriteFloat(float value); @@ -67,7 +69,7 @@ // TODO(hashimoto): Support more types (i.e. strings, FDs, objects). private: - uint32 code_ = 0; + uint32_t code_ = 0; bool is_one_way_ = false; std::vector<char> data_; std::vector<uintptr_t> object_offsets_;
diff --git a/chromeos/binder/writable_transaction_data_unittest.cc b/chromeos/binder/writable_transaction_data_unittest.cc index a77a947..07d1d31 100644 --- a/chromeos/binder/writable_transaction_data_unittest.cc +++ b/chromeos/binder/writable_transaction_data_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "chromeos/binder/buffer_reader.h" #include "chromeos/binder/writable_transaction_data.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,52 +28,52 @@ } TEST(BinderWritableTransactionDataTest, WriteInt32) { - const int32 kValue = -1234; + const int32_t kValue = -1234; WritableTransactionData data; data.WriteInt32(kValue); EXPECT_EQ(sizeof(kValue), data.GetDataSize()); BufferReader reader(reinterpret_cast<const char*>(data.GetData()), data.GetDataSize()); - int32 result = 0; + int32_t result = 0; EXPECT_TRUE(reader.Read(&result, sizeof(result))); EXPECT_EQ(kValue, result); EXPECT_FALSE(reader.HasMoreData()); } TEST(BinderWritableTransactionDataTest, WriteUint32) { - const uint32 kValue = 1234; + const uint32_t kValue = 1234; WritableTransactionData data; data.WriteUint32(kValue); EXPECT_EQ(sizeof(kValue), data.GetDataSize()); BufferReader reader(reinterpret_cast<const char*>(data.GetData()), data.GetDataSize()); - uint32 result = 0; + uint32_t result = 0; EXPECT_TRUE(reader.Read(&result, sizeof(result))); EXPECT_EQ(kValue, result); EXPECT_FALSE(reader.HasMoreData()); } TEST(BinderWritableTransactionDataTest, WriteInt64) { - const int64 kValue = -1234; + const int64_t kValue = -1234; WritableTransactionData data; data.WriteInt64(kValue); EXPECT_EQ(sizeof(kValue), data.GetDataSize()); BufferReader reader(reinterpret_cast<const char*>(data.GetData()), data.GetDataSize()); - int64 result = 0; + int64_t result = 0; EXPECT_TRUE(reader.Read(&result, sizeof(result))); EXPECT_EQ(kValue, result); EXPECT_FALSE(reader.HasMoreData()); } TEST(BinderWritableTransactionDataTest, WriteUint64) { - const uint64 kValue = 1234; + const uint64_t kValue = 1234; WritableTransactionData data; data.WriteUint64(kValue); EXPECT_EQ(sizeof(kValue), data.GetDataSize()); BufferReader reader(reinterpret_cast<const char*>(data.GetData()), data.GetDataSize()); - uint64 result = 0; + uint64_t result = 0; EXPECT_TRUE(reader.Read(&result, sizeof(result))); EXPECT_EQ(kValue, result); EXPECT_FALSE(reader.HasMoreData());
diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h index 694ea31..a837e4d 100644 --- a/chromeos/cert_loader.h +++ b/chromeos/cert_loader.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc index 8c397bd..f594f93a 100644 --- a/chromeos/cert_loader_unittest.cc +++ b/chromeos/cert_loader_unittest.cc
@@ -4,6 +4,8 @@ #include "chromeos/cert_loader.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/memory/scoped_ptr.h"
diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc index eab0bd5..b95966f 100644 --- a/chromeos/cryptohome/async_method_caller.cc +++ b/chromeos/cryptohome/async_method_caller.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chromeos/cryptohome/async_method_caller.h b/chromeos/cryptohome/async_method_caller.h index 7f1660e..374da452 100644 --- a/chromeos/cryptohome/async_method_caller.h +++ b/chromeos/cryptohome/async_method_caller.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "chromeos/attestation/attestation_constants.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/cryptohome/cryptohome_parameters.cc b/chromeos/cryptohome/cryptohome_parameters.cc index 5b3ac4d..8b65a71 100644 --- a/chromeos/cryptohome/cryptohome_parameters.cc +++ b/chromeos/cryptohome/cryptohome_parameters.cc
@@ -4,6 +4,9 @@ #include "chromeos/cryptohome/cryptohome_parameters.h" +#include <stddef.h> +#include <stdint.h> + #include "chromeos/dbus/cryptohome/key.pb.h" namespace cryptohome { @@ -81,15 +84,14 @@ KeyDefinition::ProviderData::ProviderData(const ProviderData& other) : name(other.name) { if (other.number) - number.reset(new int64(*other.number)); + number.reset(new int64_t(*other.number)); if (other.bytes) bytes.reset(new std::string(*other.bytes)); } -KeyDefinition::ProviderData::ProviderData(const std::string& name, int64 number) - : name(name), - number(new int64(number)) { -} +KeyDefinition::ProviderData::ProviderData(const std::string& name, + int64_t number) + : name(name), number(new int64_t(number)) {} KeyDefinition::ProviderData::ProviderData(const std::string& name, const std::string& bytes) @@ -99,7 +101,7 @@ void KeyDefinition::ProviderData::operator=(const ProviderData& other) { name = other.name; - number.reset(other.number ? new int64(*other.number) : NULL); + number.reset(other.number ? new int64_t(*other.number) : NULL); bytes.reset(other.bytes ? new std::string(*other.bytes) : NULL); }
diff --git a/chromeos/cryptohome/cryptohome_parameters.h b/chromeos/cryptohome/cryptohome_parameters.h index 0b744a4..3738b56 100644 --- a/chromeos/cryptohome/cryptohome_parameters.h +++ b/chromeos/cryptohome/cryptohome_parameters.h
@@ -5,10 +5,11 @@ #ifndef CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_ #define CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h" @@ -85,7 +86,7 @@ ProviderData(); explicit ProviderData(const std::string& name); explicit ProviderData(const ProviderData& other); - ProviderData(const std::string& name, int64 number); + ProviderData(const std::string& name, int64_t number); ProviderData(const std::string& name, const std::string& bytes); void operator=(const ProviderData& other); ~ProviderData(); @@ -93,7 +94,7 @@ bool operator==(const ProviderData& other) const; std::string name; - scoped_ptr<int64> number; + scoped_ptr<int64_t> number; scoped_ptr<std::string> bytes; };
diff --git a/chromeos/cryptohome/cryptohome_util.cc b/chromeos/cryptohome/cryptohome_util.cc index 5e2b310..7d057b1 100644 --- a/chromeos/cryptohome/cryptohome_util.cc +++ b/chromeos/cryptohome/cryptohome_util.cc
@@ -4,6 +4,8 @@ #include "chromeos/cryptohome/cryptohome_util.h" +#include <stdint.h> + #include "base/logging.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -34,7 +36,7 @@ bool InstallAttributesGet( const std::string& name, std::string* value) { - std::vector<uint8> buf; + std::vector<uint8_t> buf; bool success = false; DBusThreadManager::Get()->GetCryptohomeClient()-> InstallAttributesGet(name, &buf, &success); @@ -49,7 +51,7 @@ bool InstallAttributesSet( const std::string& name, const std::string& value) { - std::vector<uint8> buf(value.c_str(), value.c_str() + value.size() + 1); + std::vector<uint8_t> buf(value.c_str(), value.c_str() + value.size() + 1); bool success = false; DBusThreadManager::Get()->GetCryptohomeClient()-> InstallAttributesSet(name, buf, &success);
diff --git a/chromeos/cryptohome/homedir_methods.cc b/chromeos/cryptohome/homedir_methods.cc index 0407e3c..8413c72 100644 --- a/chromeos/cryptohome/homedir_methods.cc +++ b/chromeos/cryptohome/homedir_methods.cc
@@ -4,8 +4,12 @@ #include "chromeos/cryptohome/homedir_methods.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "chromeos/dbus/cryptohome/key.pb.h" #include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -387,7 +391,7 @@ // Extract |number|. if (provider_data_it->has_number()) { - provider_data.number.reset(new int64(provider_data_it->number())); + provider_data.number.reset(new int64_t(provider_data_it->number())); ++data_items; }
diff --git a/chromeos/cryptohome/homedir_methods.h b/chromeos/cryptohome/homedir_methods.h index cabfded5..17f0f55 100644 --- a/chromeos/cryptohome/homedir_methods.h +++ b/chromeos/cryptohome/homedir_methods.h
@@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "chromeos/chromeos_export.h" #include "chromeos/cryptohome/cryptohome_parameters.h"
diff --git a/chromeos/cryptohome/homedir_methods_unittest.cc b/chromeos/cryptohome/homedir_methods_unittest.cc index 9edd7b0..f6174add 100644 --- a/chromeos/cryptohome/homedir_methods_unittest.cc +++ b/chromeos/cryptohome/homedir_methods_unittest.cc
@@ -4,9 +4,12 @@ #include "chromeos/cryptohome/homedir_methods.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/cryptohome_client.h" @@ -37,9 +40,9 @@ const char kUserID[] = "user@example.com"; const char kKeyLabel[] = "key_label"; -const int64 kKeyRevision = 123; +const int64_t kKeyRevision = 123; const char kProviderData1Name[] = "data_1"; -const int64 kProviderData1Number = 12345; +const int64_t kProviderData1Number = 12345; const char kProviderData2Name[] = "data_2"; const char kProviderData2Bytes[] = "data_2 bytes";
diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h index 515ec780..97ead2fa 100644 --- a/chromeos/cryptohome/mock_async_method_caller.h +++ b/chromeos/cryptohome/mock_async_method_caller.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/cryptohome/async_method_caller.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chromeos/cryptohome/mock_homedir_methods.h b/chromeos/cryptohome/mock_homedir_methods.h index 8647744d2..81a82a2 100644 --- a/chromeos/cryptohome/mock_homedir_methods.h +++ b/chromeos/cryptohome/mock_homedir_methods.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/cryptohome/homedir_methods.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chromeos/cryptohome/system_salt_getter.cc b/chromeos/cryptohome/system_salt_getter.cc index b0bbc9e..0e79fc12 100644 --- a/chromeos/cryptohome/system_salt_getter.cc +++ b/chromeos/cryptohome/system_salt_getter.cc
@@ -4,6 +4,8 @@ #include "chromeos/cryptohome/system_salt_getter.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -54,9 +56,10 @@ callback)); } -void SystemSaltGetter::DidGetSystemSalt(const GetSystemSaltCallback& callback, - DBusMethodCallStatus call_status, - const std::vector<uint8>& system_salt) { +void SystemSaltGetter::DidGetSystemSalt( + const GetSystemSaltCallback& callback, + DBusMethodCallStatus call_status, + const std::vector<uint8_t>& system_salt) { if (call_status == DBUS_METHOD_CALL_SUCCESS && !system_salt.empty() && system_salt.size() % 2 == 0U) @@ -94,7 +97,7 @@ // static std::string SystemSaltGetter::ConvertRawSaltToHexString( - const std::vector<uint8>& salt) { + const std::vector<uint8_t>& salt) { return base::ToLowerASCII( base::HexEncode(reinterpret_cast<const void*>(salt.data()), salt.size())); }
diff --git a/chromeos/cryptohome/system_salt_getter.h b/chromeos/cryptohome/system_salt_getter.h index ee331330..8654e50 100644 --- a/chromeos/cryptohome/system_salt_getter.h +++ b/chromeos/cryptohome/system_salt_getter.h
@@ -5,11 +5,13 @@ #ifndef CHROMEOS_CRYPTOHOME_SYSTEM_SALT_GETTER_H_ #define CHROMEOS_CRYPTOHOME_SYSTEM_SALT_GETTER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_method_call_status.h" @@ -29,7 +31,8 @@ static SystemSaltGetter* Get(); // Converts |salt| to a hex encoded string. - static std::string ConvertRawSaltToHexString(const std::vector<uint8>& salt); + static std::string ConvertRawSaltToHexString( + const std::vector<uint8_t>& salt); // Returns system hash in hex encoded ascii format. Note: this may return // an empty string (e.g. errors in D-Bus layer) @@ -45,7 +48,7 @@ bool service_is_available); void DidGetSystemSalt(const GetSystemSaltCallback& callback, DBusMethodCallStatus call_status, - const std::vector<uint8>& system_salt); + const std::vector<uint8_t>& system_salt); std::string system_salt_;
diff --git a/chromeos/dbus/amplifier_client.cc b/chromeos/dbus/amplifier_client.cc index 5a3ffa6..6f8cd2b 100644 --- a/chromeos/dbus/amplifier_client.cc +++ b/chromeos/dbus/amplifier_client.cc
@@ -4,7 +4,10 @@ #include "chromeos/dbus/amplifier_client.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/observer_list.h" @@ -154,7 +157,7 @@ void AmplifierClientImpl::OnError(dbus::Signal* signal) { dbus::MessageReader reader(signal); - int32 error_code = 0; + int32_t error_code = 0; if (!reader.PopInt32(&error_code)) { LOG(ERROR) << "Invalid signal: " << signal->ToString(); return;
diff --git a/chromeos/dbus/amplifier_client.h b/chromeos/dbus/amplifier_client.h index c63a286..4ff3ab1 100644 --- a/chromeos/dbus/amplifier_client.h +++ b/chromeos/dbus/amplifier_client.h
@@ -5,7 +5,9 @@ #ifndef CHROMEOS_DBUS_AMPLIFIER_CLIENT_H_ #define CHROMEOS_DBUS_AMPLIFIER_CLIENT_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/dbus_method_call_status.h" @@ -20,7 +22,7 @@ public: virtual ~Observer() {} // Called when the Error signal is received. - virtual void OnError(int32 error_code) = 0; + virtual void OnError(int32_t error_code) = 0; }; ~AmplifierClient() override;
diff --git a/chromeos/dbus/ap_manager_client.cc b/chromeos/dbus/ap_manager_client.cc index 1a191c7..8b31e96 100644 --- a/chromeos/dbus/ap_manager_client.cc +++ b/chromeos/dbus/ap_manager_client.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/dbus/ap_manager_client.h b/chromeos/dbus/ap_manager_client.h index f160b03..9f98f304 100644 --- a/chromeos/dbus/ap_manager_client.h +++ b/chromeos/dbus/ap_manager_client.h
@@ -4,6 +4,8 @@ #ifndef CHROMEOS_DBUS_AP_MANAGER_CLIENT_H_ #define CHROMEOS_DBUS_AP_MANAGER_CLIENT_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector>
diff --git a/chromeos/dbus/audio_dsp_client.cc b/chromeos/dbus/audio_dsp_client.cc index 74a8dcd..94b3992 100644 --- a/chromeos/dbus/audio_dsp_client.cc +++ b/chromeos/dbus/audio_dsp_client.cc
@@ -4,7 +4,10 @@ #include "chromeos/dbus/audio_dsp_client.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/observer_list.h" @@ -131,16 +134,16 @@ void GetBass(const DoubleDBusMethodCallback& callback) override; void GetCapabilitiesOEM( const ThreeStringDBusMethodCallback& callback) override; - void SetCapabilitiesOEM(uint32 speaker_id, + void SetCapabilitiesOEM(uint32_t speaker_id, const std::string& speaker_capabilities, const std::string& driver_capabilities, const VoidDBusMethodCallback& callback) override; - void GetFilterConfigOEM(uint32 speaker_id, + void GetFilterConfigOEM(uint32_t speaker_id, const TwoStringDBusMethodCallback& callback) override; void SetFilterConfigOEM(const std::string& speaker_config, const std::string& driver_config, const VoidDBusMethodCallback& callback) override; - void SetSourceType(uint16 source_type, + void SetSourceType(uint16_t source_type, const VoidDBusMethodCallback& callback) override; void AmplifierVolumeChanged(double db_spl, const VoidDBusMethodCallback& callback) override; @@ -287,7 +290,7 @@ } void AudioDspClientImpl::SetCapabilitiesOEM( - uint32 speaker_id, + uint32_t speaker_id, const std::string& speaker_capabilities, const std::string& driver_capabilities, const VoidDBusMethodCallback& callback) { @@ -303,7 +306,7 @@ } void AudioDspClientImpl::GetFilterConfigOEM( - uint32 speaker_id, + uint32_t speaker_id, const TwoStringDBusMethodCallback& callback) { dbus::MethodCall method_call(audio_dsp::kAudioDspInterface, audio_dsp::kGetFilterConfigOEMMethod); @@ -328,7 +331,7 @@ base::Bind(&OnVoidDBusMethod, callback)); } -void AudioDspClientImpl::SetSourceType(uint16 source_type, +void AudioDspClientImpl::SetSourceType(uint16_t source_type, const VoidDBusMethodCallback& callback) { dbus::MethodCall method_call(audio_dsp::kAudioDspInterface, audio_dsp::kSetSourceTypeMethod); @@ -353,7 +356,7 @@ void AudioDspClientImpl::OnError(dbus::Signal* signal) { dbus::MessageReader reader(signal); - int32 error_code = 0; + int32_t error_code = 0; if (!reader.PopInt32(&error_code)) { LOG(ERROR) << "Invalid signal: " << signal->ToString(); return;
diff --git a/chromeos/dbus/audio_dsp_client.h b/chromeos/dbus/audio_dsp_client.h index a1aa2c4..5db7880c 100644 --- a/chromeos/dbus/audio_dsp_client.h +++ b/chromeos/dbus/audio_dsp_client.h
@@ -5,7 +5,9 @@ #ifndef CHROMEOS_DBUS_AUDIO_DSP_CLIENT_H_ #define CHROMEOS_DBUS_AUDIO_DSP_CLIENT_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/dbus_method_call_status.h" @@ -38,7 +40,7 @@ virtual ~Observer() {} // Called when the Error signal is received. - virtual void OnError(int32 error_code) = 0; + virtual void OnError(int32_t error_code) = 0; }; ~AudioDspClient() override; @@ -109,7 +111,7 @@ // Calls SetCapabilitiesOEM method. // |callback| will be called with a DBusMethodCallStatus indicating whether // the DBus method call succeeded. - virtual void SetCapabilitiesOEM(uint32 speaker_id, + virtual void SetCapabilitiesOEM(uint32_t speaker_id, const std::string& speaker_capabilities, const std::string& driver_capabilities, const VoidDBusMethodCallback& callback) = 0; @@ -119,7 +121,7 @@ // the DBus method call succeeded, and two std::strings that constitute // the return value from the DBus method. virtual void GetFilterConfigOEM( - uint32 speaker_id, + uint32_t speaker_id, const TwoStringDBusMethodCallback& callback) = 0; // Calls SetFilterConfigOEM method. @@ -132,7 +134,7 @@ // Calls SetSourceType method. // |callback| will be called with a DBusMethodCallStatus indicating whether // the DBus method call succeeded. - virtual void SetSourceType(uint16 source_type, + virtual void SetSourceType(uint16_t source_type, const VoidDBusMethodCallback& callback) = 0; // Calls AmplifierVolumeChanged method.
diff --git a/chromeos/dbus/audio_node.cc b/chromeos/dbus/audio_node.cc index c29ffb8..17dd697 100644 --- a/chromeos/dbus/audio_node.cc +++ b/chromeos/dbus/audio_node.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/audio_node.h" +#include <stdint.h> + #include "base/format_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -18,20 +20,19 @@ } AudioNode::AudioNode(bool is_input, - uint64 id, + uint64_t id, std::string device_name, std::string type, std::string name, bool active, - uint64 plugged_time) + uint64_t plugged_time) : is_input(is_input), id(id), device_name(device_name), type(type), name(name), active(active), - plugged_time(plugged_time) { -} + plugged_time(plugged_time) {} AudioNode::~AudioNode() {}
diff --git a/chromeos/dbus/audio_node.h b/chromeos/dbus/audio_node.h index ea48c00..5bc9fcf2 100644 --- a/chromeos/dbus/audio_node.h +++ b/chromeos/dbus/audio_node.h
@@ -5,10 +5,11 @@ #ifndef CHROMEOS_DBUS_AUDIO_NODE_H_ #define CHROMEOS_DBUS_AUDIO_NODE_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "chromeos/chromeos_export.h" namespace chromeos { @@ -16,23 +17,23 @@ // Structure to hold AudioNode data received from cras. struct CHROMEOS_EXPORT AudioNode { bool is_input; - uint64 id; + uint64_t id; std::string device_name; std::string type; std::string name; std::string mic_positions; bool active; // Time that the node was plugged in. - uint64 plugged_time; + uint64_t plugged_time; AudioNode(); AudioNode(bool is_input, - uint64 id, + uint64_t id, std::string device_name, std::string type, std::string name, bool active, - uint64 plugged_time); + uint64_t plugged_time); ~AudioNode(); std::string ToString() const; };
diff --git a/chromeos/dbus/blocking_method_caller.h b/chromeos/dbus/blocking_method_caller.h index 6291f47..5d7db29 100644 --- a/chromeos/dbus/blocking_method_caller.h +++ b/chromeos/dbus/blocking_method_caller.h
@@ -6,6 +6,7 @@ #define CHROMEOS_DBUS_BLOCKING_METHOD_CALLER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "chromeos/chromeos_export.h" #include "dbus/message.h"
diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc index e8c3a8b..651ba44 100644 --- a/chromeos/dbus/cras_audio_client.cc +++ b/chromeos/dbus/cras_audio_client.cc
@@ -4,8 +4,11 @@ #include "chromeos/dbus/cras_audio_client.h" +#include <stdint.h> + #include "base/bind.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "dbus/bus.h" #include "dbus/message.h" @@ -62,7 +65,7 @@ weak_ptr_factory_.GetWeakPtr(), error_callback)); } - void SetOutputNodeVolume(uint64 node_id, int32 volume) override { + void SetOutputNodeVolume(uint64_t node_id, int32_t volume) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetOutputNodeVolume); dbus::MessageWriter writer(&method_call); @@ -85,7 +88,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void SetInputNodeGain(uint64 node_id, int32 input_gain) override { + void SetInputNodeGain(uint64_t node_id, int32_t input_gain) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetInputNodeGain); dbus::MessageWriter writer(&method_call); @@ -108,7 +111,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void SetActiveOutputNode(uint64 node_id) override { + void SetActiveOutputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -119,7 +122,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void SetActiveInputNode(uint64 node_id) override { + void SetActiveInputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -130,7 +133,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void AddActiveInputNode(uint64 node_id) override { + void AddActiveInputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -141,7 +144,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void RemoveActiveInputNode(uint64 node_id) override { + void RemoveActiveInputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -152,7 +155,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void AddActiveOutputNode(uint64 node_id) override { + void AddActiveOutputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -162,7 +165,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void RemoveActiveOutputNode(uint64 node_id) override { + void RemoveActiveOutputNode(uint64_t node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -172,7 +175,7 @@ dbus::ObjectProxy::EmptyResponseCallback()); } - void SwapLeftRight(uint64 node_id, bool swap) override { + void SwapLeftRight(uint64_t node_id, bool swap) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSwapLeftRight); dbus::MessageWriter writer(&method_call); @@ -283,7 +286,7 @@ void ActiveOutputNodeChangedReceived(dbus::Signal* signal) { dbus::MessageReader reader(signal); - uint64 node_id; + uint64_t node_id; if (!reader.PopUint64(&node_id)) { LOG(ERROR) << "Error reading signal from cras:" << signal->ToString(); @@ -293,7 +296,7 @@ void ActiveInputNodeChangedReceived(dbus::Signal* signal) { dbus::MessageReader reader(signal); - uint64 node_id; + uint64_t node_id; if (!reader.PopUint64(&node_id)) { LOG(ERROR) << "Error reading signal from cras:" << signal->ToString(); @@ -442,11 +445,9 @@ void CrasAudioClient::Observer::NodesChanged() { } -void CrasAudioClient::Observer::ActiveOutputNodeChanged(uint64 node_id){ -} +void CrasAudioClient::Observer::ActiveOutputNodeChanged(uint64_t node_id) {} -void CrasAudioClient::Observer::ActiveInputNodeChanged(uint64 node_id) { -} +void CrasAudioClient::Observer::ActiveInputNodeChanged(uint64_t node_id) {} CrasAudioClient::CrasAudioClient() { }
diff --git a/chromeos/dbus/cras_audio_client.h b/chromeos/dbus/cras_audio_client.h index 4b2d7eb3..0eff85d 100644 --- a/chromeos/dbus/cras_audio_client.h +++ b/chromeos/dbus/cras_audio_client.h
@@ -5,7 +5,10 @@ #ifndef CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_H_ #define CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_H_ +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/audio_node.h" @@ -34,10 +37,10 @@ virtual void NodesChanged(); // Called when active audio output node changed to new node with |node_id|. - virtual void ActiveOutputNodeChanged(uint64 node_id); + virtual void ActiveOutputNodeChanged(uint64_t node_id); // Called when active audio input node changed to new node with |node_id|. - virtual void ActiveInputNodeChanged(uint64 node_id); + virtual void ActiveInputNodeChanged(uint64_t node_id); protected: virtual ~Observer(); @@ -77,50 +80,50 @@ // Sets output volume of the given |node_id| to |volume|, in the rage of // [0, 100]. - virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) = 0; + virtual void SetOutputNodeVolume(uint64_t node_id, int32_t volume) = 0; // Sets output mute from user action. virtual void SetOutputUserMute(bool mute_on) = 0; // Sets input gain of the given |node_id| to |gain|, in the range of // [0, 100]. - virtual void SetInputNodeGain(uint64 node_id, int32 gain) = 0; + virtual void SetInputNodeGain(uint64_t node_id, int32_t gain) = 0; // Sets input mute state to |mute_on| value. virtual void SetInputMute(bool mute_on) = 0; // Sets the active output node to |node_id|. - virtual void SetActiveOutputNode(uint64 node_id) = 0; + virtual void SetActiveOutputNode(uint64_t node_id) = 0; // Sets the primary active input node to |node_id|. - virtual void SetActiveInputNode(uint64 node_id) = 0; + virtual void SetActiveInputNode(uint64_t node_id) = 0; // Adds input node |node_id| to the active input list. This is used to add // an additional active input node besides the one set by SetActiveInputNode. // Note that this action will not trigger an ActiveInputNodeChanged event and // nothing will happen if the |node_id| has already been set as active. - virtual void AddActiveInputNode(uint64 node_id) = 0; + virtual void AddActiveInputNode(uint64_t node_id) = 0; // Removes input node |node_id| from the active input list. This is used for // removing an active input node added by AddActiveInputNode. - virtual void RemoveActiveInputNode(uint64 node_id) = 0; + virtual void RemoveActiveInputNode(uint64_t node_id) = 0; // Adds input node |node_id| to the active outputs list. This is used to add // an additional active output node besides the one set by SetActiveInputNode. // Note that this action will not trigger an ActiveOutputNodeChanged event // and nothing will happen if the |node_id| has already been set as active. - virtual void AddActiveOutputNode(uint64 node_id) = 0; + virtual void AddActiveOutputNode(uint64_t node_id) = 0; // Removes output node |node_id| from the active output list. This is used for // removing an active output node added by AddActiveOutputNode. - virtual void RemoveActiveOutputNode(uint64 node_id) = 0; + virtual void RemoveActiveOutputNode(uint64_t node_id) = 0; // Swaps the left and right channel of the primary active output device. // Swap the left and right channel if |swap| is true; otherwise, swap the left // and right channel back to the normal mode. // The dbus message will be dropped if this feature is not supported on the // |node_id|. - virtual void SwapLeftRight(uint64 node_id, bool swap) = 0; + virtual void SwapLeftRight(uint64_t node_id, bool swap) = 0; // Creates the instance. static CrasAudioClient* Create();
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc index fafbdec..eee2f72 100644 --- a/chromeos/dbus/cros_disks_client.cc +++ b/chromeos/dbus/cros_disks_client.cc
@@ -4,12 +4,16 @@ #include "chromeos/dbus/cros_disks_client.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" @@ -44,14 +48,14 @@ const char kMountLabelOption[] = "mountlabel"; // Checks if retrieved media type is in boundaries of DeviceMediaType. -bool IsValidMediaType(uint32 type) { - return type < static_cast<uint32>(cros_disks::DEVICE_MEDIA_NUM_VALUES); +bool IsValidMediaType(uint32_t type) { + return type < static_cast<uint32_t>(cros_disks::DEVICE_MEDIA_NUM_VALUES); } // Translates enum used in cros-disks to enum used in Chrome. // Note that we could just do static_cast, but this is less sensitive to // changes in cros-disks. -DeviceType DeviceMediaTypeToDeviceType(uint32 media_type_uint32) { +DeviceType DeviceMediaTypeToDeviceType(uint32_t media_type_uint32) { if (!IsValidMediaType(media_type_uint32)) return DEVICE_TYPE_UNKNOWN; @@ -77,9 +81,9 @@ } bool ReadMountEntryFromDbus(dbus::MessageReader* reader, MountEntry* entry) { - uint32 error_code = 0; + uint32_t error_code = 0; std::string source_path; - uint32 mount_type = 0; + uint32_t mount_type = 0; std::string mount_path; if (!reader->PopUint32(&error_code) || !reader->PopString(&source_path) || @@ -310,7 +314,7 @@ // make this fail if reader is not able to read the error code value from // the response. dbus::MessageReader reader(response); - uint32 error_code = 0; + uint32_t error_code = 0; if (reader.PopUint32(&error_code) && static_cast<MountError>(error_code) != MOUNT_ERROR_NONE) { error_callback.Run(); @@ -426,7 +430,7 @@ // Handles FormatCompleted signal and calls |handler|. void OnFormatCompleted(FormatCompletedHandler handler, dbus::Signal* signal) { dbus::MessageReader reader(signal); - uint32 error_code = 0; + uint32_t error_code = 0; std::string device_path; if (!reader.PopUint32(&error_code) || !reader.PopString(&device_path)) { LOG(ERROR) << "Invalid signal: " << signal->ToString(); @@ -519,7 +523,7 @@ // } // dict entry { // string "DeviceMediaType" -// variant uint32 1 +// variant uint32_t 1 // } // dict entry { // string "DeviceMountPaths" @@ -532,7 +536,7 @@ // } // dict entry { // string "DeviceSize" -// variant uint64 7998537728 +// variant uint64_t 7998537728 // } // dict entry { // string "DriveIsRotational" @@ -606,15 +610,16 @@ properties->GetStringWithoutPathExpansion(cros_disks::kIdLabel, &label_); properties->GetStringWithoutPathExpansion(cros_disks::kIdUuid, &uuid_); - // dbus::PopDataAsValue() pops uint64 as double. - // The top 11 bits of uint64 are dropped by the use of double. But, this works + // dbus::PopDataAsValue() pops uint64_t as double. + // The top 11 bits of uint64_t are dropped by the use of double. But, this + // works // unless the size exceeds 8 PB. double device_size_double = 0; if (properties->GetDoubleWithoutPathExpansion(cros_disks::kDeviceSize, &device_size_double)) total_size_in_bytes_ = device_size_double; - // dbus::PopDataAsValue() pops uint32 as double. + // dbus::PopDataAsValue() pops uint32_t as double. double media_type_double = 0; if (properties->GetDoubleWithoutPathExpansion(cros_disks::kDeviceMediaType, &media_type_double))
diff --git a/chromeos/dbus/cros_disks_client.h b/chromeos/dbus/cros_disks_client.h index 840b29560..f5d01084 100644 --- a/chromeos/dbus/cros_disks_client.h +++ b/chromeos/dbus/cros_disks_client.h
@@ -5,11 +5,13 @@ #ifndef CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_ #define CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/dbus_client_implementation_type.h" @@ -153,7 +155,7 @@ DeviceType device_type() const { return device_type_; } // Total size of the disk in bytes. - uint64 total_size_in_bytes() const { return total_size_in_bytes_; } + uint64_t total_size_in_bytes() const { return total_size_in_bytes_; } // Is the device read-only. bool is_read_only() const { return is_read_only_; } @@ -183,7 +185,7 @@ std::string product_name_; std::string drive_model_; DeviceType device_type_; - uint64 total_size_in_bytes_; + uint64_t total_size_in_bytes_; bool is_read_only_; bool is_hidden_; std::string uuid_;
diff --git a/chromeos/dbus/cros_disks_client_unittest.cc b/chromeos/dbus/cros_disks_client_unittest.cc index fc4c23f4..82dbf33 100644 --- a/chromeos/dbus/cros_disks_client_unittest.cc +++ b/chromeos/dbus/cros_disks_client_unittest.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/cros_disks_client.h" +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "dbus/message.h" #include "testing/gtest/include/gtest/gtest.h" @@ -45,10 +47,10 @@ const bool kDeviceIsOnBootDevice = true; const bool kDeviceIsOnRemovableDevice = true; const bool kDeviceIsReadOnly = true; - const uint32 kDeviceMediaType = cros_disks::DEVICE_MEDIA_SD; + const uint32_t kDeviceMediaType = cros_disks::DEVICE_MEDIA_SD; const std::string kMountPath = "/media/removable/UNTITLED"; const bool kDevicePresentationHide = false; - const uint64 kDeviceSize = 16005464064; + const uint64_t kDeviceSize = 16005464064; const std::string kDriveModel = "DriveModel"; const std::string kIdLabel = "UNTITLED"; const std::string kIdUuid = "XXXX-YYYY";
diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc index e816b91..c2b3e82 100644 --- a/chromeos/dbus/cryptohome_client.cc +++ b/chromeos/dbus/cryptohome_client.cc
@@ -4,8 +4,12 @@ #include "chromeos/dbus/cryptohome_client.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "chromeos/cryptohome/async_method_caller.h" @@ -349,7 +353,7 @@ // CryptohomeClient override. bool InstallAttributesGet(const std::string& name, - std::vector<uint8>* value, + std::vector<uint8_t>* value, bool* successful) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesGet); @@ -360,7 +364,7 @@ if (!response.get()) return false; dbus::MessageReader reader(response.get()); - const uint8* bytes = NULL; + const uint8_t* bytes = NULL; size_t length = 0; if (!reader.PopArrayOfBytes(&bytes, &length) || !reader.PopBool(successful)) @@ -371,7 +375,7 @@ // CryptohomeClient override. bool InstallAttributesSet(const std::string& name, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, bool* successful) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesSet); @@ -457,7 +461,7 @@ dbus::MessageWriter writer(&method_call); writer.AppendInt32(pca_type); writer.AppendArrayOfBytes( - reinterpret_cast<const uint8*>(pca_response.data()), + reinterpret_cast<const uint8_t*>(pca_response.data()), pca_response.size()); proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs , base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall, @@ -498,7 +502,7 @@ cryptohome::kCryptohomeAsyncTpmAttestationFinishCertRequest); dbus::MessageWriter writer(&method_call); writer.AppendArrayOfBytes( - reinterpret_cast<const uint8*>(pca_response.data()), + reinterpret_cast<const uint8_t*>(pca_response.data()), pca_response.size()); bool is_user_specific = (key_type == attestation::KEY_USER); writer.AppendBool(is_user_specific); @@ -604,13 +608,13 @@ writer.AppendString(user_id); writer.AppendString(key_name); writer.AppendString(domain); - writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(device_id.data()), - device_id.size()); + writer.AppendArrayOfBytes( + reinterpret_cast<const uint8_t*>(device_id.data()), device_id.size()); bool include_signed_public_key = (options & attestation::CHALLENGE_INCLUDE_SIGNED_PUBLIC_KEY); writer.AppendBool(include_signed_public_key); - writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(challenge.data()), - challenge.size()); + writer.AppendArrayOfBytes( + reinterpret_cast<const uint8_t*>(challenge.data()), challenge.size()); proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs , base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall, weak_ptr_factory_.GetWeakPtr(), @@ -632,8 +636,8 @@ writer.AppendBool(is_user_specific); writer.AppendString(user_id); writer.AppendString(key_name); - writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(challenge.data()), - challenge.size()); + writer.AppendArrayOfBytes( + reinterpret_cast<const uint8_t*>(challenge.data()), challenge.size()); proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs , base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall, weak_ptr_factory_.GetWeakPtr(), @@ -675,7 +679,7 @@ writer.AppendBool(is_user_specific); writer.AppendString(user_id); writer.AppendString(key_name); - writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(payload.data()), + writer.AppendArrayOfBytes(reinterpret_cast<const uint8_t*>(payload.data()), payload.size()); CallBoolMethod(&method_call, callback); } @@ -901,18 +905,18 @@ void OnGetSystemSalt(const GetSystemSaltCallback& callback, dbus::Response* response) { if (!response) { - callback.Run(DBUS_METHOD_CALL_FAILURE, std::vector<uint8>()); + callback.Run(DBUS_METHOD_CALL_FAILURE, std::vector<uint8_t>()); return; } dbus::MessageReader reader(response); - const uint8* bytes = NULL; + const uint8_t* bytes = NULL; size_t length = 0; if (!reader.PopArrayOfBytes(&bytes, &length)) { - callback.Run(DBUS_METHOD_CALL_FAILURE, std::vector<uint8>()); + callback.Run(DBUS_METHOD_CALL_FAILURE, std::vector<uint8_t>()); return; } callback.Run(DBUS_METHOD_CALL_SUCCESS, - std::vector<uint8>(bytes, bytes + length)); + std::vector<uint8_t>(bytes, bytes + length)); } // Calls a method without result values. @@ -995,7 +999,7 @@ return; } dbus::MessageReader reader(response); - const uint8* data_buffer = NULL; + const uint8_t* data_buffer = NULL; size_t data_length = 0; bool result = false; if (!reader.PopArrayOfBytes(&data_buffer, &data_length) || @@ -1084,7 +1088,7 @@ dbus::MessageReader reader(signal); int async_id = 0; bool return_status = false; - const uint8* return_data_buffer = NULL; + const uint8_t* return_data_buffer = NULL; size_t return_data_length = 0; if (!reader.PopInt32(&async_id) || !reader.PopBool(&return_status) ||
diff --git a/chromeos/dbus/cryptohome_client.h b/chromeos/dbus/cryptohome_client.h index 8f9a5dc4..09116e3 100644 --- a/chromeos/dbus/cryptohome_client.h +++ b/chromeos/dbus/cryptohome_client.h
@@ -5,11 +5,13 @@ #ifndef CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_ #define CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/attestation/attestation_constants.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" @@ -56,9 +58,9 @@ // A callback to handle responses of AsyncXXX methods. typedef base::Callback<void(int async_id)> AsyncMethodCallback; // A callback for GetSystemSalt(). - typedef base::Callback<void( - DBusMethodCallStatus call_status, - const std::vector<uint8>& system_salt)> GetSystemSaltCallback; + typedef base::Callback<void(DBusMethodCallStatus call_status, + const std::vector<uint8_t>& system_salt)> + GetSystemSaltCallback; // A callback for WaitForServiceToBeAvailable(). typedef base::Callback<void(bool service_is_ready)> WaitForServiceToBeAvailableCallback; @@ -250,13 +252,13 @@ // This method blocks until the call returns. // The original content of |value| is lost. virtual bool InstallAttributesGet(const std::string& name, - std::vector<uint8>* value, + std::vector<uint8_t>* value, bool* successful) = 0; // Calls InstallAttributesSet method and returns true when the call succeeds. // This method blocks until the call returns. virtual bool InstallAttributesSet(const std::string& name, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, bool* successful) = 0; // Calls InstallAttributesFinalize method and returns true when the call
diff --git a/chromeos/dbus/dbus_client.h b/chromeos/dbus/dbus_client.h index d52de3e..07e6914 100644 --- a/chromeos/dbus/dbus_client.h +++ b/chromeos/dbus/dbus_client.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_DBUS_DBUS_CLIENT_H_ #define CHROMEOS_DBUS_DBUS_CLIENT_H_ -#include "base/basictypes.h" namespace dbus { class Bus;
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc index 87e6598..dbd2b27 100644 --- a/chromeos/dbus/dbus_client_bundle.cc +++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/dbus_client_bundle.h" +#include <stddef.h> + #include <vector> #include "base/command_line.h"
diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h index ea39ad9..478a5d5 100644 --- a/chromeos/dbus/dbus_client_bundle.h +++ b/chromeos/dbus/dbus_client_bundle.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/dbus_client_bundle_unittest.cc b/chromeos/dbus/dbus_client_bundle_unittest.cc index e7f63bd8..bfc439b 100644 --- a/chromeos/dbus/dbus_client_bundle_unittest.cc +++ b/chromeos/dbus/dbus_client_bundle_unittest.cc
@@ -4,7 +4,6 @@ #include "chromeos/dbus/dbus_client_bundle.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h index 83f3c26..4566083 100644 --- a/chromeos/dbus/dbus_thread_manager.h +++ b/chromeos/dbus/dbus_thread_manager.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc index b2f4acc2..c0f05ff 100644 --- a/chromeos/dbus/debug_daemon_client.cc +++ b/chromeos/dbus/debug_daemon_client.cc
@@ -5,6 +5,8 @@ #include "chromeos/dbus/debug_daemon_client.h" #include <fcntl.h> +#include <stddef.h> +#include <stdint.h> #include <unistd.h> #include <string> #include <vector> @@ -13,6 +15,7 @@ #include "base/bind_helpers.h" #include "base/files/file_path.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_util.h" @@ -464,18 +467,18 @@ if (!reader.PopInt32(&status)) return; - const uint8* buffer = nullptr; + const uint8_t* buffer = nullptr; size_t buf_size = 0; if (!reader.PopArrayOfBytes(&buffer, &buf_size)) return; - std::vector<uint8> perf_data; + std::vector<uint8_t> perf_data; if (buf_size > 0) perf_data.insert(perf_data.end(), buffer, buffer + buf_size); if (!reader.PopArrayOfBytes(&buffer, &buf_size)) return; - std::vector<uint8> perf_stat; + std::vector<uint8_t> perf_stat; if (buf_size > 0) perf_stat.insert(perf_stat.end(), buffer, buffer + buf_size); @@ -533,7 +536,7 @@ if (callback.is_null()) return; - int32 feature_mask = DEV_FEATURE_NONE; + int32_t feature_mask = DEV_FEATURE_NONE; if (!response || !dbus::MessageReader(response).PopInt32(&feature_mask)) { callback.Run(false, debugd::DevFeatureFlag::DEV_FEATURES_DISABLED); return;
diff --git a/chromeos/dbus/debug_daemon_client.h b/chromeos/dbus/debug_daemon_client.h index a11d6ec..51d53314 100644 --- a/chromeos/dbus/debug_daemon_client.h +++ b/chromeos/dbus/debug_daemon_client.h
@@ -5,10 +5,13 @@ #ifndef CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_ #define CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_ +#include <stdint.h> + #include <map> #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/task_runner.h" #include "base/trace_event/tracing_agent.h" @@ -94,8 +97,8 @@ // - Output from "perf stat", in PerfStatProto format. using GetPerfOutputCallback = base::Callback<void(int status, - const std::vector<uint8>& perf_data, - const std::vector<uint8>& perf_stat)>; + const std::vector<uint8_t>& perf_data, + const std::vector<uint8_t>& perf_stat)>; // Runs perf with arguments for |duration| seconds and returns data collected. virtual void GetPerfOutput(uint32_t duration,
diff --git a/chromeos/dbus/easy_unlock_client.cc b/chromeos/dbus/easy_unlock_client.cc index c05b2573..df0a510 100644 --- a/chromeos/dbus/easy_unlock_client.cc +++ b/chromeos/dbus/easy_unlock_client.cc
@@ -4,10 +4,14 @@ #include "chromeos/dbus/easy_unlock_client.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" @@ -20,7 +24,7 @@ // Reads array of bytes from a dbus message reader and converts it to string. std::string PopResponseData(dbus::MessageReader* reader) { - const uint8* bytes = NULL; + const uint8_t* bytes = NULL; size_t length = 0; if (!reader->PopArrayOfBytes(&bytes, &length)) return ""; @@ -31,7 +35,7 @@ // Converts string to array of bytes and writes it using dbus meddage writer. void AppendStringAsByteArray(const std::string& data, dbus::MessageWriter* writer) { - writer->AppendArrayOfBytes(reinterpret_cast<const uint8*>(data.data()), + writer->AppendArrayOfBytes(reinterpret_cast<const uint8_t*>(data.data()), data.length()); }
diff --git a/chromeos/dbus/easy_unlock_client.h b/chromeos/dbus/easy_unlock_client.h index 56307318..9f233a3 100644 --- a/chromeos/dbus/easy_unlock_client.h +++ b/chromeos/dbus/easy_unlock_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/fake_amplifier_client.h b/chromeos/dbus/fake_amplifier_client.h index 48d1bb6..f5b44fd 100644 --- a/chromeos/dbus/fake_amplifier_client.h +++ b/chromeos/dbus/fake_amplifier_client.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_DBUS_FAKE_AMPLIFIER_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_AMPLIFIER_CLIENT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/amplifier_client.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/fake_ap_manager_client.h b/chromeos/dbus/fake_ap_manager_client.h index 24b8cc6..4998167d 100644 --- a/chromeos/dbus/fake_ap_manager_client.h +++ b/chromeos/dbus/fake_ap_manager_client.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "chromeos/dbus/ap_manager_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_audio_dsp_client.cc b/chromeos/dbus/fake_audio_dsp_client.cc index f58b9f7..55e9fda 100644 --- a/chromeos/dbus/fake_audio_dsp_client.cc +++ b/chromeos/dbus/fake_audio_dsp_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/fake_audio_dsp_client.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -106,7 +108,7 @@ } void FakeAudioDspClient::SetCapabilitiesOEM( - uint32 speaker_id, + uint32_t speaker_id, const std::string& speaker_capabilities, const std::string& driver_capabilities, const VoidDBusMethodCallback& callback) { @@ -115,7 +117,7 @@ } void FakeAudioDspClient::GetFilterConfigOEM( - uint32 speaker_id, + uint32_t speaker_id, const TwoStringDBusMethodCallback& callback) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&OnTwoStringDBusMethod, callback)); @@ -129,7 +131,7 @@ FROM_HERE, base::Bind(&OnVoidDBusMethod, callback)); } -void FakeAudioDspClient::SetSourceType(uint16 source_type, +void FakeAudioDspClient::SetSourceType(uint16_t source_type, const VoidDBusMethodCallback& callback) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
diff --git a/chromeos/dbus/fake_audio_dsp_client.h b/chromeos/dbus/fake_audio_dsp_client.h index 05181ca7..7bdab2a0 100644 --- a/chromeos/dbus/fake_audio_dsp_client.h +++ b/chromeos/dbus/fake_audio_dsp_client.h
@@ -5,7 +5,9 @@ #ifndef CHROMEOS_DBUS_FAKE_AUDIO_DSP_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_AUDIO_DSP_CLIENT_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/audio_dsp_client.h" #include "chromeos/dbus/dbus_client.h" @@ -36,16 +38,16 @@ void GetBass(const DoubleDBusMethodCallback& callback) override; void GetCapabilitiesOEM( const ThreeStringDBusMethodCallback& callback) override; - void SetCapabilitiesOEM(uint32 speaker_id, + void SetCapabilitiesOEM(uint32_t speaker_id, const std::string& speaker_capabilities, const std::string& driver_capabilities, const VoidDBusMethodCallback& callback) override; - void GetFilterConfigOEM(uint32 speaker_id, + void GetFilterConfigOEM(uint32_t speaker_id, const TwoStringDBusMethodCallback& callback) override; void SetFilterConfigOEM(const std::string& speaker_config, const std::string& driver_config, const VoidDBusMethodCallback& callback) override; - void SetSourceType(uint16 source_type, + void SetSourceType(uint16_t source_type, const VoidDBusMethodCallback& callback) override; void AmplifierVolumeChanged(double db_spl, const VoidDBusMethodCallback& callback) override;
diff --git a/chromeos/dbus/fake_cras_audio_client.cc b/chromeos/dbus/fake_cras_audio_client.cc index e28852b..f2e0a6142 100644 --- a/chromeos/dbus/fake_cras_audio_client.cc +++ b/chromeos/dbus/fake_cras_audio_client.cc
@@ -98,7 +98,8 @@ callback.Run(node_list_, true); } -void FakeCrasAudioClient::SetOutputNodeVolume(uint64 node_id, int32 volume) {} +void FakeCrasAudioClient::SetOutputNodeVolume(uint64_t node_id, + int32_t volume) {} void FakeCrasAudioClient::SetOutputUserMute(bool mute_on) { volume_state_.output_user_mute = mute_on; @@ -106,7 +107,8 @@ OutputMuteChanged(volume_state_.output_user_mute)); } -void FakeCrasAudioClient::SetInputNodeGain(uint64 node_id, int32 input_gain) {} +void FakeCrasAudioClient::SetInputNodeGain(uint64_t node_id, + int32_t input_gain) {} void FakeCrasAudioClient::SetInputMute(bool mute_on) { volume_state_.input_mute = mute_on; @@ -114,7 +116,7 @@ InputMuteChanged(volume_state_.input_mute)); } -void FakeCrasAudioClient::SetActiveOutputNode(uint64 node_id) { +void FakeCrasAudioClient::SetActiveOutputNode(uint64_t node_id) { if (active_output_node_id_ == node_id) return; @@ -128,7 +130,7 @@ FOR_EACH_OBSERVER(Observer, observers_, ActiveOutputNodeChanged(node_id)); } -void FakeCrasAudioClient::SetActiveInputNode(uint64 node_id) { +void FakeCrasAudioClient::SetActiveInputNode(uint64_t node_id) { if (active_input_node_id_ == node_id) return; @@ -142,31 +144,30 @@ FOR_EACH_OBSERVER(Observer, observers_, ActiveInputNodeChanged(node_id)); } -void FakeCrasAudioClient::AddActiveInputNode(uint64 node_id) { +void FakeCrasAudioClient::AddActiveInputNode(uint64_t node_id) { for (size_t i = 0; i < node_list_.size(); ++i) { if (node_list_[i].id == node_id) node_list_[i].active = true; } } -void FakeCrasAudioClient::RemoveActiveInputNode(uint64 node_id) { +void FakeCrasAudioClient::RemoveActiveInputNode(uint64_t node_id) { for (size_t i = 0; i < node_list_.size(); ++i) { if (node_list_[i].id == node_id) node_list_[i].active = false; } } -void FakeCrasAudioClient::SwapLeftRight(uint64 node_id, bool swap) { -} +void FakeCrasAudioClient::SwapLeftRight(uint64_t node_id, bool swap) {} -void FakeCrasAudioClient::AddActiveOutputNode(uint64 node_id) { +void FakeCrasAudioClient::AddActiveOutputNode(uint64_t node_id) { for (size_t i = 0; i < node_list_.size(); ++i) { if (node_list_[i].id == node_id) node_list_[i].active = true; } } -void FakeCrasAudioClient::RemoveActiveOutputNode(uint64 node_id) { +void FakeCrasAudioClient::RemoveActiveOutputNode(uint64_t node_id) { for (size_t i = 0; i < node_list_.size(); ++i) { if (node_list_[i].id == node_id) node_list_[i].active = false; @@ -182,7 +183,7 @@ FOR_EACH_OBSERVER(Observer, observers_, NodesChanged()); } -void FakeCrasAudioClient::RemoveAudioNodeFromList(const uint64& node_id) { +void FakeCrasAudioClient::RemoveAudioNodeFromList(const uint64_t& node_id) { auto iter = FindNode(node_id); if (iter != node_list_.end()) { node_list_.erase(iter); @@ -201,7 +202,7 @@ FOR_EACH_OBSERVER(Observer, observers_, NodesChanged()); } -AudioNodeList::iterator FakeCrasAudioClient::FindNode(uint64 node_id) { +AudioNodeList::iterator FakeCrasAudioClient::FindNode(uint64_t node_id) { return std::find_if( node_list_.begin(), node_list_.end(), [node_id](const AudioNode& node) { return node_id == node.id; });
diff --git a/chromeos/dbus/fake_cras_audio_client.h b/chromeos/dbus/fake_cras_audio_client.h index cb15ab6b..7ba80ab 100644 --- a/chromeos/dbus/fake_cras_audio_client.h +++ b/chromeos/dbus/fake_cras_audio_client.h
@@ -5,6 +5,9 @@ #ifndef CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/cras_audio_client.h" @@ -26,17 +29,17 @@ void GetVolumeState(const GetVolumeStateCallback& callback) override; void GetNodes(const GetNodesCallback& callback, const ErrorCallback& error_callback) override; - void SetOutputNodeVolume(uint64 node_id, int32 volume) override; + void SetOutputNodeVolume(uint64_t node_id, int32_t volume) override; void SetOutputUserMute(bool mute_on) override; - void SetInputNodeGain(uint64 node_id, int32 gain) override; + void SetInputNodeGain(uint64_t node_id, int32_t gain) override; void SetInputMute(bool mute_on) override; - void SetActiveOutputNode(uint64 node_id) override; - void SetActiveInputNode(uint64 node_id) override; - void AddActiveInputNode(uint64 node_id) override; - void RemoveActiveInputNode(uint64 node_id) override; - void AddActiveOutputNode(uint64 node_id) override; - void RemoveActiveOutputNode(uint64 node_id) override; - void SwapLeftRight(uint64 node_id, bool swap) override; + void SetActiveOutputNode(uint64_t node_id) override; + void SetActiveInputNode(uint64_t node_id) override; + void AddActiveInputNode(uint64_t node_id) override; + void RemoveActiveInputNode(uint64_t node_id) override; + void AddActiveOutputNode(uint64_t node_id) override; + void RemoveActiveOutputNode(uint64_t node_id) override; + void SwapLeftRight(uint64_t node_id, bool swap) override; // Modifies an AudioNode from |node_list_| based on |audio_node.id|. // if the |audio_node.id| cannot be found in list, Add an @@ -44,7 +47,7 @@ void InsertAudioNodeToList(const AudioNode& audio_node); // Removes an AudioNode from |node_list_| based on |node_id|. - void RemoveAudioNodeFromList(const uint64& node_id); + void RemoveAudioNodeFromList(const uint64_t& node_id); // Updates |node_list_| to contain |audio_nodes|. void SetAudioNodesForTesting(const AudioNodeList& audio_nodes); @@ -54,17 +57,19 @@ const AudioNodeList& new_nodes); const AudioNodeList& node_list() const { return node_list_; } - const uint64& active_input_node_id() const { return active_input_node_id_; } - const uint64& active_output_node_id() const { return active_output_node_id_; } + const uint64_t& active_input_node_id() const { return active_input_node_id_; } + const uint64_t& active_output_node_id() const { + return active_output_node_id_; + } private: // Find a node in the list based on the id. - AudioNodeList::iterator FindNode(uint64 node_id); + AudioNodeList::iterator FindNode(uint64_t node_id); VolumeState volume_state_; AudioNodeList node_list_; - uint64 active_input_node_id_; - uint64 active_output_node_id_; + uint64_t active_input_node_id_; + uint64_t active_output_node_id_; base::ObserverList<Observer> observers_; DISALLOW_COPY_AND_ASSIGN(FakeCrasAudioClient);
diff --git a/chromeos/dbus/fake_cryptohome_client.cc b/chromeos/dbus/fake_cryptohome_client.cc index 8b64fd9..236b1f9 100644 --- a/chromeos/dbus/fake_cryptohome_client.cc +++ b/chromeos/dbus/fake_cryptohome_client.cc
@@ -4,6 +4,9 @@ #include "chromeos/dbus/fake_cryptohome_client.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" @@ -231,8 +234,8 @@ } bool FakeCryptohomeClient::InstallAttributesGet(const std::string& name, - std::vector<uint8>* value, - bool* successful) { + std::vector<uint8_t>* value, + bool* successful) { if (install_attrs_.find(name) != install_attrs_.end()) { *value = install_attrs_[name]; *successful = true; @@ -245,7 +248,7 @@ bool FakeCryptohomeClient::InstallAttributesSet( const std::string& name, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, bool* successful) { install_attrs_[name] = value; *successful = true; @@ -280,7 +283,7 @@ const int kVarLengthTag1 = (1 << 3) | 0x2; const int kVarLengthTag2 = (2 << 3) | 0x2; - typedef std::map<std::string, std::vector<uint8> >::const_iterator Iter; + typedef std::map<std::string, std::vector<uint8_t>>::const_iterator Iter; for (Iter it = install_attrs_.begin(); it != install_attrs_.end(); ++it) { std::string attr; { @@ -552,10 +555,10 @@ } // static -std::vector<uint8> FakeCryptohomeClient::GetStubSystemSalt() { +std::vector<uint8_t> FakeCryptohomeClient::GetStubSystemSalt() { const char kStubSystemSalt[] = "stub_system_salt"; - return std::vector<uint8>(kStubSystemSalt, - kStubSystemSalt + arraysize(kStubSystemSalt) - 1); + return std::vector<uint8_t>(kStubSystemSalt, + kStubSystemSalt + arraysize(kStubSystemSalt) - 1); } void FakeCryptohomeClient::ReturnProtobufMethodCallback(
diff --git a/chromeos/dbus/fake_cryptohome_client.h b/chromeos/dbus/fake_cryptohome_client.h index 7064a2e..801faafe 100644 --- a/chromeos/dbus/fake_cryptohome_client.h +++ b/chromeos/dbus/fake_cryptohome_client.h
@@ -5,9 +5,11 @@ #ifndef CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_ +#include <stdint.h> + #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/cryptohome_client.h" @@ -71,10 +73,10 @@ const std::string& username, const Pkcs11GetTpmTokenInfoCallback& callback) override; bool InstallAttributesGet(const std::string& name, - std::vector<uint8>* value, + std::vector<uint8_t>* value, bool* successful) override; bool InstallAttributesSet(const std::string& name, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, bool* successful) override; bool InstallAttributesFinalize(bool* successful) override; void InstallAttributesIsReady( @@ -195,13 +197,13 @@ // Sets the system salt which will be returned from GetSystemSalt(). By // default, GetSystemSalt() returns the value generated by // GetStubSystemSalt(). - void set_system_salt(const std::vector<uint8>& system_salt) { + void set_system_salt(const std::vector<uint8_t>& system_salt) { system_salt_ = system_salt; } // Returns the stub system salt as raw bytes. (not as a string encoded in the // format used by SystemSaltGetter::ConvertRawSaltToHexString()). - static std::vector<uint8> GetStubSystemSalt(); + static std::vector<uint8_t> GetStubSystemSalt(); private: void ReturnProtobufMethodCallback( @@ -221,14 +223,14 @@ AsyncCallStatusHandler async_call_status_handler_; AsyncCallStatusWithDataHandler async_call_status_data_handler_; bool unmount_result_; - std::vector<uint8> system_salt_; + std::vector<uint8_t> system_salt_; std::vector<WaitForServiceToBeAvailableCallback> pending_wait_for_service_to_be_available_callbacks_; // A stub store for InstallAttributes, mapping an attribute name to the // associated data blob. Used to implement InstallAttributesSet and -Get. - std::map<std::string, std::vector<uint8> > install_attrs_; + std::map<std::string, std::vector<uint8_t>> install_attrs_; bool locked_; base::WeakPtrFactory<FakeCryptohomeClient> weak_ptr_factory_;
diff --git a/chromeos/dbus/fake_debug_daemon_client.cc b/chromeos/dbus/fake_debug_daemon_client.cc index bdfa7aa..a2952ec7 100644 --- a/chromeos/dbus/fake_debug_daemon_client.cc +++ b/chromeos/dbus/fake_debug_daemon_client.cc
@@ -4,6 +4,9 @@ #include "chromeos/dbus/fake_debug_daemon_client.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> @@ -106,8 +109,8 @@ const std::vector<std::string>& perf_args, const GetPerfOutputCallback& callback) { int status = 0; - std::vector<uint8> perf_data; - std::vector<uint8> perf_stat; + std::vector<uint8_t> perf_data; + std::vector<uint8_t> perf_stat; base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(callback, status, perf_data, perf_stat)); }
diff --git a/chromeos/dbus/fake_debug_daemon_client.h b/chromeos/dbus/fake_debug_daemon_client.h index 9c02fe2a..a75edbf33 100644 --- a/chromeos/dbus/fake_debug_daemon_client.h +++ b/chromeos/dbus/fake_debug_daemon_client.h
@@ -5,10 +5,12 @@ #ifndef CHROMEOS_DBUS_FAKE_DEBUG_DAEMON_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_DEBUG_DAEMON_CLIENT_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/debug_daemon_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_easy_unlock_client.h b/chromeos/dbus/fake_easy_unlock_client.h index 4f56b786..e94cc547 100644 --- a/chromeos/dbus/fake_easy_unlock_client.h +++ b/chromeos/dbus/fake_easy_unlock_client.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chromeos/dbus/easy_unlock_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_gsm_sms_client.cc b/chromeos/dbus/fake_gsm_sms_client.cc index ba1286bd..8806988 100644 --- a/chromeos/dbus/fake_gsm_sms_client.cc +++ b/chromeos/dbus/fake_gsm_sms_client.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -45,7 +47,7 @@ void FakeGsmSMSClient::Delete(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const DeleteCallback& callback) { message_list_.Remove(index, NULL); callback.Run(); @@ -53,7 +55,7 @@ void FakeGsmSMSClient::Get(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const GetCallback& callback) { base::DictionaryValue* dictionary = NULL; if (message_list_.GetDictionary(index, &dictionary)) {
diff --git a/chromeos/dbus/fake_gsm_sms_client.h b/chromeos/dbus/fake_gsm_sms_client.h index 69a3ebe..0df9c12 100644 --- a/chromeos/dbus/fake_gsm_sms_client.h +++ b/chromeos/dbus/fake_gsm_sms_client.h
@@ -5,8 +5,11 @@ #ifndef CHROMEOS_DBUS_FAKE_GSM_SMS_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_GSM_SMS_CLIENT_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chromeos/dbus/gsm_sms_client.h" @@ -29,11 +32,11 @@ const dbus::ObjectPath& object_path) override; void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const DeleteCallback& callback) override; void Get(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const GetCallback& callback) override; void List(const std::string& service_name, const dbus::ObjectPath& object_path,
diff --git a/chromeos/dbus/fake_image_burner_client.h b/chromeos/dbus/fake_image_burner_client.h index 0941706..69a041e0 100644 --- a/chromeos/dbus/fake_image_burner_client.h +++ b/chromeos/dbus/fake_image_burner_client.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chromeos/dbus/image_burner_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_introspectable_client.h b/chromeos/dbus/fake_introspectable_client.h index d16a6cb..6525ec8f 100644 --- a/chromeos/dbus/fake_introspectable_client.h +++ b/chromeos/dbus/fake_introspectable_client.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_DBUS_FAKE_INTROSPECTABLE_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_INTROSPECTABLE_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chromeos/dbus/introspectable_client.h"
diff --git a/chromeos/dbus/fake_lorgnette_manager_client.h b/chromeos/dbus/fake_lorgnette_manager_client.h index a5fde7c..3fd8b275 100644 --- a/chromeos/dbus/fake_lorgnette_manager_client.h +++ b/chromeos/dbus/fake_lorgnette_manager_client.h
@@ -5,8 +5,8 @@ #ifndef CHROMEOS_DBUS_FAKE_LORGNETTE_MANAGER_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_LORGNETTE_MANAGER_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/lorgnette_manager_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_modem_messaging_client.h b/chromeos/dbus/fake_modem_messaging_client.h index 8cfb17b..a01e528e 100644 --- a/chromeos/dbus/fake_modem_messaging_client.h +++ b/chromeos/dbus/fake_modem_messaging_client.h
@@ -5,8 +5,8 @@ #ifndef CHROMEOS_DBUS_FAKE_MODEM_MESSAGING_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_MODEM_MESSAGING_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/modem_messaging_client.h"
diff --git a/chromeos/dbus/fake_nfc_adapter_client.h b/chromeos/dbus/fake_nfc_adapter_client.h index 21e76bd3..460c945 100644 --- a/chromeos/dbus/fake_nfc_adapter_client.h +++ b/chromeos/dbus/fake_nfc_adapter_client.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/fake_nfc_device_client.h b/chromeos/dbus/fake_nfc_device_client.h index 67d691c..ccb2cef 100644 --- a/chromeos/dbus/fake_nfc_device_client.h +++ b/chromeos/dbus/fake_nfc_device_client.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_DBUS_FAKE_NFC_DEVICE_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_NFC_DEVICE_CLIENT_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/fake_nfc_manager_client.h b/chromeos/dbus/fake_nfc_manager_client.h index 1f3f394..48ed90d 100644 --- a/chromeos/dbus/fake_nfc_manager_client.h +++ b/chromeos/dbus/fake_nfc_manager_client.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/nfc_manager_client.h"
diff --git a/chromeos/dbus/fake_nfc_record_client.cc b/chromeos/dbus/fake_nfc_record_client.cc index c16b3007..33b2754 100644 --- a/chromeos/dbus/fake_nfc_record_client.cc +++ b/chromeos/dbus/fake_nfc_record_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/fake_nfc_record_client.h" +#include <stdint.h> + #include "base/logging.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/fake_nfc_device_client.h" @@ -295,7 +297,7 @@ GetStringValue(attributes, nfc_record::kMimeTypeProperty)); tag_record_properties_->action.ReplaceValue( GetStringValue(attributes, nfc_record::kActionProperty)); - tag_record_properties_->size.ReplaceValue(static_cast<uint32>( + tag_record_properties_->size.ReplaceValue(static_cast<uint32_t>( GetDoubleValue(attributes, nfc_record::kSizeProperty))); SetTagRecordsVisible(false);
diff --git a/chromeos/dbus/fake_nfc_record_client.h b/chromeos/dbus/fake_nfc_record_client.h index daa6e079..5bdd635 100644 --- a/chromeos/dbus/fake_nfc_record_client.h +++ b/chromeos/dbus/fake_nfc_record_client.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_DBUS_FAKE_NFC_RECORD_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_NFC_RECORD_CLIENT_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/values.h"
diff --git a/chromeos/dbus/fake_nfc_tag_client.h b/chromeos/dbus/fake_nfc_tag_client.h index 96f2ec8..40d79cd0 100644 --- a/chromeos/dbus/fake_nfc_tag_client.h +++ b/chromeos/dbus/fake_nfc_tag_client.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_DBUS_FAKE_NFC_TAG_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_NFC_TAG_CLIENT_H_ +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/nfc_client_helpers.h"
diff --git a/chromeos/dbus/fake_peer_daemon_manager_client.h b/chromeos/dbus/fake_peer_daemon_manager_client.h index c2c2717..9d02c6b 100644 --- a/chromeos/dbus/fake_peer_daemon_manager_client.h +++ b/chromeos/dbus/fake_peer_daemon_manager_client.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "chromeos/dbus/peer_daemon_manager_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_permission_broker_client.cc b/chromeos/dbus/fake_permission_broker_client.cc index e011366a..ace347941 100644 --- a/chromeos/dbus/fake_permission_broker_client.cc +++ b/chromeos/dbus/fake_permission_broker_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/fake_permission_broker_client.h" #include <fcntl.h> +#include <stdint.h> #include "base/bind.h" #include "base/callback.h" @@ -69,7 +70,7 @@ } void FakePermissionBrokerClient::RequestTcpPortAccess( - uint16 port, + uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) { @@ -78,7 +79,7 @@ } void FakePermissionBrokerClient::RequestUdpPortAccess( - uint16 port, + uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) { @@ -87,14 +88,14 @@ } void FakePermissionBrokerClient::ReleaseTcpPort( - uint16 port, + uint16_t port, const std::string& interface, const ResultCallback& callback) { callback.Run(true); } void FakePermissionBrokerClient::ReleaseUdpPort( - uint16 port, + uint16_t port, const std::string& interface, const ResultCallback& callback) { callback.Run(true);
diff --git a/chromeos/dbus/fake_permission_broker_client.h b/chromeos/dbus/fake_permission_broker_client.h index 6a1ddee..b34d5c3 100644 --- a/chromeos/dbus/fake_permission_broker_client.h +++ b/chromeos/dbus/fake_permission_broker_client.h
@@ -5,8 +5,10 @@ #ifndef CHROMEOS_DBUS_FAKE_PERMISSION_BROKER_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_PERMISSION_BROKER_CLIENT_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/permission_broker_client.h" namespace chromeos { @@ -25,18 +27,18 @@ const ResultCallback& callback) override; void OpenPath(const std::string& path, const OpenPathCallback& callback) override; - void RequestTcpPortAccess(uint16 port, + void RequestTcpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) override; - void RequestUdpPortAccess(uint16 port, + void RequestUdpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) override; - void ReleaseTcpPort(uint16 port, + void ReleaseTcpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) override; - void ReleaseUdpPort(uint16 port, + void ReleaseUdpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) override;
diff --git a/chromeos/dbus/fake_power_manager_client.h b/chromeos/dbus/fake_power_manager_client.h index 1746a0d..c2aac634 100644 --- a/chromeos/dbus/fake_power_manager_client.h +++ b/chromeos/dbus/fake_power_manager_client.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/dbus/fake_power_manager_client_unittest.cc b/chromeos/dbus/fake_power_manager_client_unittest.cc index 021459e..1249077f 100644 --- a/chromeos/dbus/fake_power_manager_client_unittest.cc +++ b/chromeos/dbus/fake_power_manager_client_unittest.cc
@@ -4,7 +4,6 @@ #include "chromeos/dbus/fake_power_manager_client.h" -#include "base/basictypes.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/chromeos/dbus/fake_privet_daemon_manager_client.h b/chromeos/dbus/fake_privet_daemon_manager_client.h index f8d219c..d580832d 100644 --- a/chromeos/dbus/fake_privet_daemon_manager_client.h +++ b/chromeos/dbus/fake_privet_daemon_manager_client.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_DBUS_FAKE_PRIVET_DAEMON_MANAGER_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_PRIVET_DAEMON_MANAGER_CLIENT_H_ +#include "base/macros.h" #include "chromeos/dbus/privet_daemon_manager_client.h" namespace chromeos {
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h index 2a96cd3..b281847 100644 --- a/chromeos/dbus/fake_session_manager_client.h +++ b/chromeos/dbus/fake_session_manager_client.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/dbus/session_manager_client.h"
diff --git a/chromeos/dbus/fake_shill_device_client.h b/chromeos/dbus/fake_shill_device_client.h index 4dc0b54..56b9cf44 100644 --- a/chromeos/dbus/fake_shill_device_client.h +++ b/chromeos/dbus/fake_shill_device_client.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_device_client.h"
diff --git a/chromeos/dbus/fake_shill_ipconfig_client.h b/chromeos/dbus/fake_shill_ipconfig_client.h index 65520793..ba05a95 100644 --- a/chromeos/dbus/fake_shill_ipconfig_client.h +++ b/chromeos/dbus/fake_shill_ipconfig_client.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_ipconfig_client.h"
diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc index c50841f..9fe00b1 100644 --- a/chromeos/dbus/fake_shill_manager_client.cc +++ b/chromeos/dbus/fake_shill_manager_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/fake_shill_manager_client.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/location.h"
diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h index f677350d..de47691 100644 --- a/chromeos/dbus/fake_shill_manager_client.h +++ b/chromeos/dbus/fake_shill_manager_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_manager_client.h"
diff --git a/chromeos/dbus/fake_shill_profile_client.h b/chromeos/dbus/fake_shill_profile_client.h index 8c33bfb..3db52af0 100644 --- a/chromeos/dbus/fake_shill_profile_client.h +++ b/chromeos/dbus/fake_shill_profile_client.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_manager_client.h" #include "chromeos/dbus/shill_profile_client.h"
diff --git a/chromeos/dbus/fake_shill_service_client.h b/chromeos/dbus/fake_shill_service_client.h index a9af512ce..8c13358 100644 --- a/chromeos/dbus/fake_shill_service_client.h +++ b/chromeos/dbus/fake_shill_service_client.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_service_client.h"
diff --git a/chromeos/dbus/fake_shill_third_party_vpn_driver_client.cc b/chromeos/dbus/fake_shill_third_party_vpn_driver_client.cc index b68d0b3..702da0f 100644 --- a/chromeos/dbus/fake_shill_third_party_vpn_driver_client.cc +++ b/chromeos/dbus/fake_shill_third_party_vpn_driver_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/fake_shill_third_party_vpn_driver_client.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/dbus/fake_shill_third_party_vpn_driver_client.h b/chromeos/dbus/fake_shill_third_party_vpn_driver_client.h index 18a3f21..69981c15 100644 --- a/chromeos/dbus/fake_shill_third_party_vpn_driver_client.h +++ b/chromeos/dbus/fake_shill_third_party_vpn_driver_client.h
@@ -7,6 +7,7 @@ #include <stdint.h> +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/shill_third_party_vpn_driver_client.h"
diff --git a/chromeos/dbus/fake_sms_client.h b/chromeos/dbus/fake_sms_client.h index c682e2b..cbb6ba11 100644 --- a/chromeos/dbus/fake_sms_client.h +++ b/chromeos/dbus/fake_sms_client.h
@@ -5,8 +5,8 @@ #ifndef CHROMEOS_DBUS_FAKE_SMS_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_SMS_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/sms_client.h"
diff --git a/chromeos/dbus/fake_system_clock_client.cc b/chromeos/dbus/fake_system_clock_client.cc index b2ee3c6..565a3143 100644 --- a/chromeos/dbus/fake_system_clock_client.cc +++ b/chromeos/dbus/fake_system_clock_client.cc
@@ -25,8 +25,7 @@ return false; } -void FakeSystemClockClient::SetTime(int64 time_in_seconds) { -} +void FakeSystemClockClient::SetTime(int64_t time_in_seconds) {} bool FakeSystemClockClient::CanSetTime() { return true;
diff --git a/chromeos/dbus/fake_system_clock_client.h b/chromeos/dbus/fake_system_clock_client.h index 6f5f847..1750515e 100644 --- a/chromeos/dbus/fake_system_clock_client.h +++ b/chromeos/dbus/fake_system_clock_client.h
@@ -5,6 +5,9 @@ #ifndef CHROMEOS_DBUS_FAKE_SYSTEM_CLOCK_CLIENT_H_ #define CHROMEOS_DBUS_FAKE_SYSTEM_CLOCK_CLIENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "chromeos/dbus/system_clock_client.h" namespace chromeos { @@ -20,7 +23,7 @@ void AddObserver(Observer* observer) override; void RemoveObserver(Observer* observer) override; bool HasObserver(const Observer* observer) const override; - void SetTime(int64 time_in_seconds) override; + void SetTime(int64_t time_in_seconds) override; bool CanSetTime() override; private:
diff --git a/chromeos/dbus/gsm_sms_client.cc b/chromeos/dbus/gsm_sms_client.cc index 4ca1b43..c694bb0 100644 --- a/chromeos/dbus/gsm_sms_client.cc +++ b/chromeos/dbus/gsm_sms_client.cc
@@ -3,11 +3,14 @@ // found in the LICENSE file. #include "chromeos/dbus/gsm_sms_client.h" +#include <stdint.h> + #include <map> #include <utility> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" @@ -57,7 +60,7 @@ } // Calls Delete method. - void Delete(uint32 index, const DeleteCallback& callback) { + void Delete(uint32_t index, const DeleteCallback& callback) { dbus::MethodCall method_call(modemmanager::kModemManagerSMSInterface, modemmanager::kSMSDeleteFunction); dbus::MessageWriter writer(&method_call); @@ -69,7 +72,7 @@ } // Calls Get method. - void Get(uint32 index, const GetCallback& callback) { + void Get(uint32_t index, const GetCallback& callback) { dbus::MethodCall method_call(modemmanager::kModemManagerSMSInterface, modemmanager::kSMSGetFunction); dbus::MessageWriter writer(&method_call); @@ -93,7 +96,7 @@ private: // Handles SmsReceived signal. void OnSmsReceived(dbus::Signal* signal) { - uint32 index = 0; + uint32_t index = 0; bool complete = false; dbus::MessageReader reader(signal); if (!reader.PopUint32(&index) || @@ -179,7 +182,7 @@ // GsmSMSClient override. void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const DeleteCallback& callback) override { GetProxy(service_name, object_path)->Delete(index, callback); } @@ -187,7 +190,7 @@ // GsmSMSClient override. void Get(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const GetCallback& callback) override { GetProxy(service_name, object_path)->Get(index, callback); }
diff --git a/chromeos/dbus/gsm_sms_client.h b/chromeos/dbus/gsm_sms_client.h index afbae384..01327e7 100644 --- a/chromeos/dbus/gsm_sms_client.h +++ b/chromeos/dbus/gsm_sms_client.h
@@ -5,10 +5,12 @@ #ifndef CHROMEOS_DBUS_GSM_SMS_CLIENT_H_ #define CHROMEOS_DBUS_GSM_SMS_CLIENT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" @@ -29,7 +31,8 @@ // initializes the DBusThreadManager instance. class CHROMEOS_EXPORT GsmSMSClient : public DBusClient { public: - typedef base::Callback<void(uint32 index, bool complete)> SmsReceivedHandler; + typedef base::Callback<void(uint32_t index, bool complete)> + SmsReceivedHandler; typedef base::Callback<void()> DeleteCallback; typedef base::Callback<void(const base::DictionaryValue& sms)> GetCallback; typedef base::Callback<void(const base::ListValue& result)> ListCallback; @@ -52,13 +55,13 @@ // Calls Delete method. |callback| is called after the method call succeeds. virtual void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const DeleteCallback& callback) = 0; // Calls Get method. |callback| is called after the method call succeeds. virtual void Get(const std::string& service_name, const dbus::ObjectPath& object_path, - uint32 index, + uint32_t index, const GetCallback& callback) = 0; // Calls List method. |callback| is called after the method call succeeds.
diff --git a/chromeos/dbus/gsm_sms_client_unittest.cc b/chromeos/dbus/gsm_sms_client_unittest.cc index 8b0c46f..66ec8d20 100644 --- a/chromeos/dbus/gsm_sms_client_unittest.cc +++ b/chromeos/dbus/gsm_sms_client_unittest.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/gsm_sms_client.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/message_loop/message_loop.h" @@ -29,7 +31,7 @@ // A mock SmsReceivedHandler. class MockSmsReceivedHandler { public: - MOCK_METHOD2(Run, void(uint32 index, bool complete)); + MOCK_METHOD2(Run, void(uint32_t index, bool complete)); }; // A mock DeleteCallback. @@ -114,7 +116,7 @@ EXPECT_EQ(modemmanager::kModemManagerSMSInterface, method_call->GetInterface()); EXPECT_EQ(modemmanager::kSMSDeleteFunction, method_call->GetMember()); - uint32 index = 0; + uint32_t index = 0; dbus::MessageReader reader(method_call); EXPECT_TRUE(reader.PopUint32(&index)); EXPECT_EQ(expected_index_, index); @@ -131,7 +133,7 @@ EXPECT_EQ(modemmanager::kModemManagerSMSInterface, method_call->GetInterface()); EXPECT_EQ(modemmanager::kSMSGetFunction, method_call->GetMember()); - uint32 index = 0; + uint32_t index = 0; dbus::MessageReader reader(method_call); EXPECT_TRUE(reader.PopUint32(&index)); EXPECT_EQ(expected_index_, index); @@ -172,7 +174,7 @@ // The SmsReceived signal handler given by the tested client. dbus::ObjectProxy::SignalCallback sms_received_callback_; // Expected argument for Delete and Get methods. - uint32 expected_index_; + uint32_t expected_index_; // Response returned by mock methods. dbus::Response* response_; // Expected result of Get and List methods. @@ -195,7 +197,7 @@ TEST_F(GsmSMSClientTest, SmsReceived) { // Set expectations. - const uint32 kIndex = 42; + const uint32_t kIndex = 42; const bool kComplete = true; MockSmsReceivedHandler handler; EXPECT_CALL(handler, Run(kIndex, kComplete)).Times(1); @@ -223,7 +225,7 @@ TEST_F(GsmSMSClientTest, Delete) { // Set expectations. - const uint32 kIndex = 42; + const uint32_t kIndex = 42; expected_index_ = kIndex; EXPECT_CALL(*mock_proxy_.get(), CallMethod(_, _, _)) .WillOnce(Invoke(this, &GsmSMSClientTest::OnDelete)); @@ -243,7 +245,7 @@ TEST_F(GsmSMSClientTest, Get) { // Set expectations. - const uint32 kIndex = 42; + const uint32_t kIndex = 42; expected_index_ = kIndex; EXPECT_CALL(*mock_proxy_.get(), CallMethod(_, _, _)) .WillOnce(Invoke(this, &GsmSMSClientTest::OnGet));
diff --git a/chromeos/dbus/image_burner_client.cc b/chromeos/dbus/image_burner_client.cc index 91ef3aa..2a2b22d 100644 --- a/chromeos/dbus/image_burner_client.cc +++ b/chromeos/dbus/image_burner_client.cc
@@ -4,8 +4,11 @@ #include "chromeos/dbus/image_burner_client.h" +#include <stdint.h> + #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" @@ -102,8 +105,8 @@ void OnBurnProgressUpdate(dbus::Signal* signal) { dbus::MessageReader reader(signal); std::string target_path; - int64 num_bytes_burnt; - int64 total_size; + int64_t num_bytes_burnt; + int64_t total_size; if (!reader.PopString(&target_path) || !reader.PopInt64(&num_bytes_burnt) || !reader.PopInt64(&total_size)) {
diff --git a/chromeos/dbus/image_burner_client.h b/chromeos/dbus/image_burner_client.h index 0c3f573f..35d06530 100644 --- a/chromeos/dbus/image_burner_client.h +++ b/chromeos/dbus/image_burner_client.h
@@ -5,10 +5,12 @@ #ifndef CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_ #define CHROMEOS_DBUS_IMAGE_BURNER_CLIENT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" @@ -31,8 +33,8 @@ // A callback to handle burn_progress_update signal. typedef base::Callback<void(const std::string& target_path, - int64 num_bytes_burnt, - int64 total_size)> BurnProgressUpdateHandler; + int64_t num_bytes_burnt, + int64_t total_size)> BurnProgressUpdateHandler; // Burns the image |from_path| to the disk |to_path|. virtual void BurnImage(const std::string& from_path,
diff --git a/chromeos/dbus/introspectable_client.cc b/chromeos/dbus/introspectable_client.cc index 71508f2..8f7754b 100644 --- a/chromeos/dbus/introspectable_client.cc +++ b/chromeos/dbus/introspectable_client.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_proxy.h"
diff --git a/chromeos/dbus/introspectable_client.h b/chromeos/dbus/introspectable_client.h index 1a4edab..49693f2 100644 --- a/chromeos/dbus/introspectable_client.h +++ b/chromeos/dbus/introspectable_client.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "dbus/object_path.h"
diff --git a/chromeos/dbus/lorgnette_manager_client.cc b/chromeos/dbus/lorgnette_manager_client.cc index d99f59bd..55a1c347 100644 --- a/chromeos/dbus/lorgnette_manager_client.cc +++ b/chromeos/dbus/lorgnette_manager_client.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task_runner_util.h" #include "base/threading/worker_pool.h"
diff --git a/chromeos/dbus/lorgnette_manager_client.h b/chromeos/dbus/lorgnette_manager_client.h index d36cd388d..9aa0d9f 100644 --- a/chromeos/dbus/lorgnette_manager_client.h +++ b/chromeos/dbus/lorgnette_manager_client.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/mock_cryptohome_client.h b/chromeos/dbus/mock_cryptohome_client.h index 20ccbb5..4382d354 100644 --- a/chromeos/dbus/mock_cryptohome_client.h +++ b/chromeos/dbus/mock_cryptohome_client.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_ #define CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_ +#include <stdint.h> + #include <string> #include "chromeos/dbus/cryptohome/rpc.pb.h" @@ -79,11 +81,11 @@ const Pkcs11GetTpmTokenInfoCallback& callback)); MOCK_METHOD3(InstallAttributesGet, bool(const std::string& name, - std::vector<uint8>* value, + std::vector<uint8_t>* value, bool* successful)); MOCK_METHOD3(InstallAttributesSet, bool(const std::string& name, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, bool* successful)); MOCK_METHOD1(InstallAttributesFinalize, bool(bool* successful)); MOCK_METHOD1(InstallAttributesIsReady,
diff --git a/chromeos/dbus/mock_permission_broker_client.h b/chromeos/dbus/mock_permission_broker_client.h index d5c9c02..9e45a97 100644 --- a/chromeos/dbus/mock_permission_broker_client.h +++ b/chromeos/dbus/mock_permission_broker_client.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_DBUS_MOCK_PERMISSION_BROKER_CLIENT_H_ #define CHROMEOS_DBUS_MOCK_PERMISSION_BROKER_CLIENT_H_ +#include <stdint.h> + #include "chromeos/dbus/permission_broker_client.h" #include "testing/gmock/include/gmock/gmock.h" @@ -29,21 +31,21 @@ MOCK_METHOD2(OpenPath, void(const std::string& path, const OpenPathCallback& callback)); MOCK_METHOD4(RequestTcpPortAccess, - void(uint16 port, + void(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback)); MOCK_METHOD4(RequestUdpPortAccess, - void(uint16 port, + void(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback)); MOCK_METHOD3(ReleaseTcpPort, - void(uint16 port, + void(uint16_t port, const std::string& interface, const ResultCallback& callback)); MOCK_METHOD3(ReleaseUdpPort, - void(uint16 port, + void(uint16_t port, const std::string& interface, const ResultCallback& callback)); };
diff --git a/chromeos/dbus/modem_messaging_client.cc b/chromeos/dbus/modem_messaging_client.cc index e7145422f1..4f5277a 100644 --- a/chromeos/dbus/modem_messaging_client.cc +++ b/chromeos/dbus/modem_messaging_client.cc
@@ -7,6 +7,7 @@ #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chromeos/dbus/modem_messaging_client.h b/chromeos/dbus/modem_messaging_client.h index 879d0c2..9a9b0ae 100644 --- a/chromeos/dbus/modem_messaging_client.h +++ b/chromeos/dbus/modem_messaging_client.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/nfc_adapter_client.cc b/chromeos/dbus/nfc_adapter_client.cc index 4cde7c6..6535aa0e 100644 --- a/chromeos/dbus/nfc_adapter_client.cc +++ b/chromeos/dbus/nfc_adapter_client.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/dbus/nfc_adapter_client.h b/chromeos/dbus/nfc_adapter_client.h index 51cf24d..8c6b62f0 100644 --- a/chromeos/dbus/nfc_adapter_client.h +++ b/chromeos/dbus/nfc_adapter_client.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/nfc_client_helpers.h"
diff --git a/chromeos/dbus/nfc_client_helpers.h b/chromeos/dbus/nfc_client_helpers.h index d50db07..d6b50e88 100644 --- a/chromeos/dbus/nfc_client_helpers.h +++ b/chromeos/dbus/nfc_client_helpers.h
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/values.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/nfc_property_set.h"
diff --git a/chromeos/dbus/nfc_client_unittest.cc b/chromeos/dbus/nfc_client_unittest.cc index 12cb0b07..8b431e9 100644 --- a/chromeos/dbus/nfc_client_unittest.cc +++ b/chromeos/dbus/nfc_client_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" #include "base/message_loop/message_loop.h"
diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc index c27396bd..1e84048 100644 --- a/chromeos/dbus/nfc_device_client.cc +++ b/chromeos/dbus/nfc_device_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/nfc_device_client.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/dbus/nfc_device_client.h b/chromeos/dbus/nfc_device_client.h index db9b753..b694dd8 100644 --- a/chromeos/dbus/nfc_device_client.h +++ b/chromeos/dbus/nfc_device_client.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/nfc_manager_client.cc b/chromeos/dbus/nfc_manager_client.cc index d35aadd..8029fd3b 100644 --- a/chromeos/dbus/nfc_manager_client.cc +++ b/chromeos/dbus/nfc_manager_client.cc
@@ -4,6 +4,7 @@ #include "chromeos/dbus/nfc_manager_client.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/dbus/nfc_manager_client.h b/chromeos/dbus/nfc_manager_client.h index 7e62070..1ba39d4 100644 --- a/chromeos/dbus/nfc_manager_client.h +++ b/chromeos/dbus/nfc_manager_client.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/nfc_property_set.h"
diff --git a/chromeos/dbus/nfc_property_set.h b/chromeos/dbus/nfc_property_set.h index 7aae7663..ee1852828 100644 --- a/chromeos/dbus/nfc_property_set.h +++ b/chromeos/dbus/nfc_property_set.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "dbus/message.h" #include "dbus/object_proxy.h" #include "dbus/property.h"
diff --git a/chromeos/dbus/nfc_record_client.cc b/chromeos/dbus/nfc_record_client.cc index f462d69..b829516 100644 --- a/chromeos/dbus/nfc_record_client.cc +++ b/chromeos/dbus/nfc_record_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/nfc_record_client.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chromeos/dbus/nfc_device_client.h"
diff --git a/chromeos/dbus/nfc_record_client.h b/chromeos/dbus/nfc_record_client.h index 783258b2..c602257 100644 --- a/chromeos/dbus/nfc_record_client.h +++ b/chromeos/dbus/nfc_record_client.h
@@ -5,8 +5,11 @@ #ifndef CHROMEOS_DBUS_NFC_RECORD_CLIENT_H_ #define CHROMEOS_DBUS_NFC_RECORD_CLIENT_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/nfc_property_set.h" @@ -60,7 +63,7 @@ // the object or not. This is not a mandatory field and is only valid for // Smart Posters carrying a URI record. // Read-only. - dbus::Property<uint32> size; + dbus::Property<uint32_t> size; // The suggested course of action. This one is only valid for Smart Posters // and is a suggestion only. It can be ignored, and the possible values are
diff --git a/chromeos/dbus/nfc_tag_client.cc b/chromeos/dbus/nfc_tag_client.cc index adbe0aec..f77b063 100644 --- a/chromeos/dbus/nfc_tag_client.cc +++ b/chromeos/dbus/nfc_tag_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/nfc_tag_client.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/dbus/nfc_tag_client.h b/chromeos/dbus/nfc_tag_client.h index 144f1dee..72d8399e 100644 --- a/chromeos/dbus/nfc_tag_client.h +++ b/chromeos/dbus/nfc_tag_client.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/peer_daemon_manager_client.cc b/chromeos/dbus/peer_daemon_manager_client.cc index e30f294..caf0852 100644 --- a/chromeos/dbus/peer_daemon_manager_client.cc +++ b/chromeos/dbus/peer_daemon_manager_client.cc
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/dbus/peer_daemon_manager_client.h b/chromeos/dbus/peer_daemon_manager_client.h index a3cad814..08603de 100644 --- a/chromeos/dbus/peer_daemon_manager_client.h +++ b/chromeos/dbus/peer_daemon_manager_client.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_DBUS_PEER_DAEMON_MANAGER_CLIENT_H_ #define CHROMEOS_DBUS_PEER_DAEMON_MANAGER_CLIENT_H_ +#include <stdint.h> + #include <map> #include <string> #include <utility>
diff --git a/chromeos/dbus/permission_broker_client.cc b/chromeos/dbus/permission_broker_client.cc index 4ba4d31..b862f75 100644 --- a/chromeos/dbus/permission_broker_client.cc +++ b/chromeos/dbus/permission_broker_client.cc
@@ -4,7 +4,10 @@ #include "chromeos/dbus/permission_broker_client.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "dbus/bus.h" #include "dbus/message.h" @@ -63,7 +66,7 @@ weak_ptr_factory_.GetWeakPtr(), callback)); } - void RequestTcpPortAccess(uint16 port, + void RequestTcpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) override { @@ -78,7 +81,7 @@ weak_ptr_factory_.GetWeakPtr(), callback)); } - void RequestUdpPortAccess(uint16 port, + void RequestUdpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) override { @@ -93,7 +96,7 @@ weak_ptr_factory_.GetWeakPtr(), callback)); } - void ReleaseTcpPort(uint16 port, + void ReleaseTcpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kReleaseTcpPort); @@ -105,7 +108,7 @@ weak_ptr_factory_.GetWeakPtr(), callback)); } - void ReleaseUdpPort(uint16 port, + void ReleaseUdpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kReleaseUdpPort);
diff --git a/chromeos/dbus/permission_broker_client.h b/chromeos/dbus/permission_broker_client.h index dd5ecca..87c24c8 100644 --- a/chromeos/dbus/permission_broker_client.h +++ b/chromeos/dbus/permission_broker_client.h
@@ -5,10 +5,12 @@ #ifndef CHROMEOS_DBUS_PERMISSION_BROKER_CLIENT_H_ #define CHROMEOS_DBUS_PERMISSION_BROKER_CLIENT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "dbus/file_descriptor.h" @@ -62,7 +64,7 @@ // connections received on |interface| (an empty string indicates all // interfaces). An open pipe must be passed as |lifeline_fd| so that the // permission broker can monitor the lifetime of the calling process. - virtual void RequestTcpPortAccess(uint16 port, + virtual void RequestTcpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) = 0; @@ -71,7 +73,7 @@ // received on |interface| (an empty string indicates all interfaces). An open // pipe must be passed as |lifeline_fd| so that the permission broker can // monitor the lifetime of the calling process. - virtual void RequestUdpPortAccess(uint16 port, + virtual void RequestUdpPortAccess(uint16_t port, const std::string& interface, const dbus::FileDescriptor& lifeline_fd, const ResultCallback& callback) = 0; @@ -79,14 +81,14 @@ // Releases a request for an open firewall port for TCP/IP connections. The // |port| and |interface| parameters must be the same as a previous call to // RequestTcpPortAccess. - virtual void ReleaseTcpPort(uint16 port, + virtual void ReleaseTcpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) = 0; // Releases a request for an open firewall port for UDP packets. The |port| // and |interface| parameters must be the same as a previous call to // RequestUdpPortAccess. - virtual void ReleaseUdpPort(uint16 port, + virtual void ReleaseUdpPort(uint16_t port, const std::string& interface, const ResultCallback& callback) = 0;
diff --git a/chromeos/dbus/pipe_reader.h b/chromeos/dbus/pipe_reader.h index ad52549..3c98457 100644 --- a/chromeos/dbus/pipe_reader.h +++ b/chromeos/dbus/pipe_reader.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc index f0c10f6..88b92751 100644 --- a/chromeos/dbus/power_manager_client.cc +++ b/chromeos/dbus/power_manager_client.cc
@@ -4,12 +4,15 @@ #include "chromeos/dbus/power_manager_client.h" +#include <stdint.h> + #include <algorithm> #include "base/bind.h" #include "base/command_line.h" #include "base/format_macros.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/observer_list.h"
diff --git a/chromeos/dbus/power_manager_client.h b/chromeos/dbus/power_manager_client.h index 4e8b8c83..59bed6a 100644 --- a/chromeos/dbus/power_manager_client.h +++ b/chromeos/dbus/power_manager_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc index 49c76c2..fbad6e1 100644 --- a/chromeos/dbus/power_policy_controller.cc +++ b/chromeos/dbus/power_policy_controller.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/power_policy_controller.h" +#include <stdint.h> + #include <utility> #include "base/format_macros.h" @@ -193,7 +195,7 @@ // If auto screen-locking is enabled, ensure that the screen is locked soon // after it's turned off due to user inactivity. - int64 lock_ms = delays->screen_off_ms() + kScreenLockAfterOffDelayMs; + int64_t lock_ms = delays->screen_off_ms() + kScreenLockAfterOffDelayMs; if (values.enable_auto_screen_lock && delays->screen_off_ms() > 0 && (delays->screen_lock_ms() <= 0 || lock_ms < delays->screen_lock_ms()) && lock_ms < delays->idle_ms()) {
diff --git a/chromeos/dbus/privet_daemon_manager_client.cc b/chromeos/dbus/privet_daemon_manager_client.cc index de61cc88..fb04d11 100644 --- a/chromeos/dbus/privet_daemon_manager_client.cc +++ b/chromeos/dbus/privet_daemon_manager_client.cc
@@ -4,9 +4,13 @@ #include "chromeos/dbus/privet_daemon_manager_client.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/single_thread_task_runner.h" @@ -220,7 +224,7 @@ value_.set_mode(string_value); } } else if (field_reader.GetDataSignature() == "ay") { - const uint8* bytes = nullptr; + const uint8_t* bytes = nullptr; size_t length = 0; if (!field_reader.PopArrayOfBytes(&bytes, &length)) return false;
diff --git a/chromeos/dbus/privet_daemon_manager_client.h b/chromeos/dbus/privet_daemon_manager_client.h index 8c490d8..43d760c 100644 --- a/chromeos/dbus/privet_daemon_manager_client.h +++ b/chromeos/dbus/privet_daemon_manager_client.h
@@ -5,6 +5,9 @@ #ifndef CHROMEOS_DBUS_PRIVET_DAEMON_MANAGER_CLIENT_H_ #define CHROMEOS_DBUS_PRIVET_DAEMON_MANAGER_CLIENT_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector>
diff --git a/chromeos/dbus/privet_daemon_manager_client_unittest.cc b/chromeos/dbus/privet_daemon_manager_client_unittest.cc index 84f31d4..68c48ea 100644 --- a/chromeos/dbus/privet_daemon_manager_client_unittest.cc +++ b/chromeos/dbus/privet_daemon_manager_client_unittest.cc
@@ -4,6 +4,9 @@ #include "chromeos/dbus/privet_daemon_manager_client.h" +#include <stddef.h> +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "dbus/message.h"
diff --git a/chromeos/dbus/services/console_service_provider.h b/chromeos/dbus/services/console_service_provider.h index fd9e2ab..69acd7c 100644 --- a/chromeos/dbus/services/console_service_provider.h +++ b/chromeos/dbus/services/console_service_provider.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/services/cros_dbus_service.cc b/chromeos/dbus/services/cros_dbus_service.cc index 0523c92..6f482ac5 100644 --- a/chromeos/dbus/services/cros_dbus_service.cc +++ b/chromeos/dbus/services/cros_dbus_service.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/services/cros_dbus_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/stl_util.h" #include "base/sys_info.h"
diff --git a/chromeos/dbus/services/display_power_service_provider.h b/chromeos/dbus/services/display_power_service_provider.h index bdfc093..e09648e 100644 --- a/chromeos/dbus/services/display_power_service_provider.h +++ b/chromeos/dbus/services/display_power_service_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chromeos/dbus/services/liveness_service_provider.h b/chromeos/dbus/services/liveness_service_provider.h index a261ff2..bfde7702 100644 --- a/chromeos/dbus/services/liveness_service_provider.h +++ b/chromeos/dbus/services/liveness_service_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.cc b/chromeos/dbus/services/proxy_resolution_service_provider.cc index 1f5ec44..8c760aa 100644 --- a/chromeos/dbus/services/proxy_resolution_service_provider.cc +++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "dbus/bus.h" #include "dbus/message.h"
diff --git a/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc b/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc index ff0ce4d..7514380 100644 --- a/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc +++ b/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/services/proxy_resolution_service_provider.h" #include "base/bind.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc index 23ef0f6..dd9c13ad 100644 --- a/chromeos/dbus/session_manager_client.cc +++ b/chromeos/dbus/session_manager_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/session_manager_client.h" +#include <stddef.h> +#include <stdint.h> #include <sys/socket.h> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -275,7 +278,8 @@ dbus::MessageWriter writer(&method_call); // static_cast does not work due to signedness. writer.AppendArrayOfBytes( - reinterpret_cast<const uint8*>(policy_blob.data()), policy_blob.size()); + reinterpret_cast<const uint8_t*>(policy_blob.data()), + policy_blob.size()); session_manager_proxy_->CallMethod( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, @@ -445,7 +449,8 @@ writer.AppendString(username); // static_cast does not work due to signedness. writer.AppendArrayOfBytes( - reinterpret_cast<const uint8*>(policy_blob.data()), policy_blob.size()); + reinterpret_cast<const uint8_t*>(policy_blob.data()), + policy_blob.size()); session_manager_proxy_->CallMethod( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, @@ -555,7 +560,7 @@ return; } dbus::MessageReader reader(response); - const uint8* values = NULL; + const uint8_t* values = NULL; size_t length = 0; if (!reader.PopArrayOfBytes(&values, &length)) { LOG(ERROR) << "Invalid response: " << response->ToString(); @@ -649,7 +654,7 @@ LOG(ERROR) << "Bad response: " << response->ToString(); } else { while (array_reader.HasMoreData()) { - const uint8* data = NULL; + const uint8_t* data = NULL; size_t size = 0; if (!array_reader.PopArrayOfBytes(&data, &size)) { LOG(ERROR) << "Bad response: " << response->ToString();
diff --git a/chromeos/dbus/session_manager_client.h b/chromeos/dbus/session_manager_client.h index c80688d..4fd4c09 100644 --- a/chromeos/dbus/session_manager_client.h +++ b/chromeos/dbus/session_manager_client.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/shill_client_helper.cc b/chromeos/dbus/shill_client_helper.cc index 408c3bc..f0add9a7 100644 --- a/chromeos/dbus/shill_client_helper.cc +++ b/chromeos/dbus/shill_client_helper.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/shill_client_helper.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h"
diff --git a/chromeos/dbus/shill_client_helper.h b/chromeos/dbus/shill_client_helper.h index 740a81c..f2cae1f3 100644 --- a/chromeos/dbus/shill_client_helper.h +++ b/chromeos/dbus/shill_client_helper.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc index c6c60f94..7c02b9a 100644 --- a/chromeos/dbus/shill_client_unittest_base.cc +++ b/chromeos/dbus/shill_client_unittest_base.cc
@@ -4,6 +4,9 @@ #include "chromeos/dbus/shill_client_unittest_base.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/chromeos/dbus/shill_client_unittest_base.h b/chromeos/dbus/shill_client_unittest_base.h index 9b32490..24fa392 100644 --- a/chromeos/dbus/shill_client_unittest_base.h +++ b/chromeos/dbus/shill_client_unittest_base.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_ #define CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_ +#include <stdint.h> + #include <string> #include "base/memory/ref_counted.h"
diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc index 64fef54d..12be94d 100644 --- a/chromeos/dbus/shill_device_client.cc +++ b/chromeos/dbus/shill_device_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/shill_device_client.h" #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/values.h"
diff --git a/chromeos/dbus/shill_device_client.h b/chromeos/dbus/shill_device_client.h index 06949de..272e9a7 100644 --- a/chromeos/dbus/shill_device_client.h +++ b/chromeos/dbus/shill_device_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/shill_client_helper.h"
diff --git a/chromeos/dbus/shill_ipconfig_client.cc b/chromeos/dbus/shill_ipconfig_client.cc index b3b0cac..d96bdb1 100644 --- a/chromeos/dbus/shill_ipconfig_client.cc +++ b/chromeos/dbus/shill_ipconfig_client.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h"
diff --git a/chromeos/dbus/shill_ipconfig_client.h b/chromeos/dbus/shill_ipconfig_client.h index 8461380..374ad80 100644 --- a/chromeos/dbus/shill_ipconfig_client.h +++ b/chromeos/dbus/shill_ipconfig_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/shill_client_helper.h"
diff --git a/chromeos/dbus/shill_ipconfig_client_unittest.cc b/chromeos/dbus/shill_ipconfig_client_unittest.cc index 68d6913..1318ae9 100644 --- a/chromeos/dbus/shill_ipconfig_client_unittest.cc +++ b/chromeos/dbus/shill_ipconfig_client_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/values.h" #include "chromeos/dbus/shill_client_unittest_base.h" @@ -80,7 +82,7 @@ TEST_F(ShillIPConfigClientTest, GetProperties) { const char kAddress[] = "address"; - const int32 kMtu = 68; + const int32_t kMtu = 68; // Create response. scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc index 46179a90..5465835 100644 --- a/chromeos/dbus/shill_manager_client.cc +++ b/chromeos/dbus/shill_manager_client.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/values.h" #include "chromeos/dbus/shill_property_changed_observer.h"
diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h index 68fcf44..02f84de3 100644 --- a/chromeos/dbus/shill_manager_client.h +++ b/chromeos/dbus/shill_manager_client.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/dbus_method_call_status.h"
diff --git a/chromeos/dbus/shill_profile_client.cc b/chromeos/dbus/shill_profile_client.cc index f965a29..c8fe0c0 100644 --- a/chromeos/dbus/shill_profile_client.cc +++ b/chromeos/dbus/shill_profile_client.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h"
diff --git a/chromeos/dbus/shill_profile_client.h b/chromeos/dbus/shill_profile_client.h index 885151f8..dba383c 100644 --- a/chromeos/dbus/shill_profile_client.h +++ b/chromeos/dbus/shill_profile_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/shill_client_helper.h"
diff --git a/chromeos/dbus/shill_service_client.cc b/chromeos/dbus/shill_service_client.cc index 7d1746f..4de47e79 100644 --- a/chromeos/dbus/shill_service_client.cc +++ b/chromeos/dbus/shill_service_client.cc
@@ -5,6 +5,7 @@ #include "chromeos/dbus/shill_service_client.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h"
diff --git a/chromeos/dbus/shill_service_client.h b/chromeos/dbus/shill_service_client.h index 0bb7db44..92833306 100644 --- a/chromeos/dbus/shill_service_client.h +++ b/chromeos/dbus/shill_service_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/shill_client_helper.h"
diff --git a/chromeos/dbus/shill_third_party_vpn_driver_client.cc b/chromeos/dbus/shill_third_party_vpn_driver_client.cc index fd2f4d9a..a3f3f7b 100644 --- a/chromeos/dbus/shill_third_party_vpn_driver_client.cc +++ b/chromeos/dbus/shill_third_party_vpn_driver_client.cc
@@ -4,7 +4,11 @@ #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "chromeos/dbus/shill_third_party_vpn_observer.h" #include "dbus/bus.h" #include "dbus/message.h"
diff --git a/chromeos/dbus/shill_third_party_vpn_driver_client.h b/chromeos/dbus/shill_third_party_vpn_driver_client.h index d75fab9..0845ac3 100644 --- a/chromeos/dbus/shill_third_party_vpn_driver_client.h +++ b/chromeos/dbus/shill_third_party_vpn_driver_client.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" #include "chromeos/dbus/shill_client_helper.h"
diff --git a/chromeos/dbus/shill_third_party_vpn_driver_client_unittest.cc b/chromeos/dbus/shill_third_party_vpn_driver_client_unittest.cc index ec0e1f84..5880541 100644 --- a/chromeos/dbus/shill_third_party_vpn_driver_client_unittest.cc +++ b/chromeos/dbus/shill_third_party_vpn_driver_client_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/bind.h"
diff --git a/chromeos/dbus/sms_client.cc b/chromeos/dbus/sms_client.cc index fc8e874..a7f4209 100644 --- a/chromeos/dbus/sms_client.cc +++ b/chromeos/dbus/sms_client.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chromeos/dbus/sms_client.h b/chromeos/dbus/sms_client.h index acc6b7e..a0c040b7 100644 --- a/chromeos/dbus/sms_client.h +++ b/chromeos/dbus/sms_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/system_clock_client.cc b/chromeos/dbus/system_clock_client.cc index 160c9c1..047a29c 100644 --- a/chromeos/dbus/system_clock_client.cc +++ b/chromeos/dbus/system_clock_client.cc
@@ -4,7 +4,10 @@ #include "chromeos/dbus/system_clock_client.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/observer_list.h" #include "dbus/bus.h" #include "dbus/message.h" @@ -37,7 +40,7 @@ return observers_.HasObserver(observer); } - void SetTime(int64 time_in_seconds) override { + void SetTime(int64_t time_in_seconds) override { // Always try to set the time, because |can_set_time_| may be stale. dbus::MethodCall method_call(system_clock::kSystemClockInterface, system_clock::kSystemClockSet);
diff --git a/chromeos/dbus/system_clock_client.h b/chromeos/dbus/system_clock_client.h index 3b84501..98a4892 100644 --- a/chromeos/dbus/system_clock_client.h +++ b/chromeos/dbus/system_clock_client.h
@@ -5,7 +5,10 @@ #ifndef CHROMEOS_DBUS_SYSTEM_CLOCK_CLIENT_H_ #define CHROMEOS_DBUS_SYSTEM_CLOCK_CLIENT_H_ +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" @@ -38,7 +41,7 @@ virtual bool HasObserver(const Observer* observer) const = 0; // Sets the system clock. - virtual void SetTime(int64 time_in_seconds) = 0; + virtual void SetTime(int64_t time_in_seconds) = 0; // Checks if the system time can be set. virtual bool CanSetTime() = 0;
diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc index f77c5de4..1363b78 100644 --- a/chromeos/dbus/update_engine_client.cc +++ b/chromeos/dbus/update_engine_client.cc
@@ -4,6 +4,8 @@ #include "chromeos/dbus/update_engine_client.h" +#include <stdint.h> + #include <algorithm> #include "base/bind.h" @@ -351,7 +353,7 @@ void StatusUpdateReceived(dbus::Signal* signal) { VLOG(1) << "Status update signal received: " << signal->ToString(); dbus::MessageReader reader(signal); - int64 last_checked_time = 0; + int64_t last_checked_time = 0; double progress = 0.0; std::string current_operation; std::string new_version;
diff --git a/chromeos/dbus/update_engine_client.h b/chromeos/dbus/update_engine_client.h index 99de142..9950e213 100644 --- a/chromeos/dbus/update_engine_client.h +++ b/chromeos/dbus/update_engine_client.h
@@ -5,9 +5,12 @@ #ifndef CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_ #define CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h"
diff --git a/chromeos/dbus/volume_state.h b/chromeos/dbus/volume_state.h index 0d0a305..caa08483 100644 --- a/chromeos/dbus/volume_state.h +++ b/chromeos/dbus/volume_state.h
@@ -5,17 +5,18 @@ #ifndef CHROMEOS_DBUS_VOLUME_STATE_H_ #define CHROMEOS_DBUS_VOLUME_STATE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "chromeos/chromeos_export.h" namespace chromeos { struct CHROMEOS_EXPORT VolumeState { - int32 output_volume; + int32_t output_volume; bool output_system_mute; - int32 input_gain; + int32_t input_gain; bool input_mute; bool output_user_mute;
diff --git a/chromeos/disks/disk_mount_manager.cc b/chromeos/disks/disk_mount_manager.cc index e947eb7..3c89ac6 100644 --- a/chromeos/disks/disk_mount_manager.cc +++ b/chromeos/disks/disk_mount_manager.cc
@@ -4,9 +4,13 @@ #include "chromeos/disks/disk_mount_manager.h" +#include <stddef.h> +#include <stdint.h> + #include <set> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/stl_util.h" @@ -651,7 +655,7 @@ const std::string& fs_uuid, const std::string& system_path_prefix, DeviceType device_type, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, bool is_parent, bool is_read_only, bool has_media, @@ -677,8 +681,7 @@ has_media_(has_media), on_boot_device_(on_boot_device), on_removable_device_(on_removable_device), - is_hidden_(is_hidden) { -} + is_hidden_(is_hidden) {} DiskMountManager::Disk::~Disk() {}
diff --git a/chromeos/disks/disk_mount_manager.h b/chromeos/disks/disk_mount_manager.h index ac21ad3..cf29e72 100644 --- a/chromeos/disks/disk_mount_manager.h +++ b/chromeos/disks/disk_mount_manager.h
@@ -5,6 +5,8 @@ #ifndef CHROMEOS_DISKS_DISK_MOUNT_MANAGER_H_ #define CHROMEOS_DISKS_DISK_MOUNT_MANAGER_H_ +#include <stdint.h> + #include <map> #include "base/callback_forward.h" @@ -64,7 +66,7 @@ const std::string& fs_uuid, const std::string& system_path_prefix, DeviceType device_type, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, bool is_parent, bool is_read_only, bool has_media, @@ -121,7 +123,7 @@ DeviceType device_type() const { return device_type_; } // Total size of the device in bytes. - uint64 total_size_in_bytes() const { return total_size_in_bytes_; } + uint64_t total_size_in_bytes() const { return total_size_in_bytes_; } // Is the device is a parent device (i.e. sdb rather than sdb1). bool is_parent() const { return is_parent_; } @@ -161,7 +163,7 @@ std::string fs_uuid_; std::string system_path_prefix_; DeviceType device_type_; - uint64 total_size_in_bytes_; + uint64_t total_size_in_bytes_; bool is_parent_; bool is_read_only_; bool has_media_;
diff --git a/chromeos/disks/disk_mount_manager_unittest.cc b/chromeos/disks/disk_mount_manager_unittest.cc index becb950..4a5aae8a37 100644 --- a/chromeos/disks/disk_mount_manager_unittest.cc +++ b/chromeos/disks/disk_mount_manager_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -35,7 +38,7 @@ const char* fs_uuid; const char* system_path_prefix; chromeos::DeviceType device_type; - uint64 size_in_bytes; + uint64_t size_in_bytes; bool is_parent; bool is_read_only; bool has_media;
diff --git a/chromeos/disks/mock_disk_mount_manager.cc b/chromeos/disks/mock_disk_mount_manager.cc index c915b00..7b76767 100644 --- a/chromeos/disks/mock_disk_mount_manager.cc +++ b/chromeos/disks/mock_disk_mount_manager.cc
@@ -4,6 +4,8 @@ #include "chromeos/disks/mock_disk_mount_manager.h" +#include <stdint.h> + #include <utility> #include "base/message_loop/message_loop.h" @@ -186,7 +188,7 @@ const std::string& vendor_name, const std::string& product_name, DeviceType device_type, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, bool is_parent, bool has_media, bool on_boot_device,
diff --git a/chromeos/disks/mock_disk_mount_manager.h b/chromeos/disks/mock_disk_mount_manager.h index e5693d1..a37f8a05 100644 --- a/chromeos/disks/mock_disk_mount_manager.h +++ b/chromeos/disks/mock_disk_mount_manager.h
@@ -5,8 +5,11 @@ #ifndef CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_ #define CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/dbus/cros_disks_client.h" #include "chromeos/disks/disk_mount_manager.h" @@ -63,7 +66,7 @@ const std::string& vendor_name, const std::string& product_name, DeviceType device_type, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, bool is_parent, bool has_media, bool on_boot_device,
diff --git a/chromeos/disks/suspend_unmount_manager.h b/chromeos/disks/suspend_unmount_manager.h index b52687c..e69dfb0c 100644 --- a/chromeos/disks/suspend_unmount_manager.h +++ b/chromeos/disks/suspend_unmount_manager.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/cros_disks_client.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/chromeos/geolocation/simple_geolocation_request.cc b/chromeos/geolocation/simple_geolocation_request.cc index 0f205b6..01f48a0 100644 --- a/chromeos/geolocation/simple_geolocation_request.cc +++ b/chromeos/geolocation/simple_geolocation_request.cc
@@ -4,6 +4,8 @@ #include "chromeos/geolocation/simple_geolocation_request.h" +#include <stddef.h> + #include <algorithm> #include <string>
diff --git a/chromeos/geolocation/simple_geolocation_request.h b/chromeos/geolocation/simple_geolocation_request.h index 5ec5ce3..8771e5d 100644 --- a/chromeos/geolocation/simple_geolocation_request.h +++ b/chromeos/geolocation/simple_geolocation_request.h
@@ -5,9 +5,9 @@ #ifndef CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_ #define CHROMEOS_GEOLOCATION_SIMPLE_GEOLOCATION_REQUEST_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/chromeos/geolocation/simple_geolocation_unittest.cc b/chromeos/geolocation/simple_geolocation_unittest.cc index db2243ac..ba4eb2e9 100644 --- a/chromeos/geolocation/simple_geolocation_unittest.cc +++ b/chromeos/geolocation/simple_geolocation_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "chromeos/geolocation/simple_geolocation_provider.h"
diff --git a/chromeos/login/auth/auth_attempt_state.h b/chromeos/login/auth/auth_attempt_state.h index 685ba688..73ccced 100644 --- a/chromeos/login/auth/auth_attempt_state.h +++ b/chromeos/login/auth/auth_attempt_state.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/auth_status_consumer.h"
diff --git a/chromeos/login/auth/authenticator.h b/chromeos/login/auth/authenticator.h index 650ea382..1f05bce 100644 --- a/chromeos/login/auth/authenticator.h +++ b/chromeos/login/auth/authenticator.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/auth_status_consumer.h"
diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc index e9e10174..4a80b2b 100644 --- a/chromeos/login/auth/cryptohome_authenticator.cc +++ b/chromeos/login/auth/cryptohome_authenticator.cc
@@ -4,9 +4,10 @@ #include "chromeos/login/auth/cryptohome_authenticator.h" +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h" @@ -194,14 +195,14 @@ DCHECK_EQ(kCryptohomeGAIAKeyLabel, key_definition.label); // Extract the key type and salt from |key_definition|, if present. - scoped_ptr<int64> type; + scoped_ptr<int64_t> type; scoped_ptr<std::string> salt; for (std::vector<cryptohome::KeyDefinition::ProviderData>:: const_iterator it = key_definition.provider_data.begin(); it != key_definition.provider_data.end(); ++it) { if (it->name == kKeyProviderDataTypeName) { if (it->number) - type.reset(new int64(*it->number)); + type.reset(new int64_t(*it->number)); else NOTREACHED(); } else if (it->name == kKeyProviderDataSaltName) {
diff --git a/chromeos/login/auth/extended_authenticator.h b/chromeos/login/auth/extended_authenticator.h index d80b2093..deaa6c4 100644 --- a/chromeos/login/auth/extended_authenticator.h +++ b/chromeos/login/auth/extended_authenticator.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/login/auth/extended_authenticator_impl.cc b/chromeos/login/auth/extended_authenticator_impl.cc index 88ec3cf..25d95207 100644 --- a/chromeos/login/auth/extended_authenticator_impl.cc +++ b/chromeos/login/auth/extended_authenticator_impl.cc
@@ -4,6 +4,8 @@ #include "chromeos/login/auth/extended_authenticator_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chromeos/login/auth/extended_authenticator_impl.h b/chromeos/login/auth/extended_authenticator_impl.h index 519c1fe..a292e9e 100644 --- a/chromeos/login/auth/extended_authenticator_impl.h +++ b/chromeos/login/auth/extended_authenticator_impl.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/extended_authenticator.h"
diff --git a/chromeos/login/auth/login_performer.h b/chromeos/login/auth/login_performer.h index 68b5aa1f..c85a482 100644 --- a/chromeos/login/auth/login_performer.h +++ b/chromeos/login/auth/login_performer.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/login/auth/mock_auth_attempt_state_resolver.h b/chromeos/login/auth/mock_auth_attempt_state_resolver.h index f96545d..0cc9cc5 100644 --- a/chromeos/login/auth/mock_auth_attempt_state_resolver.h +++ b/chromeos/login/auth/mock_auth_attempt_state_resolver.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_LOGIN_AUTH_MOCK_AUTH_ATTEMPT_STATE_RESOLVER_H_ #define CHROMEOS_LOGIN_AUTH_MOCK_AUTH_ATTEMPT_STATE_RESOLVER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/auth_attempt_state_resolver.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chromeos/login/auth/mock_url_fetchers.h b/chromeos/login/auth/mock_url_fetchers.h index 8d81e41..8e977a7 100644 --- a/chromeos/login/auth/mock_url_fetchers.h +++ b/chromeos/login/auth/mock_url_fetchers.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/login/auth/stub_authenticator.h b/chromeos/login/auth/stub_authenticator.h index 84d0595b..8c67874 100644 --- a/chromeos/login/auth/stub_authenticator.h +++ b/chromeos/login/auth/stub_authenticator.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/authenticator.h"
diff --git a/chromeos/login/auth/test_attempt_state.h b/chromeos/login/auth/test_attempt_state.h index 25cde3c..287b003 100644 --- a/chromeos/login/auth/test_attempt_state.h +++ b/chromeos/login/auth/test_attempt_state.h
@@ -6,6 +6,7 @@ #define CHROMEOS_LOGIN_AUTH_TEST_ATTEMPT_STATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/login/auth/auth_attempt_state.h" #include "chromeos/login/auth/auth_status_consumer.h"
diff --git a/chromeos/login/login_state.h b/chromeos/login/login_state.h index 394357e8..e69bc633 100644 --- a/chromeos/login/login_state.h +++ b/chromeos/login/login_state.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_LOGIN_LOGIN_STATE_H_ #define CHROMEOS_LOGIN_LOGIN_STATE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/login/login_state_unittest.cc b/chromeos/login/login_state_unittest.cc index a6a5d4a..c683496 100644 --- a/chromeos/login/login_state_unittest.cc +++ b/chromeos/login/login_state_unittest.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_switches.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/login/user_names.cc b/chromeos/login/user_names.cc index 7245c17..32c23dec 100644 --- a/chromeos/login/user_names.cc +++ b/chromeos/login/user_names.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chromeos/login/user_names.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/signin/core/account_id/account_id.h" #include "google_apis/gaia/gaia_auth_util.h"
diff --git a/chromeos/network/certificate_pattern.cc b/chromeos/network/certificate_pattern.cc index 7d220886..eba1dfe 100644 --- a/chromeos/network/certificate_pattern.cc +++ b/chromeos/network/certificate_pattern.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/certificate_pattern.h" +#include <stddef.h> + #include "base/logging.h" #include "base/values.h" #include "components/onc/onc_constants.h"
diff --git a/chromeos/network/client_cert_resolver.h b/chromeos/network/client_cert_resolver.h index 931012b..91d7fb5 100644 --- a/chromeos/network/client_cert_resolver.h +++ b/chromeos/network/client_cert_resolver.h
@@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc index 4006072..98123a36 100644 --- a/chromeos/network/client_cert_resolver_unittest.cc +++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/network/client_cert_util.cc b/chromeos/network/client_cert_util.cc index 1f810f0..f440dcb4 100644 --- a/chromeos/network/client_cert_util.cc +++ b/chromeos/network/client_cert_util.cc
@@ -6,6 +6,7 @@ #include <cert.h> #include <pk11pub.h> +#include <stddef.h> #include <list>
diff --git a/chromeos/network/device_state.h b/chromeos/network/device_state.h index 00e49078..97ebd0b9 100644 --- a/chromeos/network/device_state.h +++ b/chromeos/network/device_state.h
@@ -5,6 +5,9 @@ #ifndef CHROMEOS_NETWORK_DEVICE_STATE_H_ #define CHROMEOS_NETWORK_DEVICE_STATE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/values.h" #include "chromeos/network/managed_state.h" #include "chromeos/network/network_util.h" @@ -41,7 +44,7 @@ const std::string& technology_family() const { return technology_family_; } const std::string& carrier() const { return carrier_; } const std::string& sim_lock_type() const { return sim_lock_type_; } - uint32 sim_retries_left() const { return sim_retries_left_; } + uint32_t sim_retries_left() const { return sim_retries_left_; } const std::string& meid() const { return meid_; } const std::string& imei() const { return imei_; } const std::string& iccid() const { return iccid_; } @@ -79,7 +82,7 @@ std::string technology_family_; std::string carrier_; std::string sim_lock_type_; - uint32 sim_retries_left_; + uint32_t sim_retries_left_; bool sim_present_; std::string meid_; std::string imei_;
diff --git a/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h b/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h index f0d3c4f..27d8d13 100644 --- a/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h +++ b/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_NETWORK_DHCP_PROXY_SCRIPT_FETCHER_CHROMEOS_H_ #define CHROMEOS_NETWORK_DHCP_PROXY_SCRIPT_FETCHER_CHROMEOS_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/fake_network_device_handler.h b/chromeos/network/fake_network_device_handler.h index 79424c7..a7281fa2 100644 --- a/chromeos/network/fake_network_device_handler.h +++ b/chromeos/network/fake_network_device_handler.h
@@ -5,8 +5,8 @@ #ifndef CHROMEOS_NETWORK_FAKE_NETWORK_DEVICE_HANDLER_H_ #define CHROMEOS_NETWORK_FAKE_NETWORK_DEVICE_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/network_device_handler.h"
diff --git a/chromeos/network/firewall_hole.cc b/chromeos/network/firewall_hole.cc index 3ad3463..3839b3a 100644 --- a/chromeos/network/firewall_hole.cc +++ b/chromeos/network/firewall_hole.cc
@@ -5,6 +5,7 @@ #include "chromeos/network/firewall_hole.h" #include <fcntl.h> +#include <stdint.h> #include <unistd.h> #include "base/bind.h"
diff --git a/chromeos/network/geolocation_handler.cc b/chromeos/network/geolocation_handler.cc index d4adfb89..0041ccf 100644 --- a/chromeos/network/geolocation_handler.cc +++ b/chromeos/network/geolocation_handler.cc
@@ -4,6 +4,9 @@ #include "chromeos/network/geolocation_handler.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" @@ -35,7 +38,8 @@ } bool GeolocationHandler::GetWifiAccessPoints( - WifiAccessPointVector* access_points, int64* age_ms) { + WifiAccessPointVector* access_points, + int64_t* age_ms) { if (!wifi_enabled_) return false; // Always request updated access points. @@ -127,7 +131,7 @@ entry->GetString(shill::kGeoMacAddressProperty, &wap.mac_address); std::string age_str; if (entry->GetString(shill::kGeoAgeProperty, &age_str)) { - int64 age_ms; + int64_t age_ms; if (base::StringToInt64(age_str, &age_ms)) { wap.timestamp = base::Time::Now() - base::TimeDelta::FromMilliseconds(age_ms);
diff --git a/chromeos/network/geolocation_handler.h b/chromeos/network/geolocation_handler.h index 15b291e..5720364b 100644 --- a/chromeos/network/geolocation_handler.h +++ b/chromeos/network/geolocation_handler.h
@@ -5,6 +5,9 @@ #ifndef CHROMEOS_NETWORK_GEOLOCATION_HANDLER_H_ #define CHROMEOS_NETWORK_GEOLOCATION_HANDLER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chromeos/dbus/dbus_method_call_status.h" @@ -37,7 +40,8 @@ // This sends a request for wifi access point data. If data is already // available, returns |true|, fills |access_points| with the latest access // point data, and sets |age_ms| to the time since the last update in MS. - bool GetWifiAccessPoints(WifiAccessPointVector* access_points, int64* age_ms); + bool GetWifiAccessPoints(WifiAccessPointVector* access_points, + int64_t* age_ms); bool wifi_enabled() const { return wifi_enabled_; }
diff --git a/chromeos/network/geolocation_handler_unittest.cc b/chromeos/network/geolocation_handler_unittest.cc index 265f120..6a64a91 100644 --- a/chromeos/network/geolocation_handler_unittest.cc +++ b/chromeos/network/geolocation_handler_unittest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chromeos/network/host_resolver_impl_chromeos.cc b/chromeos/network/host_resolver_impl_chromeos.cc index 05def37..ce0cd18 100644 --- a/chromeos/network/host_resolver_impl_chromeos.cc +++ b/chromeos/network/host_resolver_impl_chromeos.cc
@@ -5,6 +5,7 @@ #include "chromeos/network/host_resolver_impl_chromeos.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/sys_info.h" #include "base/thread_task_runner_handle.h"
diff --git a/chromeos/network/host_resolver_impl_chromeos.h b/chromeos/network/host_resolver_impl_chromeos.h index dba4398..d4acf0f6 100644 --- a/chromeos/network/host_resolver_impl_chromeos.h +++ b/chromeos/network/host_resolver_impl_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_NETWORK_HOST_RESOLVER_IMPL_CHROMEOS_H_ #define CHROMEOS_NETWORK_HOST_RESOLVER_IMPL_CHROMEOS_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/host_resolver_impl_chromeos_unittest.cc b/chromeos/network/host_resolver_impl_chromeos_unittest.cc index 8b04c1e5..89ebb357 100644 --- a/chromeos/network/host_resolver_impl_chromeos_unittest.cc +++ b/chromeos/network/host_resolver_impl_chromeos_unittest.cc
@@ -5,6 +5,7 @@ #include "chromeos/network/host_resolver_impl_chromeos.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/network/managed_network_configuration_handler.h b/chromeos/network/managed_network_configuration_handler.h index dfdeb722..172dc0b 100644 --- a/chromeos/network/managed_network_configuration_handler.h +++ b/chromeos/network/managed_network_configuration_handler.h
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/network_handler.h"
diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h index 9cf30ef..76d6c2e 100644 --- a/chromeos/network/managed_network_configuration_handler_impl.h +++ b/chromeos/network/managed_network_configuration_handler_impl.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc index 6580156..e22b161 100644 --- a/chromeos/network/managed_network_configuration_handler_unittest.cc +++ b/chromeos/network/managed_network_configuration_handler_unittest.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/network/managed_state.cc b/chromeos/network/managed_state.cc index 75fce5b..9a6c1b2 100644 --- a/chromeos/network/managed_state.cc +++ b/chromeos/network/managed_state.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/managed_state.h" +#include <stdint.h> + #include "base/logging.h" #include "base/values.h" #include "chromeos/network/device_state.h" @@ -125,17 +127,17 @@ bool ManagedState::GetUInt32Value(const std::string& key, const base::Value& value, - uint32* out_value) { + uint32_t* out_value) { // base::Value restricts the number types to BOOL, INTEGER, and DOUBLE only. - // uint32 will automatically get converted to a double, which is why we try + // uint32_t will automatically get converted to a double, which is why we try // to obtain the value as a double (see dbus/values_util.h). - uint32 new_value; + uint32_t new_value; double double_value; if (!value.GetAsDouble(&double_value) || double_value < 0) { NET_LOG_ERROR("Error parsing state value", path() + "." + key); return false; } - new_value = static_cast<uint32>(double_value); + new_value = static_cast<uint32_t>(double_value); if (*out_value == new_value) return false; *out_value = new_value;
diff --git a/chromeos/network/managed_state.h b/chromeos/network/managed_state.h index d33aa8b..86e3b6de 100644 --- a/chromeos/network/managed_state.h +++ b/chromeos/network/managed_state.h
@@ -5,10 +5,12 @@ #ifndef CHROMEOS_NETWORK_MANAGED_STATE_H_ #define CHROMEOS_NETWORK_MANAGED_STATE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" namespace base { @@ -101,7 +103,7 @@ std::string* out_value); bool GetUInt32Value(const std::string& key, const base::Value& value, - uint32* out_value); + uint32_t* out_value); void set_name(const std::string& name) { name_ = name; }
diff --git a/chromeos/network/mock_managed_network_configuration_handler.h b/chromeos/network/mock_managed_network_configuration_handler.h index 0af4862..812dfc3 100644 --- a/chromeos/network/mock_managed_network_configuration_handler.h +++ b/chromeos/network/mock_managed_network_configuration_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/values.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/managed_network_configuration_handler.h"
diff --git a/chromeos/network/network_activation_handler.h b/chromeos/network/network_activation_handler.h index f15c73d..8984d2d 100644 --- a/chromeos/network/network_activation_handler.h +++ b/chromeos/network/network_activation_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/network_handler_callbacks.h"
diff --git a/chromeos/network/network_cert_migrator.h b/chromeos/network/network_cert_migrator.h index f4fc4dba..d1bf51a 100644 --- a/chromeos/network/network_cert_migrator.h +++ b/chromeos/network/network_cert_migrator.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_ #define CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/cert_loader.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc index ff7191c..d24d67b 100644 --- a/chromeos/network/network_cert_migrator_unittest.cc +++ b/chromeos/network/network_cert_migrator_unittest.cc
@@ -9,6 +9,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "chromeos/cert_loader.h"
diff --git a/chromeos/network/network_change_notifier_chromeos.cc b/chromeos/network/network_change_notifier_chromeos.cc index a232997a..2c81c037 100644 --- a/chromeos/network/network_change_notifier_chromeos.cc +++ b/chromeos/network/network_change_notifier_chromeos.cc
@@ -4,7 +4,6 @@ #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/location.h" #include "base/strings/string_util.h"
diff --git a/chromeos/network/network_change_notifier_chromeos.h b/chromeos/network/network_change_notifier_chromeos.h index d8b7292..ed24045 100644 --- a/chromeos/network/network_change_notifier_chromeos.h +++ b/chromeos/network/network_change_notifier_chromeos.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/network/network_change_notifier_chromeos_unittest.cc b/chromeos/network/network_change_notifier_chromeos_unittest.cc index 570bc366..4ace6d51 100644 --- a/chromeos/network/network_change_notifier_chromeos_unittest.cc +++ b/chromeos/network/network_change_notifier_chromeos_unittest.cc
@@ -4,9 +4,10 @@ #include "chromeos/network/network_change_notifier_chromeos.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_split.h" #include "chromeos/network/network_change_notifier_factory_chromeos.h"
diff --git a/chromeos/network/network_change_notifier_factory_chromeos.h b/chromeos/network/network_change_notifier_factory_chromeos.h index 1a04fbf..a60e5e8 100644 --- a/chromeos/network/network_change_notifier_factory_chromeos.h +++ b/chromeos/network/network_change_notifier_factory_chromeos.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_NETWORK_NETWORK_CHANGE_NOTIFIER_FACTORY_CHROMEOS_H_ #define CHROMEOS_NETWORK_NETWORK_CHANGE_NOTIFIER_FACTORY_CHROMEOS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chromeos/chromeos_export.h" #include "net/base/network_change_notifier_factory.h"
diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc index ac7ea8b..4caf50c1 100644 --- a/chromeos/network/network_configuration_handler.cc +++ b/chromeos/network/network_configuration_handler.cc
@@ -4,12 +4,14 @@ #include "chromeos/network/network_configuration_handler.h" +#include <stddef.h> #include "base/bind.h" #include "base/format_macros.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/network/network_configuration_handler.h b/chromeos/network/network_configuration_handler.h index 0020c07..6b0bbbdf 100644 --- a/chromeos/network/network_configuration_handler.h +++ b/chromeos/network/network_configuration_handler.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc index 21ff388..be4194a 100644 --- a/chromeos/network/network_configuration_handler_unittest.cc +++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <set> #include "base/bind.h" #include "base/json/json_writer.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h"
diff --git a/chromeos/network/network_connection_handler.h b/chromeos/network/network_connection_handler.h index 36f3a6d..f2ff1a0 100644 --- a/chromeos/network/network_connection_handler.h +++ b/chromeos/network/network_connection_handler.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc index 0c613bed..18bf80d 100644 --- a/chromeos/network/network_connection_handler_unittest.cc +++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/chromeos/network/network_device_handler.h b/chromeos/network/network_device_handler.h index d682eb9a..5f4e81c 100644 --- a/chromeos/network/network_device_handler.h +++ b/chromeos/network/network_device_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/network_handler_callbacks.h"
diff --git a/chromeos/network/network_device_handler_impl.cc b/chromeos/network/network_device_handler_impl.cc index 177fbcc3..ccb560ea 100644 --- a/chromeos/network/network_device_handler_impl.cc +++ b/chromeos/network/network_device_handler_impl.cc
@@ -4,6 +4,9 @@ #include "chromeos/network/network_device_handler_impl.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -171,8 +174,8 @@ } TDLSOperationParams new_params; - const int64 kRequestStatusDelayMs = 500; - int64 request_delay_ms = 0; + const int64_t kRequestStatusDelayMs = 500; + int64_t request_delay_ms = 0; if (params.operation == shill::kTDLSStatusOperation) { // If this is the last operation, or the result is 'Nonexistent', // return the result. @@ -228,7 +231,7 @@ ++retry_params.retry_count; NET_LOG(EVENT) << "TDLS Retry: " << params.retry_count << ": " << device_path; - const int64 kReRequestDelayMs = 1000; + const int64_t kReRequestDelayMs = 1000; base::TimeDelta request_delay; if (!DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()) request_delay = base::TimeDelta::FromMilliseconds(kReRequestDelayMs);
diff --git a/chromeos/network/network_device_handler_impl.h b/chromeos/network/network_device_handler_impl.h index 6b77815..31d88548 100644 --- a/chromeos/network/network_device_handler_impl.h +++ b/chromeos/network/network_device_handler_impl.h
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/network_device_handler.h" #include "chromeos/network/network_handler.h"
diff --git a/chromeos/network/network_device_handler_unittest.cc b/chromeos/network/network_device_handler_unittest.cc index 38e078b..8ef65f0b 100644 --- a/chromeos/network/network_device_handler_unittest.cc +++ b/chromeos/network/network_device_handler_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h"
diff --git a/chromeos/network/network_event_log.h b/chromeos/network/network_event_log.h index 7c2ba92..7e8f3ce 100644 --- a/chromeos/network/network_event_log.h +++ b/chromeos/network/network_event_log.h
@@ -8,7 +8,6 @@ #include <deque> #include <string> -#include "base/basictypes.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/network_handler.h b/chromeos/network/network_handler.h index 93658e0..028b7d5 100644 --- a/chromeos/network/network_handler.h +++ b/chromeos/network/network_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_NETWORK_NETWORK_HANDLER_H_ #define CHROMEOS_NETWORK_NETWORK_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/chromeos/network/network_handler_callbacks.h b/chromeos/network/network_handler_callbacks.h index 4bdd687..3135bf9 100644 --- a/chromeos/network/network_handler_callbacks.h +++ b/chromeos/network/network_handler_callbacks.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/network_ip_config.h b/chromeos/network/network_ip_config.h index d137fa1..a4efe1ee 100644 --- a/chromeos/network/network_ip_config.h +++ b/chromeos/network/network_ip_config.h
@@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/network_policy_observer.h b/chromeos/network/network_policy_observer.h index 924a036..cf56b25 100644 --- a/chromeos/network/network_policy_observer.h +++ b/chromeos/network/network_policy_observer.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" namespace chromeos {
diff --git a/chromeos/network/network_profile_handler.cc b/chromeos/network/network_profile_handler.cc index 002421a..0d13ee32 100644 --- a/chromeos/network/network_profile_handler.cc +++ b/chromeos/network/network_profile_handler.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/network_profile_handler.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h"
diff --git a/chromeos/network/network_profile_handler.h b/chromeos/network/network_profile_handler.h index af5045ad..5015dd27 100644 --- a/chromeos/network/network_profile_handler.h +++ b/chromeos/network/network_profile_handler.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/network_profile_observer.h b/chromeos/network/network_profile_observer.h index 87a7b198..ba7c9170 100644 --- a/chromeos/network/network_profile_observer.h +++ b/chromeos/network/network_profile_observer.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" namespace chromeos {
diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc index 9c95c7b..88bd7b1 100644 --- a/chromeos/network/network_sms_handler.cc +++ b/chromeos/network/network_sms_handler.cc
@@ -4,17 +4,21 @@ #include "chromeos/network/network_sms_handler.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <deque> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "chromeos/dbus/shill_device_client.h" -#include "chromeos/dbus/shill_manager_client.h" #include "chromeos/dbus/gsm_sms_client.h" #include "chromeos/dbus/modem_messaging_client.h" +#include "chromeos/dbus/shill_device_client.h" +#include "chromeos/dbus/shill_manager_client.h" #include "chromeos/dbus/sms_client.h" #include "dbus/object_path.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -60,8 +64,8 @@ private: void ListCallback(const base::ListValue& message_list); - void SmsReceivedCallback(uint32 index, bool complete); - void GetCallback(uint32 index, const base::DictionaryValue& dictionary); + void SmsReceivedCallback(uint32_t index, bool complete); + void GetCallback(uint32_t index, const base::DictionaryValue& dictionary); void DeleteMessages(); void MessageReceived(const base::DictionaryValue& dictionary); @@ -69,7 +73,7 @@ std::string service_name_; dbus::ObjectPath object_path_; bool deleting_messages_; - std::vector<uint32> delete_queue_; + std::vector<uint32_t> delete_queue_; base::WeakPtrFactory<ModemManagerNetworkSmsDeviceHandler> weak_ptr_factory_; DISALLOW_COPY_AND_ASSIGN(ModemManagerNetworkSmsDeviceHandler); @@ -116,7 +120,7 @@ MessageReceived(*message); double index = 0; if (message->GetDoubleWithoutPathExpansion(kIndexKey, &index)) - delete_queue_.push_back(static_cast<uint32>(index)); + delete_queue_.push_back(static_cast<uint32_t>(index)); } DeleteMessages(); } @@ -130,7 +134,7 @@ return; } deleting_messages_ = true; - uint32 index = delete_queue_.back(); + uint32_t index = delete_queue_.back(); delete_queue_.pop_back(); DBusThreadManager::Get()->GetGsmSMSClient()->Delete( service_name_, object_path_, index, @@ -139,10 +143,8 @@ weak_ptr_factory_.GetWeakPtr())); } -void NetworkSmsHandler:: -ModemManagerNetworkSmsDeviceHandler::SmsReceivedCallback( - uint32 index, - bool complete) { +void NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler:: + SmsReceivedCallback(uint32_t index, bool complete) { // Only handle complete messages. if (!complete) return; @@ -154,7 +156,7 @@ } void NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler::GetCallback( - uint32 index, + uint32_t index, const base::DictionaryValue& dictionary) { MessageReceived(dictionary); delete_queue_.push_back(index);
diff --git a/chromeos/network/network_sms_handler.h b/chromeos/network/network_sms_handler.h index bb7fcb2..eb8ed88 100644 --- a/chromeos/network/network_sms_handler.h +++ b/chromeos/network/network_sms_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc index 27d48e9..23381bcc 100644 --- a/chromeos/network/network_state.cc +++ b/chromeos/network/network_state.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/network_state.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h index d388a8e..5a155dda 100644 --- a/chromeos/network/network_state.h +++ b/chromeos/network/network_state.h
@@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" #include "chromeos/network/managed_state.h" #include "components/onc/onc_constants.h"
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc index e2ea522..dfcc0e6f 100644 --- a/chromeos/network/network_state_handler.cc +++ b/chromeos/network/network_state_handler.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/network_state_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/format_macros.h" #include "base/guid.h"
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h index 7dd422c..2477c1a 100644 --- a/chromeos/network/network_state_handler.h +++ b/chromeos/network/network_state_handler.h
@@ -12,6 +12,7 @@ #include "base/callback_forward.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h"
diff --git a/chromeos/network/network_state_handler_observer.h b/chromeos/network/network_state_handler_observer.h index f2ffd619..a25dc59 100644 --- a/chromeos/network/network_state_handler_observer.h +++ b/chromeos/network/network_state_handler_observer.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" namespace chromeos {
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc index 3da3831..de832c0 100644 --- a/chromeos/network/network_state_handler_unittest.cc +++ b/chromeos/network/network_state_handler_unittest.cc
@@ -4,11 +4,14 @@ #include "chromeos/network/network_state_handler.h" +#include <stddef.h> + #include <map> #include <set> #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h"
diff --git a/chromeos/network/network_state_unittest.cc b/chromeos/network/network_state_unittest.cc index 3ba359a5..0d48cdc 100644 --- a/chromeos/network/network_state_unittest.cc +++ b/chromeos/network/network_state_unittest.cc
@@ -4,8 +4,10 @@ #include "chromeos/network/network_state.h" -#include "base/basictypes.h" +#include <stdint.h> + #include "base/i18n/streaming_utf8_validator.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chromeos/network/network_type_pattern.cc b/chromeos/network/network_type_pattern.cc index fd7d216..65537292 100644 --- a/chromeos/network/network_type_pattern.cc +++ b/chromeos/network/network_type_pattern.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/network_type_pattern.h" +#include <stddef.h> + #include "chromeos/network/network_event_log.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chromeos/network/network_ui_data.h b/chromeos/network/network_ui_data.h index 66cb236..981131ec 100644 --- a/chromeos/network/network_ui_data.h +++ b/chromeos/network/network_ui_data.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h" #include "components/onc/onc_constants.h"
diff --git a/chromeos/network/network_util.cc b/chromeos/network/network_util.cc index af660e2a..a0f8181 100644 --- a/chromeos/network/network_util.cc +++ b/chromeos/network/network_util.cc
@@ -4,6 +4,9 @@ #include "chromeos/network/network_util.h" +#include <stddef.h> +#include <stdint.h> + #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" @@ -37,7 +40,7 @@ namespace network_util { -std::string PrefixLengthToNetmask(int32 prefix_length) { +std::string PrefixLengthToNetmask(int32_t prefix_length) { std::string netmask; // Return the empty string for invalid inputs. if (prefix_length < 0 || prefix_length > 32) @@ -59,7 +62,7 @@ return netmask; } -int32 NetmaskToPrefixLength(const std::string& netmask) { +int32_t NetmaskToPrefixLength(const std::string& netmask) { int count = 0; int prefix_length = 0; base::StringTokenizer t(netmask, ".");
diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h index 47cdcde..b8fee454 100644 --- a/chromeos/network/network_util.h +++ b/chromeos/network/network_util.h
@@ -10,10 +10,11 @@ // All calls to functions in chromeos_network.h should be made through // functions provided by this header. +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" @@ -75,11 +76,11 @@ // Converts a |prefix_length| to a netmask. (for IPv4 only) // e.g. a |prefix_length| of 24 is converted to a netmask of "255.255.255.0". // Invalid prefix lengths will return the empty string. -CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32 prefix_length); +CHROMEOS_EXPORT std::string PrefixLengthToNetmask(int32_t prefix_length); // Converts a |netmask| to a prefixlen. (for IPv4 only) // e.g. a |netmask| of 255.255.255.0 is converted to a prefixlen of 24 -CHROMEOS_EXPORT int32 NetmaskToPrefixLength(const std::string& netmask); +CHROMEOS_EXPORT int32_t NetmaskToPrefixLength(const std::string& netmask); // Returns |shill_mac_address| in aa:bb format. CHROMEOS_EXPORT std::string FormattedMacAddress(
diff --git a/chromeos/network/network_util_unittest.cc b/chromeos/network/network_util_unittest.cc index 9ccf8e6..032c08c 100644 --- a/chromeos/network/network_util_unittest.cc +++ b/chromeos/network/network_util_unittest.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/network_util.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chromeos/network/onc/onc_certificate_importer.h b/chromeos/network/onc/onc_certificate_importer.h index 5c2678d4..ff934c1 100644 --- a/chromeos/network/onc/onc_certificate_importer.h +++ b/chromeos/network/onc/onc_certificate_importer.h
@@ -5,8 +5,8 @@ #ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_ #define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "components/onc/onc_constants.h" #include "net/cert/x509_certificate.h"
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.cc b/chromeos/network/onc/onc_certificate_importer_impl.cc index f5c97b08..90fc684d2 100644 --- a/chromeos/network/onc/onc_certificate_importer_impl.cc +++ b/chromeos/network/onc/onc_certificate_importer_impl.cc
@@ -7,6 +7,7 @@ #include <cert.h> #include <keyhi.h> #include <pk11pub.h> +#include <stddef.h> #include "base/base64.h" #include "base/bind.h"
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.h b/chromeos/network/onc/onc_certificate_importer_impl.h index 57460840..d3e5fb21 100644 --- a/chromeos/network/onc/onc_certificate_importer_impl.h +++ b/chromeos/network/onc/onc_certificate_importer_impl.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chromeos/network/onc/onc_mapper.h b/chromeos/network/onc/onc_mapper.h index d4b1869..07c5339 100644 --- a/chromeos/network/onc/onc_mapper.h +++ b/chromeos/network/onc/onc_mapper.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc index 2237b3a..1662920116 100644 --- a/chromeos/network/onc/onc_merger.cc +++ b/chromeos/network/onc/onc_merger.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/values.h" #include "chromeos/network/onc/onc_signature.h" #include "components/onc/onc_constants.h"
diff --git a/chromeos/network/onc/onc_normalizer.h b/chromeos/network/onc/onc_normalizer.h index 2ee0935..1fb18f1 100644 --- a/chromeos/network/onc/onc_normalizer.h +++ b/chromeos/network/onc/onc_normalizer.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_NETWORK_ONC_ONC_NORMALIZER_H_ #define CHROMEOS_NETWORK_ONC_ONC_NORMALIZER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/onc/onc_mapper.h"
diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc index 81d0733a..6ce1eab 100644 --- a/chromeos/network/onc/onc_translator_onc_to_shill.cc +++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
@@ -15,6 +15,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/values.h" #include "chromeos/network/onc/onc_signature.h"
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc index 2861737..62aa868 100644 --- a/chromeos/network/onc/onc_translator_shill_to_onc.cc +++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/basictypes.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/values.h" #include "chromeos/network/network_profile_handler.h"
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc index 771c51b..55f5091 100644 --- a/chromeos/network/onc/onc_utils.cc +++ b/chromeos/network/onc/onc_utils.cc
@@ -4,6 +4,9 @@ #include "chromeos/network/onc/onc_utils.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/json/json_reader.h" #include "base/logging.h" @@ -768,7 +771,7 @@ return net::ProxyServer( proxy_server.scheme(), net::HostPortPair(proxy_server.host_port_pair().host(), - static_cast<uint16>(port))); + static_cast<uint16_t>(port))); } void AppendProxyServerForScheme(const base::DictionaryValue& onc_manual,
diff --git a/chromeos/network/onc/onc_utils.h b/chromeos/network/onc/onc_utils.h index 6a56e96..b70a7df3 100644 --- a/chromeos/network/onc/onc_utils.h +++ b/chromeos/network/onc/onc_utils.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc index 30053f1..4c20d995 100644 --- a/chromeos/network/onc/onc_utils_unittest.cc +++ b/chromeos/network/onc/onc_utils_unittest.cc
@@ -8,6 +8,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chromeos/chromeos_test_utils.h"
diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc index ee681aac..12c602f 100644 --- a/chromeos/network/onc/onc_validator.cc +++ b/chromeos/network/onc/onc_validator.cc
@@ -4,6 +4,9 @@ #include "chromeos/network/onc/onc_validator.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/json/json_writer.h" @@ -452,7 +455,7 @@ std::string hex_ssid_string; if (object->GetStringWithoutPathExpansion(::onc::wifi::kHexSSID, &hex_ssid_string)) { - std::vector<uint8> decoded_ssid; + std::vector<uint8_t> decoded_ssid; if (!base::HexStringToBytes(hex_ssid_string, &decoded_ssid)) { LOG(ERROR) << MessageHeader() << "Field " << ::onc::wifi::kHexSSID << " is not a valid hex representation: \"" << hex_ssid_string
diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h index adacbda..07be183 100644 --- a/chromeos/network/onc/onc_validator.h +++ b/chromeos/network/onc/onc_validator.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/onc/onc_mapper.h"
diff --git a/chromeos/network/policy_applicator.h b/chromeos/network/policy_applicator.h index bca3b06..032f4f3 100644 --- a/chromeos/network/policy_applicator.h +++ b/chromeos/network/policy_applicator.h
@@ -9,6 +9,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chromeos/network/portal_detector/network_portal_detector.h b/chromeos/network/portal_detector/network_portal_detector.h index 611cb642..f5cf756 100644 --- a/chromeos/network/portal_detector/network_portal_detector.h +++ b/chromeos/network/portal_detector/network_portal_detector.h
@@ -5,7 +5,7 @@ #ifndef CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_H_ #define CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" #include "net/url_request/url_fetcher.h"
diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.cc b/chromeos/network/portal_detector/network_portal_detector_strategy.cc index c45466f..185d441 100644 --- a/chromeos/network/portal_detector/network_portal_detector_strategy.cc +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.cc
@@ -5,6 +5,7 @@ #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" #include "base/logging.h" +#include "base/macros.h" #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h"
diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.h b/chromeos/network/portal_detector/network_portal_detector_strategy.h index 84d48537..22d4ec50 100644 --- a/chromeos/network/portal_detector/network_portal_detector_strategy.h +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.h
@@ -5,7 +5,6 @@ #ifndef CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_STRATEGY_H_ #define CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_STRATEGY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h"
diff --git a/chromeos/network/portal_detector/network_portal_detector_stub.h b/chromeos/network/portal_detector/network_portal_detector_stub.h index c2e921e0..16e9fd0 100644 --- a/chromeos/network/portal_detector/network_portal_detector_stub.h +++ b/chromeos/network/portal_detector/network_portal_detector_stub.h
@@ -5,6 +5,7 @@ #ifndef CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_STUB_H_ #define CHROMEOS_NETWORK_PORTAL_DETECTOR_NETWORK_PORTAL_DETECTOR_STUB_H_ +#include "base/macros.h" #include "chromeos/network/portal_detector/network_portal_detector.h" namespace chromeos {
diff --git a/chromeos/network/prohibited_technologies_handler_unittest.cc b/chromeos/network/prohibited_technologies_handler_unittest.cc index 68e186f..931e727 100644 --- a/chromeos/network/prohibited_technologies_handler_unittest.cc +++ b/chromeos/network/prohibited_technologies_handler_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc index 41482be..a3f77a54 100644 --- a/chromeos/network/shill_property_handler.cc +++ b/chromeos/network/shill_property_handler.cc
@@ -4,10 +4,13 @@ #include "chromeos/network/shill_property_handler.h" +#include <stddef.h> + #include <sstream> #include "base/bind.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h index b4b6202a..2fb49d0 100644 --- a/chromeos/network/shill_property_handler.h +++ b/chromeos/network/shill_property_handler.h
@@ -11,6 +11,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/dbus_method_call_status.h" #include "chromeos/dbus/shill_property_changed_observer.h"
diff --git a/chromeos/network/shill_property_handler_unittest.cc b/chromeos/network/shill_property_handler_unittest.cc index 7593194..6a23238 100644 --- a/chromeos/network/shill_property_handler_unittest.cc +++ b/chromeos/network/shill_property_handler_unittest.cc
@@ -4,11 +4,14 @@ #include "chromeos/network/shill_property_handler.h" +#include <stddef.h> + #include <map> #include <set> #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h"
diff --git a/chromeos/network/shill_property_util.cc b/chromeos/network/shill_property_util.cc index c5cafc83..e47c7ad4 100644 --- a/chromeos/network/shill_property_util.cc +++ b/chromeos/network/shill_property_util.cc
@@ -4,6 +4,8 @@ #include "chromeos/network/shill_property_util.h" +#include <stdint.h> + #include <set> #include "base/i18n/icu_encoding_detection.h" @@ -28,15 +30,15 @@ // Replace non UTF8 characters in |str| with a replacement character. std::string ValidateUTF8(const std::string& str) { std::string result; - for (int32 index = 0; index < static_cast<int32>(str.size()); ++index) { - uint32 code_point_out; + for (int32_t index = 0; index < static_cast<int32_t>(str.size()); ++index) { + uint32_t code_point_out; bool is_unicode_char = base::ReadUnicodeCharacter( str.c_str(), str.size(), &index, &code_point_out); - const uint32 kFirstNonControlChar = 0x20; + const uint32_t kFirstNonControlChar = 0x20; if (is_unicode_char && (code_point_out >= kFirstNonControlChar)) { base::WriteUnicodeCharacter(code_point_out, &result); } else { - const uint32 kReplacementChar = 0xFFFD; + const uint32_t kReplacementChar = 0xFFFD; // Puts kReplacementChar if character is a control character [0,0x20) // or is not readable UTF8. base::WriteUnicodeCharacter(kReplacementChar, &result); @@ -86,7 +88,7 @@ } std::string ssid; - std::vector<uint8> raw_ssid_bytes; + std::vector<uint8_t> raw_ssid_bytes; if (base::HexStringToBytes(hex_ssid, &raw_ssid_bytes)) { ssid = std::string(raw_ssid_bytes.begin(), raw_ssid_bytes.end()); VLOG(2) << "GetSSIDFromProperties: " << name << " HexSsid=" << hex_ssid
diff --git a/chromeos/process_proxy/process_output_watcher.cc b/chromeos/process_proxy/process_output_watcher.cc index 92868c0..c9f1916 100644 --- a/chromeos/process_proxy/process_output_watcher.cc +++ b/chromeos/process_proxy/process_output_watcher.cc
@@ -4,6 +4,9 @@ #include "chromeos/process_proxy/process_output_watcher.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cstdio> #include <cstring> @@ -23,10 +26,10 @@ // byte. If the most significant bit is '0', the character is a valid ASCII // and it's byte size is 1. // The method returns 1 if the provided byte is invalid leading byte. -size_t UTF8SizeFromLeadingByte(uint8 leading_byte) { +size_t UTF8SizeFromLeadingByte(uint8_t leading_byte) { size_t byte_count = 0; - uint8 mask = 1 << 7; - uint8 error_mask = 1 << (7 - CBU8_MAX_LENGTH); + uint8_t mask = 1 << 7; + uint8_t error_mask = 1 << (7 - CBU8_MAX_LENGTH); while (leading_byte & mask) { if (mask & error_mask) return 1;
diff --git a/chromeos/process_proxy/process_output_watcher.h b/chromeos/process_proxy/process_output_watcher.h index a5aefb55..936672d 100644 --- a/chromeos/process_proxy/process_output_watcher.h +++ b/chromeos/process_proxy/process_output_watcher.h
@@ -5,10 +5,13 @@ #ifndef CHROMEOS_PROCESS_PROXY_PROCESS_OUTPUT_WATCHER_H_ #define CHROMEOS_PROCESS_PROXY_PROCESS_OUTPUT_WATCHER_H_ +#include <stddef.h> + #include <string> #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index 2f2eb99..75373812 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <gtest/gtest.h> +#include <stddef.h> #include <queue> #include <string>
diff --git a/chromeos/process_proxy/process_proxy.cc b/chromeos/process_proxy/process_proxy.cc index 8ec9ceb..684316bf 100644 --- a/chromeos/process_proxy/process_proxy.cc +++ b/chromeos/process_proxy/process_proxy.cc
@@ -4,6 +4,7 @@ #include "chromeos/process_proxy/process_proxy.h" +#include <stddef.h> #include <stdlib.h> #include <sys/ioctl.h>
diff --git a/chromeos/process_proxy/process_proxy.h b/chromeos/process_proxy/process_proxy.h index d49ba803..49b3b0c 100644 --- a/chromeos/process_proxy/process_proxy.h +++ b/chromeos/process_proxy/process_proxy.h
@@ -11,6 +11,7 @@ #include <cstdio> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chromeos/process_proxy/process_output_watcher.h"
diff --git a/chromeos/process_proxy/process_proxy_registry.h b/chromeos/process_proxy/process_proxy_registry.h index 554af9e..e845d5d 100644 --- a/chromeos/process_proxy/process_proxy_registry.h +++ b/chromeos/process_proxy/process_proxy_registry.h
@@ -10,8 +10,9 @@ #include "base/callback.h" #include "base/lazy_instance.h" -#include "base/memory/scoped_ptr.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread.h" #include "chromeos/chromeos_export.h"
diff --git a/chromeos/process_proxy/process_proxy_unittest.cc b/chromeos/process_proxy/process_proxy_unittest.cc index c838f31..9a43c3d0 100644 --- a/chromeos/process_proxy/process_proxy_unittest.cc +++ b/chromeos/process_proxy/process_proxy_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <gtest/gtest.h> +#include <stddef.h> #include <string>
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc index adf04a8b..6f1251e 100644 --- a/chromeos/settings/timezone_settings.cc +++ b/chromeos/settings/timezone_settings.cc
@@ -4,6 +4,8 @@ #include "chromeos/settings/timezone_settings.h" +#include <stddef.h> + #include <string> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/observer_list.h"
diff --git a/chromeos/system/fake_statistics_provider.h b/chromeos/system/fake_statistics_provider.h index 0c43e88..d7f1c35 100644 --- a/chromeos/system/fake_statistics_provider.h +++ b/chromeos/system/fake_statistics_provider.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "chromeos/system/statistics_provider.h" namespace chromeos {
diff --git a/chromeos/system/name_value_pairs_parser.cc b/chromeos/system/name_value_pairs_parser.cc index bd565f7f..2bf34b6 100644 --- a/chromeos/system/name_value_pairs_parser.cc +++ b/chromeos/system/name_value_pairs_parser.cc
@@ -4,6 +4,8 @@ #include "chromeos/system/name_value_pairs_parser.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h"
diff --git a/chromeos/system/name_value_pairs_parser.h b/chromeos/system/name_value_pairs_parser.h index 2cb704b5..bb1758b 100644 --- a/chromeos/system/name_value_pairs_parser.h +++ b/chromeos/system/name_value_pairs_parser.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chromeos/chromeos_export.h" namespace base {
diff --git a/chromeos/system/name_value_pairs_parser_unittest.cc b/chromeos/system/name_value_pairs_parser_unittest.cc index e627521..675a978 100644 --- a/chromeos/system/name_value_pairs_parser_unittest.cc +++ b/chromeos/system/name_value_pairs_parser_unittest.cc
@@ -4,7 +4,6 @@ #include "chromeos/system/name_value_pairs_parser.h" -#include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos {
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index 019177ea..afa67ded 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc
@@ -11,6 +11,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chromeos/system/version_loader.cc b/chromeos/system/version_loader.cc index ab9505b..f62ea06 100644 --- a/chromeos/system/version_loader.cc +++ b/chromeos/system/version_loader.cc
@@ -4,6 +4,8 @@ #include "chromeos/system/version_loader.h" +#include <stddef.h> + #include <vector> #include "base/files/file_path.h"
diff --git a/chromeos/timezone/timezone_request.cc b/chromeos/timezone/timezone_request.cc index 7c284cd4..4d787bd 100644 --- a/chromeos/timezone/timezone_request.cc +++ b/chromeos/timezone/timezone_request.cc
@@ -4,6 +4,8 @@ #include "chromeos/timezone/timezone_request.h" +#include <stddef.h> + #include <string> #include "base/json/json_reader.h"
diff --git a/chromeos/timezone/timezone_request.h b/chromeos/timezone/timezone_request.h index dbad66b..8c584cc 100644 --- a/chromeos/timezone/timezone_request.h +++ b/chromeos/timezone/timezone_request.h
@@ -5,9 +5,9 @@ #ifndef CHROMEOS_TIMEZONE_TIMEZONE_REQUEST_H_ #define CHROMEOS_TIMEZONE_TIMEZONE_REQUEST_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/chromeos/timezone/timezone_resolver.cc b/chromeos/timezone/timezone_resolver.cc index 051a558a..5938654c 100644 --- a/chromeos/timezone/timezone_resolver.cc +++ b/chromeos/timezone/timezone_resolver.cc
@@ -5,12 +5,14 @@ #include "chromeos/timezone/timezone_resolver.h" #include <math.h> +#include <stdint.h> #include <algorithm> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_observer.h" #include "base/prefs/pref_registry_simple.h" @@ -262,7 +264,7 @@ base::PowerMonitor* power_monitor = base::PowerMonitor::Get(); power_monitor->AddObserver(this); - const int64 last_refresh_at_raw = + const int64_t last_refresh_at_raw = resolver_->local_state()->GetInt64(kLastTimeZoneRefreshTime); const base::Time last_refresh_at = base::Time::FromInternalValue(last_refresh_at_raw);
diff --git a/chromeos/timezone/timezone_unittest.cc b/chromeos/timezone/timezone_unittest.cc index 9e05fe0..37c608c8 100644 --- a/chromeos/timezone/timezone_unittest.cc +++ b/chromeos/timezone/timezone_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "chromeos/geolocation/geoposition.h"
diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc index 196b0b2..e80d612 100644 --- a/chromeos/tools/onc_validator/onc_validator.cc +++ b/chromeos/tools/onc_validator/onc_validator.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <cstdio> #include <iostream> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h"
diff --git a/chromeos/tpm/tpm_password_fetcher.h b/chromeos/tpm/tpm_password_fetcher.h index f9ceb5d7..bc1f2a6 100644 --- a/chromeos/tpm/tpm_password_fetcher.h +++ b/chromeos/tpm/tpm_password_fetcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_method_call_status.h"
diff --git a/chromeos/tpm/tpm_token_info_getter.cc b/chromeos/tpm/tpm_token_info_getter.cc index 6f6dfe7b..e51392f 100644 --- a/chromeos/tpm/tpm_token_info_getter.cc +++ b/chromeos/tpm/tpm_token_info_getter.cc
@@ -4,14 +4,16 @@ #include "chromeos/tpm/tpm_token_info_getter.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "chromeos/dbus/cryptohome_client.h" namespace { -const int64 kInitialRequestDelayMs = 100; -const int64 kMaxRequestDelayMs = 300000; // 5 minutes +const int64_t kInitialRequestDelayMs = 100; +const int64_t kMaxRequestDelayMs = 300000; // 5 minutes // Calculates the delay before running next attempt to initiatialize the TPM // token, if |last_delay| was the last or initial delay.
diff --git a/chromeos/tpm/tpm_token_info_getter.h b/chromeos/tpm/tpm_token_info_getter.h index f1f39a6..1612dc5f 100644 --- a/chromeos/tpm/tpm_token_info_getter.h +++ b/chromeos/tpm/tpm_token_info_getter.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chromeos/tpm/tpm_token_info_getter_unittest.cc b/chromeos/tpm/tpm_token_info_getter_unittest.cc index 7d53474..013c22ab 100644 --- a/chromeos/tpm/tpm_token_info_getter_unittest.cc +++ b/chromeos/tpm/tpm_token_info_getter_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> @@ -53,7 +55,7 @@ class FakeTaskRunner : public base::TaskRunner { public: // |delays|: Vector to which the dalays seen by the task runner are saved. - explicit FakeTaskRunner(std::vector<int64>* delays) : delays_(delays) {} + explicit FakeTaskRunner(std::vector<int64_t>* delays) : delays_(delays) {} // base::TaskRunner overrides: bool PostDelayedTask(const tracked_objects::Location& from_here, @@ -70,7 +72,7 @@ private: // The vector of delays. - std::vector<int64>* delays_; + std::vector<int64_t>* delays_; DISALLOW_COPY_AND_ASSIGN(FakeTaskRunner); }; @@ -246,7 +248,7 @@ scoped_ptr<TestCryptohomeClient> cryptohome_client_; scoped_ptr<chromeos::TPMTokenInfoGetter> tpm_token_info_getter_; - std::vector<int64> delays_; + std::vector<int64_t> delays_; private: base::MessageLoop message_loop_; @@ -273,7 +275,7 @@ scoped_ptr<chromeos::TPMTokenInfoGetter> tpm_token_info_getter_; std::string user_id_; - std::vector<int64> delays_; + std::vector<int64_t> delays_; private: base::MessageLoop message_loop_; @@ -296,7 +298,7 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - EXPECT_EQ(std::vector<int64>(), delays_); + EXPECT_EQ(std::vector<int64_t>(), delays_); } TEST_F(SystemTPMTokenInfoGetterTest, TokenSlotIdEqualsZero) { @@ -316,7 +318,7 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(0, reported_info.slot_id); - EXPECT_EQ(std::vector<int64>(), delays_); + EXPECT_EQ(std::vector<int64_t>(), delays_); } TEST_F(SystemTPMTokenInfoGetterTest, TPMNotEnabled) { @@ -330,7 +332,7 @@ EXPECT_FALSE(reported_info.IsReady()); EXPECT_FALSE(reported_info.enabled); - EXPECT_EQ(std::vector<int64>(), delays_); + EXPECT_EQ(std::vector<int64_t>(), delays_); } TEST_F(SystemTPMTokenInfoGetterTest, TpmEnabledCallFails) { @@ -350,9 +352,9 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - const int64 kExpectedDelays[] = {100}; - EXPECT_EQ(std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), + const int64_t kExpectedDelays[] = {100}; + EXPECT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), delays_); } @@ -373,9 +375,9 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - const int64 kExpectedDelays[] = {100}; - EXPECT_EQ(std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), + const int64_t kExpectedDelays[] = {100}; + EXPECT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), delays_); } @@ -396,9 +398,9 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - const int64 kExpectedDelays[] = {100}; - EXPECT_EQ(std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), + const int64_t kExpectedDelays[] = {100}; + EXPECT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), delays_); } @@ -421,11 +423,10 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(2, reported_info.slot_id); - int64 kExpectedDelays[] = { 100, 200, 400, 800, 1600, 3200 }; - ASSERT_EQ( - std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), - delays_); + int64_t kExpectedDelays[] = {100, 200, 400, 800, 1600, 3200}; + ASSERT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), + delays_); } TEST_F(SystemTPMTokenInfoGetterTest, RetryDelayBounded) { @@ -447,14 +448,12 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - int64 kExpectedDelays[] = { - 100, 200, 400, 800, 1600, 3200, 6400, 12800, 25600, 51200, 102400, 204800, - 300000, 300000, 300000 - }; - ASSERT_EQ( - std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), - delays_); + int64_t kExpectedDelays[] = {100, 200, 400, 800, 1600, + 3200, 6400, 12800, 25600, 51200, + 102400, 204800, 300000, 300000, 300000}; + ASSERT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), + delays_); } TEST_F(UserTPMTokenInfoGetterTest, BasicFlow) { @@ -472,7 +471,7 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - EXPECT_EQ(std::vector<int64>(), delays_); + EXPECT_EQ(std::vector<int64_t>(), delays_); } TEST_F(UserTPMTokenInfoGetterTest, GetTpmTokenInfoInitiallyFails) { @@ -492,9 +491,9 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - const int64 kExpectedDelays[] = {100}; - EXPECT_EQ(std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), + const int64_t kExpectedDelays[] = {100}; + EXPECT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), delays_); } @@ -515,9 +514,9 @@ EXPECT_EQ("2222", reported_info.pin); EXPECT_EQ(1, reported_info.slot_id); - const int64 kExpectedDelays[] = {100}; - EXPECT_EQ(std::vector<int64>(kExpectedDelays, - kExpectedDelays + arraysize(kExpectedDelays)), + const int64_t kExpectedDelays[] = {100}; + EXPECT_EQ(std::vector<int64_t>(kExpectedDelays, + kExpectedDelays + arraysize(kExpectedDelays)), delays_); }
diff --git a/chromeos/tpm/tpm_token_loader.h b/chromeos/tpm/tpm_token_loader.h index 6add4a6..84f98b8 100644 --- a/chromeos/tpm/tpm_token_loader.h +++ b/chromeos/tpm/tpm_token_loader.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/cloud_print/gcp20/prototype/cloud_print_request.cc b/cloud_print/gcp20/prototype/cloud_print_request.cc index 6eebcb5..455dbaf 100644 --- a/cloud_print/gcp20/prototype/cloud_print_request.cc +++ b/cloud_print/gcp20/prototype/cloud_print_request.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/cloud_print_request.h" +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" @@ -19,7 +21,7 @@ namespace { -const uint32 kDefaultTimeout = 20; // in seconds +const uint32_t kDefaultTimeout = 20; // in seconds } // namespace
diff --git a/cloud_print/gcp20/prototype/cloud_print_request.h b/cloud_print/gcp20/prototype/cloud_print_request.h index 5cd8357..749f5ae 100644 --- a/cloud_print/gcp20/prototype/cloud_print_request.h +++ b/cloud_print/gcp20/prototype/cloud_print_request.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h"
diff --git a/cloud_print/gcp20/prototype/cloud_print_requester.h b/cloud_print/gcp20/prototype/cloud_print_requester.h index ea7e8af8..6c543cc 100644 --- a/cloud_print/gcp20/prototype/cloud_print_requester.h +++ b/cloud_print/gcp20/prototype/cloud_print_requester.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "cloud_print/gcp20/prototype/cloud_print_request.h"
diff --git a/cloud_print/gcp20/prototype/cloud_print_response_parser.cc b/cloud_print/gcp20/prototype/cloud_print_response_parser.cc index c43ed39..acd8599 100644 --- a/cloud_print/gcp20/prototype/cloud_print_response_parser.cc +++ b/cloud_print/gcp20/prototype/cloud_print_response_parser.cc
@@ -4,6 +4,9 @@ #include "cloud_print/gcp20/prototype/cloud_print_response_parser.h" +#include <stddef.h> +#include <stdint.h> + #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" @@ -196,7 +199,7 @@ *error_description = "Cannot parse job info."; return false; } - int64 create_time_ms = 0; + int64_t create_time_ms = 0; if (!base::StringToInt64(create_time_str, &create_time_ms)) { *error_description = "Cannot convert time."; return false;
diff --git a/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h b/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h index 3be24996..44de4e7a 100644 --- a/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h +++ b/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h
@@ -5,7 +5,7 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_CLOUD_PRINT_URL_REQUEST_CONTEXT_GETTER_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_CLOUD_PRINT_URL_REQUEST_CONTEXT_GETTER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "net/url_request/url_request_context_getter.h"
diff --git a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.cc b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.cc index 6c7c235..4a02cae 100644 --- a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.cc +++ b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h"
diff --git a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h index 8c8ed9d0..ff5e9c7f 100644 --- a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h +++ b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/cloud_print/gcp20/prototype/command_line_reader.cc b/cloud_print/gcp20/prototype/command_line_reader.cc index 10988d2..777582207 100644 --- a/cloud_print/gcp20/prototype/command_line_reader.cc +++ b/cloud_print/gcp20/prototype/command_line_reader.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/command_line_reader.h" +#include <stdint.h> + #include <limits> #include "base/command_line.h"
diff --git a/cloud_print/gcp20/prototype/dns_packet_parser.cc b/cloud_print/gcp20/prototype/dns_packet_parser.cc index e52ba39..ef45e20 100644 --- a/cloud_print/gcp20/prototype/dns_packet_parser.cc +++ b/cloud_print/gcp20/prototype/dns_packet_parser.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/dns_packet_parser.h" +#include <stddef.h> + #include "base/big_endian.h" #include "base/logging.h"
diff --git a/cloud_print/gcp20/prototype/dns_packet_parser.h b/cloud_print/gcp20/prototype/dns_packet_parser.h index 88c6a03..38305c2 100644 --- a/cloud_print/gcp20/prototype/dns_packet_parser.h +++ b/cloud_print/gcp20/prototype/dns_packet_parser.h
@@ -5,8 +5,12 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_DNS_PACKET_PARSER_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_DNS_PACKET_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "net/dns/dns_protocol.h" #include "net/dns/dns_response.h" @@ -16,8 +20,8 @@ ~DnsQueryRecord() {} std::string qname; // in dotted form - uint16 qtype; - uint16 qclass; + uint16_t qtype; + uint16_t qclass; }; // Iterator to walk over records of the DNS response packet. Encapsulates
diff --git a/cloud_print/gcp20/prototype/dns_response_builder.cc b/cloud_print/gcp20/prototype/dns_response_builder.cc index c73689c9..5fe77c6 100644 --- a/cloud_print/gcp20/prototype/dns_response_builder.cc +++ b/cloud_print/gcp20/prototype/dns_response_builder.cc
@@ -4,6 +4,9 @@ #include "cloud_print/gcp20/prototype/dns_response_builder.h" +#include <stddef.h> +#include <stdint.h> + #include "base/big_endian.h" #include "base/logging.h" #include "net/base/io_buffer.h" @@ -13,7 +16,7 @@ namespace { -uint16 klass = net::dns_protocol::kClassIN; +uint16_t klass = net::dns_protocol::kClassIN; } // namespace @@ -23,7 +26,7 @@ DnsResponseRecord::~DnsResponseRecord() { } -DnsResponseBuilder::DnsResponseBuilder(uint16 id) { +DnsResponseBuilder::DnsResponseBuilder(uint16_t id) { header_.id = id; // TODO(maksymb): Check do we need AA flag enabled. header_.flags = net::dns_protocol::kFlagResponse | @@ -38,7 +41,7 @@ } void DnsResponseBuilder::AppendPtr(const std::string& service_type, - uint32 ttl, + uint32_t ttl, const std::string& service_name, bool answer) { std::string rdata; @@ -49,17 +52,17 @@ } void DnsResponseBuilder::AppendSrv(const std::string& service_name, - uint32 ttl, - uint16 priority, - uint16 weight, - uint16 http_port, + uint32_t ttl, + uint16_t priority, + uint16_t weight, + uint16_t http_port, const std::string& service_domain_name, bool answer) { std::string domain_name; bool success = net::DNSDomainFromDot(service_domain_name, &domain_name); DCHECK(success); - std::vector<uint8> rdata(2 + 2 + 2 + domain_name.size()); + std::vector<uint8_t> rdata(2 + 2 + 2 + domain_name.size()); base::BigEndianWriter writer(reinterpret_cast<char*>(rdata.data()), rdata.size()); @@ -75,7 +78,7 @@ } void DnsResponseBuilder::AppendA(const std::string& service_domain_name, - uint32 ttl, + uint32_t ttl, net::IPAddressNumber http_ipv4, bool answer) { // TODO(maksymb): IP to send must depends on interface from where query was @@ -89,7 +92,7 @@ } void DnsResponseBuilder::AppendAAAA(const std::string& service_domain_name, - uint32 ttl, + uint32_t ttl, net::IPAddressNumber http_ipv6, bool answer) { // TODO(maksymb): IP to send must depends on interface from where query was @@ -103,7 +106,7 @@ } void DnsResponseBuilder::AppendTxt(const std::string& service_name, - uint32 ttl, + uint32_t ttl, const std::vector<std::string>& metadata, bool answer) { std::string rdata; @@ -153,10 +156,9 @@ success = writer.WriteBytes(name_in_dns_format.data(), name_in_dns_format.size()) && - writer.WriteU16(iter->type) && - writer.WriteU16(iter->klass) && + writer.WriteU16(iter->type) && writer.WriteU16(iter->klass) && writer.WriteU32(iter->ttl) && - writer.WriteU16(static_cast<uint16>(iter->rdata.size())) && + writer.WriteU16(static_cast<uint16_t>(iter->rdata.size())) && writer.WriteBytes(iter->rdata.data(), iter->rdata.size()); DCHECK(success); } @@ -167,8 +169,8 @@ } void DnsResponseBuilder::AddResponse(const std::string& name, - uint16 type, - uint32 ttl, + uint16_t type, + uint32_t ttl, const std::string& rdata, bool answer) { DnsResponseRecord response;
diff --git a/cloud_print/gcp20/prototype/dns_response_builder.h b/cloud_print/gcp20/prototype/dns_response_builder.h index 2421fb0..9f4bae557 100644 --- a/cloud_print/gcp20/prototype/dns_response_builder.h +++ b/cloud_print/gcp20/prototype/dns_response_builder.h
@@ -5,10 +5,12 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_DNS_RESPONSE_BUILDER_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_DNS_RESPONSE_BUILDER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "net/base/io_buffer.h" #include "net/base/ip_address_number.h" @@ -24,9 +26,9 @@ ~DnsResponseRecord(); std::string name; // in dotted form - uint16 type; - uint16 klass; - uint32 ttl; + uint16_t type; + uint16_t klass; + uint32_t ttl; std::string rdata; }; @@ -34,36 +36,37 @@ class DnsResponseBuilder { public: // Initializes builder. - explicit DnsResponseBuilder(uint16 id); + explicit DnsResponseBuilder(uint16_t id); // Destroys the object. ~DnsResponseBuilder(); // Methods for appending different types of responses to packet. void AppendPtr(const std::string& service_type, - uint32 ttl, + uint32_t ttl, const std::string& service_name, bool answer); void AppendSrv(const std::string& service_name, - uint32 ttl, - uint16 priority, - uint16 weight, uint16 http_port, + uint32_t ttl, + uint16_t priority, + uint16_t weight, + uint16_t http_port, const std::string& service_domain_name, bool answer); void AppendA(const std::string& service_domain_name, - uint32 ttl, + uint32_t ttl, net::IPAddressNumber http_ipv4, bool answer); void AppendAAAA(const std::string& service_domain_name, - uint32 ttl, + uint32_t ttl, net::IPAddressNumber http_ipv6, bool answer); void AppendTxt(const std::string& service_name, - uint32 ttl, + uint32_t ttl, const std::vector<std::string>& metadata, bool answer); @@ -73,8 +76,8 @@ private: // Appends response to packet. void AddResponse(const std::string& name, - uint16 type, - uint32 ttl, + uint16_t type, + uint32_t ttl, const std::string& rdata, bool answer);
diff --git a/cloud_print/gcp20/prototype/dns_sd_server.cc b/cloud_print/gcp20/prototype/dns_sd_server.cc index a3ab0b75..1389778 100644 --- a/cloud_print/gcp20/prototype/dns_sd_server.cc +++ b/cloud_print/gcp20/prototype/dns_sd_server.cc
@@ -4,9 +4,9 @@ #include "cloud_print/gcp20/prototype/dns_sd_server.h" +#include <stdint.h> #include <string.h> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" @@ -21,13 +21,13 @@ namespace { const char kDefaultIpAddressMulticast[] = "224.0.0.251"; -const uint16 kDefaultPortMulticast = 5353; +const uint16_t kDefaultPortMulticast = 5353; const double kTimeToNextAnnouncement = 0.8; // relatively to TTL const int kDnsBufSize = 65537; -const uint16 kSrvPriority = 0; -const uint16 kSrvWeight = 0; +const uint16_t kSrvPriority = 0; +const uint16_t kSrvWeight = 0; void DoNothingAfterSendToSocket(int /*val*/) { NOTREACHED(); @@ -46,7 +46,8 @@ Shutdown(); } -bool DnsSdServer::Start(const ServiceParameters& serv_params, uint32 full_ttl, +bool DnsSdServer::Start(const ServiceParameters& serv_params, + uint32_t full_ttl, const std::vector<std::string>& metadata) { if (IsOnline()) return true; @@ -96,7 +97,7 @@ // TODO(maksymb): If less than 20% of full TTL left before next announcement // then send it now. - uint32 current_ttl = GetCurrentTLL(); + uint32_t current_ttl = GetCurrentTLL(); if (!base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kNoAnnouncement)) { DnsResponseBuilder builder(current_ttl); @@ -158,7 +159,7 @@ DnsResponseBuilder builder(parser.header().id); - uint32 current_ttl = GetCurrentTLL(); + uint32_t current_ttl = GetCurrentTLL(); DnsQueryRecord query; // TODO(maksymb): Check known answers. @@ -187,7 +188,8 @@ << (unicast_respond ? recv_address_ : multicast_address_).ToString(); } -void DnsSdServer::ProccessQuery(uint32 current_ttl, const DnsQueryRecord& query, +void DnsSdServer::ProccessQuery(uint32_t current_ttl, + const DnsQueryRecord& query, DnsResponseBuilder* builder) const { std::string log; bool responded = false; @@ -274,7 +276,7 @@ DoLoop(0); } -void DnsSdServer::SendAnnouncement(uint32 ttl) { +void DnsSdServer::SendAnnouncement(uint32_t ttl) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kNoAnnouncement)) { DnsResponseBuilder builder(ttl); @@ -307,14 +309,13 @@ // Schedule next announcement. base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::Bind(&DnsSdServer::Update, AsWeakPtr()), - base::TimeDelta::FromSeconds(static_cast<int64>( - kTimeToNextAnnouncement*full_ttl_))); + FROM_HERE, base::Bind(&DnsSdServer::Update, AsWeakPtr()), + base::TimeDelta::FromSeconds( + static_cast<int64_t>(kTimeToNextAnnouncement * full_ttl_))); } -uint32 DnsSdServer::GetCurrentTLL() const { - uint32 current_ttl = (time_until_live_ - base::Time::Now()).InSeconds(); +uint32_t DnsSdServer::GetCurrentTLL() const { + uint32_t current_ttl = (time_until_live_ - base::Time::Now()).InSeconds(); if (time_until_live_ < base::Time::Now() || current_ttl == 0) { // This should not be reachable. But still we don't need to fail. current_ttl = 1; // Service is still alive.
diff --git a/cloud_print/gcp20/prototype/dns_sd_server.h b/cloud_print/gcp20/prototype/dns_sd_server.h index dc8683f..c154c2c2 100644 --- a/cloud_print/gcp20/prototype/dns_sd_server.h +++ b/cloud_print/gcp20/prototype/dns_sd_server.h
@@ -5,10 +5,12 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_DNS_SD_SERVER_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_DNS_SD_SERVER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "cloud_print/gcp20/prototype/service_parameters.h" @@ -38,7 +40,7 @@ // Starts the server. Returns |true| if server works. Also sends // announcement. bool Start(const ServiceParameters& serv_params, - uint32 full_ttl, + uint32_t full_ttl, const std::vector<std::string>& metadata) WARN_UNUSED_RESULT; // Sends announcement if server works. @@ -58,7 +60,7 @@ bool CreateSocket(); // Processes single query. - void ProccessQuery(uint32 current_ttl, + void ProccessQuery(uint32_t current_ttl, const DnsQueryRecord& query, DnsResponseBuilder* builder) const; @@ -72,11 +74,11 @@ void OnDatagramReceived(); // Sends announcement. - void SendAnnouncement(uint32 ttl); + void SendAnnouncement(uint32_t ttl); // Calculates and returns current TTL (with accordance to last send // announcement time. - uint32 GetCurrentTLL() const; + uint32_t GetCurrentTLL() const; // Stores socket to multicast address. scoped_ptr<net::UDPServerSocket> socket_; @@ -100,7 +102,7 @@ std::vector<std::string> metadata_; // TTL for announcements - uint32 full_ttl_; + uint32_t full_ttl_; DISALLOW_COPY_AND_ASSIGN(DnsSdServer); };
diff --git a/cloud_print/gcp20/prototype/gcp20_switches.cc b/cloud_print/gcp20/prototype/gcp20_switches.cc index dfb425c9..85bb8dd 100644 --- a/cloud_print/gcp20/prototype/gcp20_switches.cc +++ b/cloud_print/gcp20/prototype/gcp20_switches.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/gcp20_switches.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/path_service.h"
diff --git a/cloud_print/gcp20/prototype/print_job_handler.cc b/cloud_print/gcp20/prototype/print_job_handler.cc index d76114bf..7a4d4cdf 100644 --- a/cloud_print/gcp20/prototype/print_job_handler.cc +++ b/cloud_print/gcp20/prototype/print_job_handler.cc
@@ -4,6 +4,8 @@ #include "cloud_print/gcp20/prototype/print_job_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h"
diff --git a/cloud_print/gcp20/prototype/print_job_handler.h b/cloud_print/gcp20/prototype/print_job_handler.h index 1156803..a0a2abfc 100644 --- a/cloud_print/gcp20/prototype/print_job_handler.h +++ b/cloud_print/gcp20/prototype/print_job_handler.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/cloud_print/gcp20/prototype/printer.cc b/cloud_print/gcp20/prototype/printer.cc index fe01e59..4b91f165 100644 --- a/cloud_print/gcp20/prototype/printer.cc +++ b/cloud_print/gcp20/prototype/printer.cc
@@ -5,6 +5,8 @@ #include "cloud_print/gcp20/prototype/printer.h" #include <limits.h> +#include <stddef.h> +#include <stdint.h> #include <stdio.h> #include <algorithm> #include <string> @@ -34,8 +36,8 @@ namespace { -const uint16 kHttpPortDefault = 10101; -const uint32 kTtlDefault = 60*60; // in seconds +const uint16_t kHttpPortDefault = 10101; +const uint32_t kTtlDefault = 60 * 60; // in seconds const char kServiceType[] = "_privet._tcp.local"; const char kSecondaryServiceType[] = "_printer._sub._privet._tcp.local"; @@ -681,8 +683,8 @@ using base::Time; using base::TimeDelta; state_.access_token = access_token; - int64 time_to_update = static_cast<int64>(expires_in_seconds * - kTimeToNextAccessTokenUpdate); + int64_t time_to_update = + static_cast<int64_t>(expires_in_seconds * kTimeToNextAccessTokenUpdate); state_.access_token_update = Time::Now() + TimeDelta::FromSeconds(time_to_update); VLOG(0) << "Current access_token: " << access_token; @@ -852,7 +854,7 @@ return false; } - uint16 port = command_line_reader::ReadHttpPort(kHttpPortDefault); + uint16_t port = command_line_reader::ReadHttpPort(kHttpPortDefault); VLOG_IF(0, !ipv4.empty()) << "Local IPv4 address: " << net::IPAddressToStringWithPort(ipv4, port);
diff --git a/cloud_print/gcp20/prototype/printer.h b/cloud_print/gcp20/prototype/printer.h index 26e6832..bfcb16e 100644 --- a/cloud_print/gcp20/prototype/printer.h +++ b/cloud_print/gcp20/prototype/printer.h
@@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "cloud_print/gcp20/prototype/cloud_print_requester.h" #include "cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h"
diff --git a/cloud_print/gcp20/prototype/printer_unittest.cc b/cloud_print/gcp20/prototype/printer_unittest.cc index 5c0acac..1f189f6 100644 --- a/cloud_print/gcp20/prototype/printer_unittest.cc +++ b/cloud_print/gcp20/prototype/printer_unittest.cc
@@ -4,7 +4,6 @@ #include "cloud_print/gcp20/prototype/printer.h" -#include "base/basictypes.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/values.h"
diff --git a/cloud_print/gcp20/prototype/privet_http_server.cc b/cloud_print/gcp20/prototype/privet_http_server.cc index 90b45a8..52716f2 100644 --- a/cloud_print/gcp20/prototype/privet_http_server.cc +++ b/cloud_print/gcp20/prototype/privet_http_server.cc
@@ -4,6 +4,9 @@ #include "cloud_print/gcp20/prototype/privet_http_server.h" +#include <stddef.h> +#include <stdint.h> + #include "base/command_line.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" @@ -102,7 +105,7 @@ Shutdown(); } -bool PrivetHttpServer::Start(uint16 port) { +bool PrivetHttpServer::Start(uint16_t port) { if (server_) return true; @@ -370,7 +373,7 @@ response->SetString("job_type", job.content_type); response->SetString( "job_size", - base::StringPrintf("%u", static_cast<uint32>(job.content.size()))); + base::StringPrintf("%u", static_cast<uint32_t>(job.content.size()))); if (job_name_present) response->SetString("job_name", job.job_name); return response.Pass();
diff --git a/cloud_print/gcp20/prototype/privet_http_server.h b/cloud_print/gcp20/prototype/privet_http_server.h index 18320e3..f5c815a0 100644 --- a/cloud_print/gcp20/prototype/privet_http_server.h +++ b/cloud_print/gcp20/prototype/privet_http_server.h
@@ -5,10 +5,12 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_PRIVET_HTTP_SERVER_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_PRIVET_HTTP_SERVER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/values.h" #include "cloud_print/gcp20/prototype/local_print_job.h" #include "net/server/http_server.h" @@ -134,7 +136,7 @@ ~PrivetHttpServer() override; // Starts HTTP server: start listening port |port| for HTTP requests. - bool Start(uint16 port); + bool Start(uint16_t port); // Stops HTTP server. void Shutdown(); @@ -201,7 +203,7 @@ // Port for listening. - uint16 port_; + uint16_t port_; // Contains encapsulated object for listening for requests. scoped_ptr<net::HttpServer> server_;
diff --git a/cloud_print/gcp20/prototype/service_parameters.cc b/cloud_print/gcp20/prototype/service_parameters.cc index c15be13c..ac663f28 100644 --- a/cloud_print/gcp20/prototype/service_parameters.cc +++ b/cloud_print/gcp20/prototype/service_parameters.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "cloud_print/gcp20/prototype/service_parameters.h" ServiceParameters::ServiceParameters() : http_port_(0) { @@ -16,12 +18,11 @@ const std::string& service_domain_name, const net::IPAddressNumber& http_ipv4, const net::IPAddressNumber& http_ipv6, - uint16 http_port) + uint16_t http_port) : service_type_(service_type), secondary_service_type_(secondary_service_type), service_name_(service_name_prefix + "." + service_type), service_domain_name_(service_domain_name), http_ipv4_(http_ipv4), http_ipv6_(http_ipv6), - http_port_(http_port) { -} + http_port_(http_port) {}
diff --git a/cloud_print/gcp20/prototype/service_parameters.h b/cloud_print/gcp20/prototype/service_parameters.h index ced8846..b1d1d8f 100644 --- a/cloud_print/gcp20/prototype/service_parameters.h +++ b/cloud_print/gcp20/prototype/service_parameters.h
@@ -5,6 +5,8 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_SERVICE_PARAMETERS_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_SERVICE_PARAMETERS_H_ +#include <stdint.h> + #include <string> #include "net/base/ip_address_number.h" @@ -21,7 +23,7 @@ const std::string& service_domain_name, const net::IPAddressNumber& http_ipv4, const net::IPAddressNumber& http_ipv6, - uint16 http_port); + uint16_t http_port); std::string service_type_; std::string secondary_service_type_; @@ -29,7 +31,7 @@ std::string service_domain_name_; net::IPAddressNumber http_ipv4_; net::IPAddressNumber http_ipv6_; - uint16 http_port_; + uint16_t http_port_; }; #endif // CLOUD_PRINT_GCP20_PROTOTYPE_SERVICE_PARAMETERS_H_
diff --git a/cloud_print/gcp20/prototype/x_privet_token.cc b/cloud_print/gcp20/prototype/x_privet_token.cc index 4093ccb..d14d9a69 100644 --- a/cloud_print/gcp20/prototype/x_privet_token.cc +++ b/cloud_print/gcp20/prototype/x_privet_token.cc
@@ -4,6 +4,9 @@ #include "cloud_print/gcp20/prototype/x_privet_token.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/format_macros.h" #include "base/guid.h" @@ -15,8 +18,8 @@ namespace { const char kXPrivetTokenDelimeter = ':'; -const uint64 kTimeExpiration = 24*60*60; // in seconds -const uint64 kTimeSecretRefresh = 24*60*60; // in seconds +const uint64_t kTimeExpiration = 24 * 60 * 60; // in seconds +const uint64_t kTimeSecretRefresh = 24 * 60 * 60; // in seconds } // namespace @@ -37,7 +40,7 @@ if (Time::Now() > last_gen_time_ + TimeDelta::FromSeconds(kTimeSecretRefresh)) UpdateSecret(); - return GenerateXTokenWithTime(static_cast<uint64>(Time::Now().ToTimeT())); + return GenerateXTokenWithTime(static_cast<uint64_t>(Time::Now().ToTimeT())); } bool XPrivetToken::CheckValidXToken(const std::string& token) const { @@ -46,7 +49,7 @@ return false; std::string issue_time_str = token.substr(delimeter_pos + 1); - uint64 issue_time; + uint64_t issue_time; if (!base::StringToUint64(issue_time_str, &issue_time)) return false; @@ -57,7 +60,7 @@ TimeDelta::FromSeconds(kTimeExpiration); } -std::string XPrivetToken::GenerateXTokenWithTime(uint64 issue_time) const { +std::string XPrivetToken::GenerateXTokenWithTime(uint64_t issue_time) const { std::string result; std::string issue_time_str = base::StringPrintf("%" PRIu64, issue_time); std::string hash = base::SHA1HashString(secret_ +
diff --git a/cloud_print/gcp20/prototype/x_privet_token.h b/cloud_print/gcp20/prototype/x_privet_token.h index 58c90f8..af0341f9 100644 --- a/cloud_print/gcp20/prototype/x_privet_token.h +++ b/cloud_print/gcp20/prototype/x_privet_token.h
@@ -5,9 +5,10 @@ #ifndef CLOUD_PRINT_GCP20_PROTOTYPE_X_PRIVET_TOKEN_H_ #define CLOUD_PRINT_GCP20_PROTOTYPE_X_PRIVET_TOKEN_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/time/time.h" @@ -36,7 +37,7 @@ XPrivetToken(const std::string& secret, const base::Time& gen_time); // Generates X-Privet-Token for with certain time of issue. - std::string GenerateXTokenWithTime(uint64 issue_time) const; + std::string GenerateXTokenWithTime(uint64_t issue_time) const; // Creates new XPrivetToken secret. void UpdateSecret();
diff --git a/cloud_print/gcp20/prototype/x_privet_token_unittest.cc b/cloud_print/gcp20/prototype/x_privet_token_unittest.cc index 38d783b..0cf17c6b 100644 --- a/cloud_print/gcp20/prototype/x_privet_token_unittest.cc +++ b/cloud_print/gcp20/prototype/x_privet_token_unittest.cc
@@ -4,10 +4,10 @@ #include "cloud_print/gcp20/prototype/x_privet_token.h" +#include <stdint.h> #include <stdio.h> #include "base/base64.h" -#include "base/basictypes.h" #include "base/format_macros.h" #include "base/logging.h" #include "base/sha1.h" @@ -18,8 +18,8 @@ TEST(XPrivetTokenTest, Generation) { std::string secret = "E3E92296-E290-4E77-B678-6AEF256C30C8"; - uint64 gen_time = 1372444784; - uint64 issue_time = gen_time; + uint64_t gen_time = 1372444784; + uint64_t issue_time = gen_time; XPrivetToken xtoken(secret, base::Time::FromTimeT(gen_time));
diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 471b9390..33d771d 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc
@@ -4,6 +4,8 @@ #include "cloud_print/service/service_state.h" +#include <stdint.h> + #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" @@ -35,7 +37,7 @@ const char kClientLoginUrl[] = "https://www.google.com/accounts/ClientLogin"; -const int64 kRequestTimeoutMs = 10 * 1000; +const int64_t kRequestTimeoutMs = 10 * 1000; class ServiceStateURLRequestDelegate : public net::URLRequest::Delegate { public:
diff --git a/cloud_print/service/service_state.h b/cloud_print/service/service_state.h index 2c051f6..d3e41ee1 100644 --- a/cloud_print/service/service_state.h +++ b/cloud_print/service/service_state.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h"
diff --git a/cloud_print/service/service_state_unittest.cc b/cloud_print/service/service_state_unittest.cc index b0f0029..d168e8c 100644 --- a/cloud_print/service/service_state_unittest.cc +++ b/cloud_print/service/service_state_unittest.cc
@@ -4,6 +4,7 @@ #include "cloud_print/service/service_state.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index c6acb22..8966a200 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc
@@ -4,6 +4,8 @@ #include "cloud_print/service/win/chrome_launcher.h" +#include <stddef.h> + #include "base/base_switches.h" #include "base/command_line.h" #include "base/files/file_util.h"
diff --git a/cloud_print/service/win/chrome_launcher.h b/cloud_print/service/win/chrome_launcher.h index 189bbc7..b7635df 100644 --- a/cloud_print/service/win/chrome_launcher.h +++ b/cloud_print/service/win/chrome_launcher.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/simple_thread.h"
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index 8c5a4a0..6aa7f92 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc
@@ -9,6 +9,7 @@ #include <atlbase.h> #pragma warning(pop) #include <security.h> +#include <stddef.h> #include <iomanip> #include <iostream>
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index 76e9863..c65638af 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc
@@ -4,6 +4,8 @@ #include <atlbase.h> #include <atlapp.h> // NOLINT +#include <stddef.h> +#include <stdint.h> #include "base/at_exit.h" #include "base/bind.h"
diff --git a/cloud_print/service/win/local_security_policy.cc b/cloud_print/service/win/local_security_policy.cc index e9830b3..8718dd0 100644 --- a/cloud_print/service/win/local_security_policy.cc +++ b/cloud_print/service/win/local_security_policy.cc
@@ -7,8 +7,10 @@ #include <atlsecurity.h> #include <ntsecapi.h> #include <windows.h> +#include <stddef.h> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" const wchar_t kSeServiceLogonRight[] = L"SeServiceLogonRight";
diff --git a/cloud_print/service/win/local_security_policy.h b/cloud_print/service/win/local_security_policy.h index a0c58a00..7dbdb75 100644 --- a/cloud_print/service/win/local_security_policy.h +++ b/cloud_print/service/win/local_security_policy.h
@@ -8,7 +8,7 @@ #include <wtypes.h> // Has to be before ntsecapi.h #include <ntsecapi.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" extern const wchar_t kSeServiceLogonRight[];
diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc index 97757526..2af87ec 100644 --- a/cloud_print/service/win/service_controller.cc +++ b/cloud_print/service/win/service_controller.cc
@@ -7,11 +7,13 @@ #include <atlbase.h> #include <atlcom.h> #include <atlctl.h> +#include <stdint.h> #include "base/base_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/win/scoped_handle.h" #include "chrome/common/chrome_switches.h" @@ -297,7 +299,7 @@ if (!config_size) return; - std::vector<uint8> buffer(config_size, 0); + std::vector<uint8_t> buffer(config_size, 0); QUERY_SERVICE_CONFIG* config = reinterpret_cast<QUERY_SERVICE_CONFIG*>(&buffer[0]); if (!::QueryServiceConfig(service.Get(), config,
diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc index 31173c7..faf9ca3 100644 --- a/cloud_print/service/win/service_listener.cc +++ b/cloud_print/service/win/service_listener.cc
@@ -4,6 +4,9 @@ #include "cloud_print/service/win/service_listener.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -75,7 +78,7 @@ return true; } -void ServiceListener::OnChannelConnected(int32 peer_pid) { +void ServiceListener::OnChannelConnected(int32_t peer_pid) { IPC::Message* message = new IPC::Message(0, 0, IPC::Message::PRIORITY_NORMAL); message->WriteString(GetEnvironment(user_data_dir_)); channel_->Send(message);
diff --git a/cloud_print/service/win/service_listener.h b/cloud_print/service/win/service_listener.h index 7344edd7..15cf06f 100644 --- a/cloud_print/service/win/service_listener.h +++ b/cloud_print/service/win/service_listener.h
@@ -5,6 +5,8 @@ #ifndef CLOUD_PRINT_SERVICE_SERVICE_LISTENER_H_ #define CLOUD_PRINT_SERVICE_SERVICE_LISTENER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" @@ -26,7 +28,7 @@ ~ServiceListener() override; bool OnMessageReceived(const IPC::Message& msg) override; - void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32_t peer_pid) override; private: void Disconnect();
diff --git a/cloud_print/service/win/setup_listener.cc b/cloud_print/service/win/setup_listener.cc index c4ffc79d..549cad55 100644 --- a/cloud_print/service/win/setup_listener.cc +++ b/cloud_print/service/win/setup_listener.cc
@@ -6,6 +6,7 @@ #include <atlbase.h> #include <atlsecurity.h> +#include <stddef.h> #include "base/bind.h" #include "base/guid.h"
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index c7fc3a5..afb5954 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -5,6 +5,8 @@ #include <windows.h> #include <setupapi.h> // Must be included after windows.h #include <winspool.h> +#include <stddef.h> + #include <iomanip> #include "base/at_exit.h"
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index e52e3325d..e9cb31f3 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -8,6 +8,8 @@ #include <lmcons.h> #include <shellapi.h> #include <shlobj.h> +#include <stddef.h> +#include <stdint.h> #include <strsafe.h> #include <userenv.h> #include <winspool.h> @@ -574,7 +576,7 @@ base::CloseFile(port_data->file); port_data->file = NULL; bool delete_file = true; - int64 file_size = 0; + int64_t file_size = 0; base::GetFileSize(port_data->file_path, &file_size); if (file_size > 0) { base::string16 job_title;
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index 5df48a0..ef60468 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc
@@ -4,9 +4,11 @@ #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" +#include <stddef.h> #include <winspool.h> #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string16.h" #include "base/win/registry.h"
diff --git a/cloud_print/virtual_driver/win/virtual_driver_consts.cc b/cloud_print/virtual_driver/win/virtual_driver_consts.cc index 5ce4fc13..eb64a9c 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_consts.cc +++ b/cloud_print/virtual_driver/win/virtual_driver_consts.cc
@@ -3,7 +3,10 @@ // found in the LICENSE file. #include "cloud_print/virtual_driver/win/virtual_driver_consts.h" + #include <windows.h> +#include <stddef.h> + #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h" namespace cloud_print {
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 8b73778..2e5ad394 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -208,8 +208,7 @@ scoped_ptr<net::test_server::HttpResponse> VerifyServiceWorkerHeaderInRequest( const net::test_server::HttpRequest& request) { EXPECT_EQ(request.relative_url, "/service_worker/generated_sw.js"); - std::map<std::string, std::string>::const_iterator it = - request.headers.find("Service-Worker"); + auto it = request.headers.find("Service-Worker"); EXPECT_TRUE(it != request.headers.end()); EXPECT_EQ("script", it->second);
diff --git a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc index f17dc629..a6a50930 100644 --- a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc +++ b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
@@ -2443,8 +2443,11 @@ DCHECK_NE(output_record.picture_id, -1); output_record.at_client = true; + // TODO(posciak): Use visible size from decoder here instead + // (crbug.com/402760). Passing (0, 0) results in the client using the + // visible size extracted from the container instead. media::Picture picture(output_record.picture_id, dec_surface->bitstream_id(), - gfx::Rect(visible_size_), false); + gfx::Rect(0, 0), false); DVLOGF(3) << dec_surface->ToString() << ", bitstream_id: " << picture.bitstream_buffer_id() << ", picture_id: " << picture.picture_buffer_id();
diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc index bb47a1a..bc5038e 100644 --- a/extensions/browser/api/web_request/web_request_api_helpers.cc +++ b/extensions/browser/api/web_request/web_request_api_helpers.cc
@@ -653,7 +653,8 @@ net::HttpRequestHeaders::Iterator modification( (*delta)->modified_request_headers); while (modification.GetNext()) { - if (key == modification.name() && value == modification.value()) + if (base::EqualsCaseInsensitiveASCII(key, modification.name()) && + value == modification.value()) return (*delta)->extension_id; } } @@ -671,7 +672,7 @@ for (i = (*delta)->deleted_request_headers.begin(); i != (*delta)->deleted_request_headers.end(); ++i) { - if (*i == key) + if (base::EqualsCaseInsensitiveASCII(*i, key)) return (*delta)->extension_id; } }
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index 312545a..ecdb15a9 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc
@@ -61,8 +61,7 @@ base::CompareCase::SENSITIVE)) return scoped_ptr<net::test_server::HttpResponse>(); - std::map<std::string, std::string>::const_iterator it = - request.headers.find("User-Agent"); + auto it = request.headers.find("User-Agent"); EXPECT_TRUE(it != request.headers.end()); if (!base::StartsWith("foobar", it->second, base::CompareCase::SENSITIVE)) return scoped_ptr<net::test_server::HttpResponse>();
diff --git a/extensions/test/data/web_view/apitest/main.js b/extensions/test/data/web_view/apitest/main.js index 38aa6b1..983212c 100644 --- a/extensions/test/data/web_view/apitest/main.js +++ b/extensions/test/data/web_view/apitest/main.js
@@ -1594,7 +1594,7 @@ webview.request.onBeforeSendHeaders.addListener(function(details) { var headers = details.requestHeaders; for( var i = 0, l = headers.length; i < l; ++i ) { - if (headers[i].name == 'User-Agent') { + if (headers[i].name.toLowerCase() == 'user-agent') { headers[i].value = 'foobar'; break; }
diff --git a/gin/arguments.h b/gin/arguments.h index b8d1296..55f9f44 100644 --- a/gin/arguments.h +++ b/gin/arguments.h
@@ -5,7 +5,6 @@ #ifndef GIN_ARGUMENTS_H_ #define GIN_ARGUMENTS_H_ -#include "base/basictypes.h" #include "gin/converter.h" #include "gin/gin_export.h"
diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc index 9aad42e3..d40e8981 100644 --- a/gin/array_buffer.cc +++ b/gin/array_buffer.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdlib.h> #include "base/logging.h"
diff --git a/gin/array_buffer.h b/gin/array_buffer.h index 4451540..2aef366a 100644 --- a/gin/array_buffer.h +++ b/gin/array_buffer.h
@@ -5,8 +5,11 @@ #ifndef GIN_ARRAY_BUFFER_H_ #define GIN_ARRAY_BUFFER_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "gin/converter.h" #include "gin/gin_export.h"
diff --git a/gin/converter.cc b/gin/converter.cc index 9a3462d..42fcd59ad 100644 --- a/gin/converter.cc +++ b/gin/converter.cc
@@ -4,6 +4,8 @@ #include "gin/converter.h" +#include <stdint.h> + #include "v8/include/v8.h" using v8::ArrayBuffer;
diff --git a/gin/converter.h b/gin/converter.h index 12348e2..c15f87dc 100644 --- a/gin/converter.h +++ b/gin/converter.h
@@ -5,6 +5,8 @@ #ifndef GIN_CONVERTER_H_ #define GIN_CONVERTER_H_ +#include <stdint.h> + #include <string> #include <vector>
diff --git a/gin/converter_unittest.cc b/gin/converter_unittest.cc index 099895a..ec543c2 100644 --- a/gin/converter_unittest.cc +++ b/gin/converter_unittest.cc
@@ -5,8 +5,9 @@ #include "gin/converter.h" #include <limits.h> +#include <stddef.h> +#include <stdint.h> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "gin/public/isolate_holder.h"
diff --git a/gin/function_template.h b/gin/function_template.h index 15ea8fef..c0228cb 100644 --- a/gin/function_template.h +++ b/gin/function_template.h
@@ -5,8 +5,11 @@ #ifndef GIN_FUNCTION_TEMPLATE_H_ #define GIN_FUNCTION_TEMPLATE_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "gin/arguments.h" #include "gin/converter.h" #include "gin/gin_export.h"
diff --git a/gin/interceptor.cc b/gin/interceptor.cc index 617fd08..6b7b812 100644 --- a/gin/interceptor.cc +++ b/gin/interceptor.cc
@@ -4,6 +4,8 @@ #include "gin/interceptor.h" +#include <stdint.h> + #include <map> #include "gin/per_isolate_data.h"
diff --git a/gin/interceptor.h b/gin/interceptor.h index 43cb346..bd265fb 100644 --- a/gin/interceptor.h +++ b/gin/interceptor.h
@@ -5,10 +5,12 @@ #ifndef GIN_INTERCEPTOR_H_ #define GIN_INTERCEPTOR_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/gin_export.h" #include "v8/include/v8.h"
diff --git a/gin/interceptor_unittest.cc b/gin/interceptor_unittest.cc index 02fb10d2..59e75cf 100644 --- a/gin/interceptor_unittest.cc +++ b/gin/interceptor_unittest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "gin/arguments.h" #include "gin/handle.h" #include "gin/interceptor.h"
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc index 59d6f06..45f689a 100644 --- a/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc
@@ -4,6 +4,7 @@ #include "gin/public/isolate_holder.h" +#include <stddef.h> #include <stdlib.h> #include <string.h>
diff --git a/gin/modules/file_module_provider.cc b/gin/modules/file_module_provider.cc index 1568378e..a25686d 100644 --- a/gin/modules/file_module_provider.cc +++ b/gin/modules/file_module_provider.cc
@@ -4,6 +4,8 @@ #include "gin/modules/file_module_provider.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/message_loop/message_loop.h"
diff --git a/gin/modules/file_module_provider.h b/gin/modules/file_module_provider.h index dd75a0fe..7c03887 100644 --- a/gin/modules/file_module_provider.h +++ b/gin/modules/file_module_provider.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "gin/gin_export.h" #include "gin/runner.h"
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc index b75894cf..10d5464 100644 --- a/gin/modules/module_registry.cc +++ b/gin/modules/module_registry.cc
@@ -4,6 +4,9 @@ #include "gin/modules/module_registry.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector>
diff --git a/gin/modules/module_registry.h b/gin/modules/module_registry.h index a2e0d0b..0f67137a 100644 --- a/gin/modules/module_registry.h +++ b/gin/modules/module_registry.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h"
diff --git a/gin/modules/module_registry_unittest.cc b/gin/modules/module_registry_unittest.cc index 00c6a94..e337c2d 100644 --- a/gin/modules/module_registry_unittest.cc +++ b/gin/modules/module_registry_unittest.cc
@@ -4,7 +4,10 @@ #include "gin/modules/module_registry.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "gin/modules/module_registry_observer.h" #include "gin/modules/module_runner_delegate.h" #include "gin/public/context_holder.h"
diff --git a/gin/modules/module_runner_delegate.h b/gin/modules/module_runner_delegate.h index 002db1c..f49594c 100644 --- a/gin/modules/module_runner_delegate.h +++ b/gin/modules/module_runner_delegate.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "gin/gin_export.h" #include "gin/modules/file_module_provider.h" #include "gin/shell_runner.h"
diff --git a/gin/modules/timer.h b/gin/modules/timer.h index c4f8091..1b7f613 100644 --- a/gin/modules/timer.h +++ b/gin/modules/timer.h
@@ -5,6 +5,7 @@ #ifndef GIN_MODULES_TIMER_H_ #define GIN_MODULES_TIMER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "gin/gin_export.h"
diff --git a/gin/object_template_builder.cc b/gin/object_template_builder.cc index 28c9791..158131f2 100644 --- a/gin/object_template_builder.cc +++ b/gin/object_template_builder.cc
@@ -4,6 +4,8 @@ #include "gin/object_template_builder.h" +#include <stdint.h> + #include "gin/interceptor.h" #include "gin/per_isolate_data.h" #include "gin/public/wrapper_info.h"
diff --git a/gin/per_context_data.h b/gin/per_context_data.h index 976ef51..3931429 100644 --- a/gin/per_context_data.h +++ b/gin/per_context_data.h
@@ -5,7 +5,7 @@ #ifndef GIN_PER_CONTEXT_DATA_H_ #define GIN_PER_CONTEXT_DATA_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/supports_user_data.h" #include "gin/gin_export.h" #include "v8/include/v8.h"
diff --git a/gin/per_isolate_data.h b/gin/per_isolate_data.h index ef44f31..a1ef474 100644 --- a/gin/per_isolate_data.h +++ b/gin/per_isolate_data.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "gin/gin_export.h"
diff --git a/gin/public/context_holder.h b/gin/public/context_holder.h index 835bffa..176af17 100644 --- a/gin/public/context_holder.h +++ b/gin/public/context_holder.h
@@ -7,7 +7,7 @@ #include <list> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gin/gin_export.h" #include "v8/include/v8.h"
diff --git a/gin/public/debug.h b/gin/public/debug.h index 0c24109..14e3017 100644 --- a/gin/public/debug.h +++ b/gin/public/debug.h
@@ -5,6 +5,8 @@ #ifndef GIN_PUBLIC_DEBUG_H_ #define GIN_PUBLIC_DEBUG_H_ +#include <stddef.h> + #include "build/build_config.h" #include "gin/gin_export.h" #include "v8/include/v8.h"
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h index 6ce302b..cb51c2f 100644 --- a/gin/public/isolate_holder.h +++ b/gin/public/isolate_holder.h
@@ -5,7 +5,7 @@ #ifndef GIN_PUBLIC_ISOLATE_HOLDER_H_ #define GIN_PUBLIC_ISOLATE_HOLDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gin/gin_export.h" #include "gin/public/v8_idle_task_runner.h"
diff --git a/gin/public/v8_idle_task_runner.h b/gin/public/v8_idle_task_runner.h index f0662d1..a294166 100644 --- a/gin/public/v8_idle_task_runner.h +++ b/gin/public/v8_idle_task_runner.h
@@ -5,7 +5,6 @@ #ifndef GIN_PUBLIC_V8_IDLE_TASK_RUNNER_H_ #define GIN_PUBLIC_V8_IDLE_TASK_RUNNER_H_ -#include "base/basictypes.h" #include "v8/include/v8-platform.h" namespace gin {
diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h index d66c1fb..3fe34850 100644 --- a/gin/public/v8_platform.h +++ b/gin/public/v8_platform.h
@@ -5,9 +5,9 @@ #ifndef GIN_PUBLIC_V8_PLATFORM_H_ #define GIN_PUBLIC_V8_PLATFORM_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "gin/gin_export.h" #include "v8/include/v8-platform.h"
diff --git a/gin/runner.h b/gin/runner.h index 3199569..a898b03 100644 --- a/gin/runner.h +++ b/gin/runner.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "gin/gin_export.h" #include "gin/public/context_holder.h"
diff --git a/gin/shell/gin_main.cc b/gin/shell/gin_main.cc index 299a69c3..1fff9f5 100644 --- a/gin/shell/gin_main.cc +++ b/gin/shell/gin_main.cc
@@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/i18n/icu_util.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "gin/array_buffer.h" #include "gin/modules/console.h"
diff --git a/gin/shell_runner.h b/gin/shell_runner.h index e150feac..2d1cc490 100644 --- a/gin/shell_runner.h +++ b/gin/shell_runner.h
@@ -5,6 +5,7 @@ #ifndef GIN_SHELL_RUNNER_H_ #define GIN_SHELL_RUNNER_H_ +#include "base/macros.h" #include "gin/runner.h" namespace gin {
diff --git a/gin/test/file_runner.h b/gin/test/file_runner.h index 9f7ab4b0..b20859a 100644 --- a/gin/test/file_runner.h +++ b/gin/test/file_runner.h
@@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "gin/modules/module_runner_delegate.h" #include "gin/runner.h"
diff --git a/gin/test/v8_test.h b/gin/test/v8_test.h index 592b889..3cb68d5 100644 --- a/gin/test/v8_test.h +++ b/gin/test/v8_test.h
@@ -5,8 +5,8 @@ #ifndef GIN_TEST_V8_TEST_H_ #define GIN_TEST_V8_TEST_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/gin/try_catch.h b/gin/try_catch.h index 84b2ae1..a1daaf1c 100644 --- a/gin/try_catch.h +++ b/gin/try_catch.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/gin_export.h" #include "v8/include/v8.h"
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc index 5440b96..cfb3630e 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc
@@ -4,7 +4,9 @@ #include "gin/v8_initializer.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/debug/alias.h" #include "base/files/file.h" #include "base/files/file_path.h" @@ -286,8 +288,8 @@ // static void V8Initializer::LoadV8SnapshotFromFD(base::PlatformFile snapshot_pf, - int64 snapshot_offset, - int64 snapshot_size) { + int64_t snapshot_offset, + int64_t snapshot_size) { if (g_mapped_snapshot) return; @@ -318,8 +320,8 @@ // static void V8Initializer::LoadV8NativesFromFD(base::PlatformFile natives_pf, - int64 natives_offset, - int64 natives_size) { + int64_t natives_offset, + int64_t natives_size) { if (g_mapped_natives) return;
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h index fcf2d2a8..dcb5329 100644 --- a/gin/v8_initializer.h +++ b/gin/v8_initializer.h
@@ -5,6 +5,8 @@ #ifndef GIN_V8_INITIALIZER_H_ #define GIN_V8_INITIALIZER_H_ +#include <stdint.h> + #include "base/files/file.h" #include "base/files/memory_mapped_file.h" #include "gin/array_buffer.h" @@ -36,14 +38,14 @@ // of the files to be loaded. Since the VM can boot with or without // the snapshot, this function does not return a status. static void LoadV8SnapshotFromFD(base::PlatformFile snapshot_fd, - int64 snapshot_offset, - int64 snapshot_size); + int64_t snapshot_offset, + int64_t snapshot_size); // Similar to LoadV8SnapshotFromFD, but for the source of the natives. // Without the natives we cannot continue, so this function contains // release mode asserts and won't return if it fails. static void LoadV8NativesFromFD(base::PlatformFile natives_fd, - int64 natives_offset, - int64 natives_size); + int64_t natives_offset, + int64_t natives_size); // Load V8 snapshot from default resources, if they are available. static void LoadV8Snapshot();
diff --git a/gin/v8_isolate_memory_dump_provider.cc b/gin/v8_isolate_memory_dump_provider.cc index 55e6c50..ec2e33be 100644 --- a/gin/v8_isolate_memory_dump_provider.cc +++ b/gin/v8_isolate_memory_dump_provider.cc
@@ -4,6 +4,8 @@ #include "gin/v8_isolate_memory_dump_provider.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/gin/v8_isolate_memory_dump_provider.h b/gin/v8_isolate_memory_dump_provider.h index 2a2c5db..d70b790 100644 --- a/gin/v8_isolate_memory_dump_provider.h +++ b/gin/v8_isolate_memory_dump_provider.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/trace_event/memory_dump_provider.h" #include "gin/gin_export.h"
diff --git a/gin/wrappable.h b/gin/wrappable.h index e6c7a71..f253fd95 100644 --- a/gin/wrappable.h +++ b/gin/wrappable.h
@@ -7,6 +7,7 @@ #include <type_traits> +#include "base/macros.h" #include "base/template_util.h" #include "gin/converter.h" #include "gin/gin_export.h"
diff --git a/gin/wrappable_unittest.cc b/gin/wrappable_unittest.cc index 07d4fb3..e773d2d 100644 --- a/gin/wrappable_unittest.cc +++ b/gin/wrappable_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "gin/arguments.h" #include "gin/handle.h" #include "gin/object_template_builder.h"
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index 1df9680..4ac64e5 100644 --- a/google_apis/drive/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -328,8 +328,7 @@ // Check if the X-Upload-Content-Length is present. If yes, store the // length of the file. - std::map<std::string, std::string>::const_iterator found = - request.headers.find("X-Upload-Content-Length"); + auto found = request.headers.find("X-Upload-Content-Length"); if (found == request.headers.end() || !base::StringToInt64(found->second, &content_length_)) { return scoped_ptr<net::test_server::HttpResponse>(); @@ -354,8 +353,7 @@ http_request_ = request; if (!request.content.empty()) { - std::map<std::string, std::string>::const_iterator iter = - request.headers.find("Content-Range"); + auto iter = request.headers.find("Content-Range"); if (iter == request.headers.end()) { // The range must be set. return scoped_ptr<net::test_server::HttpResponse>();
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index a4a7d1d..9c7e483c 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc
@@ -97,8 +97,7 @@ bool GetAccessToken(const HttpRequest& request, const char* auth_token_prefix, std::string* access_token) { - std::map<std::string, std::string>::const_iterator auth_header_entry = - request.headers.find("Authorization"); + auto auth_header_entry = request.headers.find("Authorization"); if (auth_header_entry != request.headers.end()) { if (base::StartsWith(auth_header_entry->second, auth_token_prefix, base::CompareCase::SENSITIVE)) {
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index 0462e45..4de4d922 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn
@@ -67,6 +67,7 @@ "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/service", + "//gpu/config:config_sources", "//ui/gl:gl", ]
diff --git a/gpu/gles2_conform_support/egl/egl.cc b/gpu/gles2_conform_support/egl/egl.cc index e64285a0..200f892f 100644 --- a/gpu/gles2_conform_support/egl/egl.cc +++ b/gpu/gles2_conform_support/egl/egl.cc
@@ -5,7 +5,11 @@ #include <EGL/egl.h> #include "base/command_line.h" +#include "base/environment.h" +#include "base/strings/string_split.h" #include "gpu/command_buffer/client/gles2_lib.h" +#include "gpu/command_buffer/service/gpu_switches.h" +#include "gpu/config/gpu_util.h" #include "gpu/gles2_conform_support/egl/display.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_surface.h" @@ -107,9 +111,26 @@ // eglInitialize can be called multiple times, prevent InitializeOneOff from // being called multiple times. if (gfx::GetGLImplementation() == gfx::kGLImplementationNone) { - int argc = 1; - const char* const argv[] = {"dummy"}; - base::CommandLine::Init(argc, argv); + scoped_ptr<base::Environment> env(base::Environment::Create()); + std::vector<std::string> args; + std::string env_args; + if (env->GetVar("CHROME_COMMAND_BUFFER_GLES2_ARGS", &env_args)) { + args = base::SplitString(env_args, " ", base::TRIM_WHITESPACE, + base::SPLIT_WANT_NONEMPTY); + } + if (args.empty()) { + args.push_back("dummy"); + } + scoped_ptr<const char* []> argv(new const char*[args.size()]); + for (size_t i = 0; i < args.size(); ++i) { + argv[i] = args[i].c_str(); + } + base::CommandLine::Init(args.size(), argv.get()); + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) { + gpu::ApplyGpuDriverBugWorkarounds(command_line); + } + gfx::GLSurface::InitializeOneOff(); }
diff --git a/net/test/embedded_test_server/http_request.h b/net/test/embedded_test_server/http_request.h index 1753cfd..d99c050 100644 --- a/net/test/embedded_test_server/http_request.h +++ b/net/test/embedded_test_server/http_request.h
@@ -13,6 +13,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" #include "url/gurl.h" namespace net { @@ -37,6 +38,15 @@ // instead of copying. However, the struct is copyable so tests can save and // examine a HTTP request. struct HttpRequest { + struct CaseInsensitiveStringComparator { + bool operator()(const std::string& left, const std::string& right) const { + return base::CompareCaseInsensitiveASCII(left, right) < 0; + } + }; + + using HeaderMap = + std::map<std::string, std::string, CaseInsensitiveStringComparator>; + HttpRequest(); ~HttpRequest(); @@ -48,7 +58,7 @@ HttpMethod method; std::string method_string; std::string all_headers; - std::map<std::string, std::string> headers; + HeaderMap headers; std::string content; bool has_content; };
diff --git a/sql/connection.cc b/sql/connection.cc index 1213a77f..88acef0 100644 --- a/sql/connection.cc +++ b/sql/connection.cc
@@ -4,6 +4,8 @@ #include "sql/connection.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include "base/bind.h" @@ -120,22 +122,22 @@ } void RecordSqliteMemory10Min() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.TenMinutes", used / 1024); } void RecordSqliteMemoryHour() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneHour", used / 1024); } void RecordSqliteMemoryDay() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneDay", used / 1024); } void RecordSqliteMemoryWeek() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneWeek", used / 1024); } @@ -843,7 +845,7 @@ // If the file cannot be accessed it is unlikely that an integrity check will // turn up actionable information. const base::FilePath db_path = DbPath(); - int64 db_size = -1; + int64_t db_size = -1; if (!base::GetFileSize(db_path, &db_size) || db_size < 0) return std::string(); @@ -855,7 +857,7 @@ db_size); // Only check files up to 8M to keep things from blocking too long. - const int64 kMaxIntegrityCheckSize = 8192 * 1024; + const int64_t kMaxIntegrityCheckSize = 8192 * 1024; if (db_size > kMaxIntegrityCheckSize) { debug_info += "integrity_check skipped due to size\n"; } else {
diff --git a/sql/connection.h b/sql/connection.h index 7a80077..e121b9fe 100644 --- a/sql/connection.h +++ b/sql/connection.h
@@ -5,6 +5,7 @@ #ifndef SQL_CONNECTION_H_ #define SQL_CONNECTION_H_ +#include <stddef.h> #include <stdint.h> #include <map> #include <set>
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index 219da7f..d25f7c91 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "base/test/histogram_tester.h" #include "base/trace_event/process_memory_dump.h" @@ -211,14 +215,14 @@ void sqlite_adjust_millis(sql::test::ScopedMockTimeSource* time_mock, sqlite3_context* context, int argc, sqlite3_value** argv) { - int64 milliseconds = argc > 0 ? sqlite3_value_int64(argv[0]) : 1000; + int64_t milliseconds = argc > 0 ? sqlite3_value_int64(argv[0]) : 1000; time_mock->adjust(base::TimeDelta::FromMilliseconds(milliseconds)); sqlite3_result_int64(context, milliseconds); } // Adjust mock time by |milliseconds| on commit. int adjust_commit_hook(sql::test::ScopedMockTimeSource* time_mock, - int64 milliseconds) { + int64_t milliseconds) { time_mock->adjust(base::TimeDelta::FromMilliseconds(milliseconds)); return SQLITE_OK; }
diff --git a/sql/meta_table.cc b/sql/meta_table.cc index 011fe18..b3e0503a 100644 --- a/sql/meta_table.cc +++ b/sql/meta_table.cc
@@ -4,6 +4,8 @@ #include "sql/meta_table.h" +#include <stdint.h> + #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h"
diff --git a/sql/meta_table_unittest.cc b/sql/meta_table_unittest.cc index 13d0b5d..d46795f 100644 --- a/sql/meta_table_unittest.cc +++ b/sql/meta_table_unittest.cc
@@ -4,6 +4,8 @@ #include "sql/meta_table.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "sql/connection.h"
diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc index 943f38bd..0fc2b48 100644 --- a/sql/mojo/mojo_vfs.cc +++ b/sql/mojo/mojo_vfs.cc
@@ -4,6 +4,9 @@ #include "sql/mojo/mojo_vfs.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h"
diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc index 3018728..caa903a 100644 --- a/sql/mojo/sql_test_base.cc +++ b/sql/mojo/sql_test_base.cc
@@ -4,6 +4,9 @@ #include "sql/mojo/sql_test_base.h" +#include <stddef.h> +#include <stdint.h> + #include "mojo/application/public/cpp/application_impl.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h"
diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h index d39198da..6494752 100644 --- a/sql/mojo/sql_test_base.h +++ b/sql/mojo/sql_test_base.h
@@ -6,6 +6,7 @@ #define SQL_MOJO_SQL_TEST_BASE_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_test_base.h"
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index 38de192..d6eee65 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <memory> +#include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.h"
diff --git a/sql/recovery.cc b/sql/recovery.cc index 6691d07..7014433 100644 --- a/sql/recovery.cc +++ b/sql/recovery.cc
@@ -4,6 +4,8 @@ #include "sql/recovery.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/format_macros.h" #include "base/logging.h"
diff --git a/sql/recovery.h b/sql/recovery.h index e334d34..c03ebb2 100644 --- a/sql/recovery.h +++ b/sql/recovery.h
@@ -5,6 +5,8 @@ #ifndef SQL_RECOVERY_H_ #define SQL_RECOVERY_H_ +#include <stddef.h> + #include "base/macros.h" #include "sql/connection.h"
diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc index bbddd972..36c9de7 100644 --- a/sql/recovery_unittest.cc +++ b/sql/recovery_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include "base/bind.h"
diff --git a/sql/sql_memory_dump_provider.h b/sql/sql_memory_dump_provider.h index 051755f..01d7f04d 100644 --- a/sql/sql_memory_dump_provider.h +++ b/sql/sql_memory_dump_provider.h
@@ -5,6 +5,7 @@ #ifndef SQL_PROCESS_MEMORY_DUMP_PROVIDER_H #define SQL_PROCESS_MEMORY_DUMP_PROVIDER_H +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/trace_event/memory_dump_provider.h" #include "sql/sql_export.h"
diff --git a/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc index db60072..9b8c9716 100644 --- a/sql/sqlite_features_unittest.cc +++ b/sql/sqlite_features_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/bind.h" @@ -191,8 +194,8 @@ } db().Close(); - const uint32 kFlags = - base::File::FLAG_OPEN|base::File::FLAG_READ|base::File::FLAG_WRITE; + const uint32_t kFlags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; char buf[4096]; // Create a file with a block of '0', a block of '1', and a block of '2'.
diff --git a/sql/statement.cc b/sql/statement.cc index 2a0faa7..1502b09 100644 --- a/sql/statement.cc +++ b/sql/statement.cc
@@ -4,6 +4,9 @@ #include "sql/statement.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/sql/test/error_callback_support.h b/sql/test/error_callback_support.h index 30268570..21caef3 100644 --- a/sql/test/error_callback_support.h +++ b/sql/test/error_callback_support.h
@@ -5,6 +5,7 @@ #ifndef SQL_TEST_ERROR_CALLBACK_SUPPORT_H_ #define SQL_TEST_ERROR_CALLBACK_SUPPORT_H_ +#include "base/macros.h" #include "sql/connection.h" namespace sql {
diff --git a/sql/test/sql_test_base.h b/sql/test/sql_test_base.h index ebe9048e..fcc40c09 100644 --- a/sql/test/sql_test_base.h +++ b/sql/test/sql_test_base.h
@@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index 16f2a7e..40cbe1d4 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc
@@ -4,6 +4,9 @@ #include "sql/test/test_helpers.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/files/file_util.h"
diff --git a/sql/test/test_helpers.h b/sql/test/test_helpers.h index b2cecb0..71f7c3c 100644 --- a/sql/test/test_helpers.h +++ b/sql/test/test_helpers.h
@@ -5,6 +5,9 @@ #ifndef SQL_TEST_TEST_HELPERS_H_ #define SQL_TEST_TEST_HELPERS_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/compiler_specific.h"
diff --git a/testing/libfuzzer/fuzzer_test.gni b/testing/libfuzzer/fuzzer_test.gni index 94ef8d0a..4fc5b26b 100644 --- a/testing/libfuzzer/fuzzer_test.gni +++ b/testing/libfuzzer/fuzzer_test.gni
@@ -2,8 +2,33 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# Defines fuzzer_test. +# import("//testing/test.gni") +# visible for testing only. +template("fuzzer_test_launcher") { + assert(defined(invoker.fuzzer_name), "need fuzzer_name in $target_name.") + assert(defined(invoker.dict), "need dict in $target_name.") + + generated_script = "$root_build_dir/$target_name" + + action(target_name) { + script = "//testing/libfuzzer/gen_fuzzer_runner.py" + args = [ + "--fuzzer", + invoker.fuzzer_name, + "--launcher", + rebase_path(generated_script, root_build_dir), + "--dict", + rebase_path("$target_out_dir/" + invoker.dict, root_build_dir), + ] + outputs = [ + generated_script, + ] + } +} + # fuzzer_test is used to define individual libfuzzer tests. # # Supported attributes: @@ -34,7 +59,6 @@ if (defined(invoker.dict)) { fuzzer_name = target_name launcher_name = target_name + ".sh" - generated_script = "$root_build_dir/$launcher_name" # Copy dictionary to output copy(target_name + "_dict_copy") { @@ -46,21 +70,10 @@ ] } - # Generate test launcher - action(launcher_name) { - script = "//testing/libfuzzer/gen_fuzzer_runner.py" - args = [ - "--fuzzer", - fuzzer_name, - "--launcher", - rebase_path(generated_script, root_build_dir), - "--dict", - rebase_path("$target_out_dir/" + invoker.dict, root_build_dir), - ] - outputs = [ - generated_script, - ] + fuzzer_test_launcher(launcher_name) { + dict = invoker.dict } + test_deps += [ ":$launcher_name", ":" + fuzzer_name + "_dict_copy",
diff --git a/testing/libfuzzer/tests/BUILD.gn b/testing/libfuzzer/tests/BUILD.gn new file mode 100644 index 0000000..7c74ffd --- /dev/null +++ b/testing/libfuzzer/tests/BUILD.gn
@@ -0,0 +1,38 @@ +# Copyright 2015 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. +# +# Fuzzing Infrastructure Tests + +import("//testing/test.gni") +import("//testing/libfuzzer/fuzzer_test.gni") + +test("libfuzzer_tests") { + sources = [ + "fuzzer_launcher_test.cc", + ] + deps = [ + ":test_dict_launcher.sh", + "//base", + "//testing/gmock", + "//testing/gtest", + "//testing/gtest:gtest_main", + ] + data_deps = [ + ":print_args", + ] +} + +fuzzer_test_launcher("test_dict_launcher.sh") { + fuzzer_name = "print_args.py" + dict = "test_dict" +} + +copy("print_args") { + sources = [ + "print_args.py", + ] + outputs = [ + "$root_build_dir/print_args.py", + ] +}
diff --git a/testing/libfuzzer/tests/fuzzer_launcher_test.cc b/testing/libfuzzer/tests/fuzzer_launcher_test.cc new file mode 100644 index 0000000..70f51fb --- /dev/null +++ b/testing/libfuzzer/tests/fuzzer_launcher_test.cc
@@ -0,0 +1,39 @@ +// Copyright 2015 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. + +// Fuzzer launcher script tests. + +#include <string> +#include <vector> + + +#include "base/command_line.h" +#include "base/path_service.h" +#include "base/process/launch.h" +#include "base/strings/string_split.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" +using testing::EndsWith; +using testing::StartsWith; + +TEST(FuzzerLauncherTest, Dict) { + base::FilePath exe_path; + PathService::Get(base::FILE_EXE, &exe_path); + std::string launcher_path = + exe_path.DirName().Append("test_dict_launcher.sh").value(); + + std::string output; + base::CommandLine cmd({{launcher_path, "-custom_option"}}); + bool success = base::GetAppOutputAndError(cmd, &output); + EXPECT_TRUE(success); + std::vector<std::string> fuzzer_args = base::SplitString( + output, "\n\r", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); + + EXPECT_EQ(3UL, fuzzer_args.size()); + + EXPECT_THAT(fuzzer_args[0], EndsWith("print_args.py")); + EXPECT_THAT(fuzzer_args[1], StartsWith("-dict")); + EXPECT_THAT(fuzzer_args[1], EndsWith("test_dict")); + EXPECT_EQ("-custom_option", fuzzer_args[2]); +}
diff --git a/testing/libfuzzer/tests/print_args.py b/testing/libfuzzer/tests/print_args.py new file mode 100755 index 0000000..6b30399e --- /dev/null +++ b/testing/libfuzzer/tests/print_args.py
@@ -0,0 +1,11 @@ +#!/usr/bin/env python +# Copyright 2015 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. + +# Script that prints out all its arguments. Used for testing. + +import sys + +for arg in sys.argv: + print arg
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index a320bd2..84f9312 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1279,9 +1279,11 @@ crbug.com/569919 fast/canvas/canvas-toBlob-jpeg-medium-quality.html [ Failure ] crbug.com/569919 fast/canvas/canvas-toBlob-webp-maximum-quality.html [ Failure ] crbug.com/569919 fast/canvas/canvas-toDataURL-jpeg-maximum-quality.html [ NeedsRebaseline ] +crbug.com/536999 paint/selection/selection-within-composited-scroller.html [ NeedsManualRebaseline ] crbug.com/570401 fast/canvas/canvas-shadow-source-in.html [ Failure ] crbug.com/570401 virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in.html [ Failure ] crbug.com/570401 compositing/overflow/updating-scrolling-content.html [ Failure ] +crbug.com/570401 compositing/repaint/should-not-clip-composited-overflow-scrolling-layer.html [ Failure ] crbug.com/568867 [ Win7 Debug ] transforms/3d/point-mapping/3d-point-mapping-deep.html [ Failure ] crbug.com/568867 [ Win7 Debug ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation-expected.txt b/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation-expected.txt new file mode 100644 index 0000000..d21c9910 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation-expected.txt
@@ -0,0 +1,4 @@ + This is a testharness.js-based test. +FAIL CSS animations always override SVG presentation attribute animations assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)" +Harness: the test ran to completion. +
diff --git a/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation.html b/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation.html new file mode 100644 index 0000000..cd67cbed --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/css-animation-overrides-svg-presentation-attribute-animation.html
@@ -0,0 +1,14 @@ +<script src="../resources/testharness.js"></script> +<script src="../resources/testharnessreport.js"></script> + +<svg> + <rect id="target"/> +</svg> + +<script> +test(() => { + target.animate({color: 'green'}, {fill: 'forwards'}); + target.animate({'svg-color': 'red'}, {fill: 'forwards'}); + assert_equals(getComputedStyle(target).color, 'rgb(0, 128, 0)'); +}, 'CSS animations always override SVG presentation attribute animations'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/svg-presentation-attribute-animation.html b/third_party/WebKit/LayoutTests/animations/svg-presentation-attribute-animation.html new file mode 100644 index 0000000..2c9ac8e --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/svg-presentation-attribute-animation.html
@@ -0,0 +1,86 @@ +<script src="../resources/testharness.js"></script> +<script src="../resources/testharnessreport.js"></script> + +<svg> + <rect id="target"/> +</svg> + +<script> +'use strict'; + +var testCases = [ + ['alignment-baseline', 'middle'], + ['baseline-shift', '100px'], + ['buffered-rendering', 'dynamic'], + ['clip-path', 'url("#test")'], + ['clip-rule', 'evenodd'], + ['color', 'rgb(1, 2, 3)'], + ['color-interpolation', 'linearRGB'], + ['color-interpolation-filters', 'sRGB'], + ['color-rendering', 'optimizeSpeed'], + ['cursor', 'url("test://uri/"), auto'], + ['dominant-baseline', 'middle'], + ['fill', 'rgb(1, 2, 3)'], + ['fill-opacity', '0.25'], + ['fill-rule', 'evenodd'], + ['filter', 'url("#test")'], + ['flood-color', 'rgb(1, 2, 3)'], + ['flood-opacity', '0.25'], + ['font-family', "'Test Font'"], + ['font-size', '123px'], + ['font-stretch', 'condensed'], + ['font-style', 'italic'], + ['font-variant', 'small-caps'], + ['font-weight', '900'], + ['image-rendering', 'pixelated'], + ['letter-spacing', '123px'], + ['lighting-color', 'rgb(1, 2, 3)'], + ['marker-end', 'url("#test")'], + ['marker-mid', 'url("#test")'], + ['marker-start', 'url("#test")'], + ['mask', 'url("#test")'], + ['mask-type', 'alpha'], + ['opacity', '0.25'], + ['overflow', 'hidden'], + ['paint-order', 'fill markers stroke'], + ['pointer-events', 'all'], + ['shape-rendering', 'geometricPrecision'], + ['stop-color', 'rgb(1, 2, 3)'], + ['stop-opacity', '0.25'], + ['stroke', 'rgb(1, 2, 3)'], + ['stroke-dasharray', '1px, 2px, 3px'], + ['stroke-dashoffset', '123px'], + ['stroke-linecap', 'square'], + ['stroke-linejoin', 'round'], + ['stroke-miterlimit', '123'], + ['stroke-opacity', '0.25'], + ['stroke-width', '123px'], + ['text-anchor', 'middle'], + ['text-decoration', 'underline solid rgb(1, 2, 3)'], + ['text-rendering', 'geometricPrecision'], + ['vector-effect', 'non-scaling-stroke'], + ['visibility', 'collapse'], + ['word-spacing', '123px'], +]; + +function svgPrefix(property) { + return 'svg-' + property; +} + +test(() => { + for (var [property, value] of testCases) { + assert_not_equals(getComputedStyle(target)[property], value, 'Precheck that this test is using a non-default value for ' + property); + } +}, 'Pretest assertions'); + +// Separate animate() and getComputedStyle() into different phases to avoid quadratic animated style recalc churn. +for (var [property, value] of testCases) { + target.animate({[svgPrefix(property)]: value}, {fill: 'forwards'}); +} + +for (var [property, value] of testCases) { + test(() => { + assert_equals(getComputedStyle(target)[property], value); + }, 'Web Animations can target ' + svgPrefix(property)); +} +</script>
diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger/live-edit-no-reveal.html b/third_party/WebKit/LayoutTests/inspector/sources/debugger/live-edit-no-reveal.html index 3d63f34..f05f4b0 100644 --- a/third_party/WebKit/LayoutTests/inspector/sources/debugger/live-edit-no-reveal.html +++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger/live-edit-no-reveal.html
@@ -44,7 +44,6 @@ function didEditScriptSource() { - WebInspector.SourcesPanel.instance().updateLastModificationTime(); InspectorTest.resumeExecution(); } @@ -84,7 +83,6 @@ { InspectorTest.addResult("Stepping into..."); InspectorTest.addSniffer(WebInspector.SourcesView.prototype, "showSourceLocation", didRevealAfterStepInto); - WebInspector.SourcesPanel.instance()._lastModificationTimeoutPassedForTest(); InspectorTest.stepInto(); }
diff --git a/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp b/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp index 2099598..f4b46eb 100644 --- a/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp
@@ -46,7 +46,7 @@ static ExceptionState& emptyExceptionState() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(WTF::ThreadSpecific<NonThrowableExceptionState>, exceptionState, new ThreadSpecific<NonThrowableExceptionState>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(WTF::ThreadSpecific<NonThrowableExceptionState>, exceptionState, new ThreadSpecific<NonThrowableExceptionState>); return *exceptionState; }
diff --git a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl index a3108c6..5405244 100644 --- a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl +++ b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl
@@ -1,7 +1,6 @@ {% from 'macros.tmpl' import license %} {{license()}} -#include "config.h" #include "platform/RuntimeEnabledFeatures.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl index 0034b73..84a6bf4 100644 --- a/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl +++ b/third_party/WebKit/Source/build/scripts/templates/RuntimeEnabledFeatures.h.tmpl
@@ -7,6 +7,7 @@ #include <string> #include "platform/PlatformExport.h" +#include "wtf/build_config.h" #include "wtf/Forward.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/CoreExport.h b/third_party/WebKit/Source/core/CoreExport.h index 0064d25..193c0ee7 100644 --- a/third_party/WebKit/Source/core/CoreExport.h +++ b/third_party/WebKit/Source/core/CoreExport.h
@@ -5,6 +5,8 @@ #ifndef CoreExport_h #define CoreExport_h +#include "wtf/Compiler.h" + #if !defined(LINK_CORE_MODULES_SEPARATELY) #define LINK_CORE_MODULES_SEPARATELY 0 #endif
diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp index 985b411..308af37 100644 --- a/third_party/WebKit/Source/core/animation/Animation.cpp +++ b/third_party/WebKit/Source/core/animation/Animation.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/Animation.h" #include "core/animation/AnimationTimeline.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationClock.cpp b/third_party/WebKit/Source/core/animation/AnimationClock.cpp index 9b6f139..0180fed 100644 --- a/third_party/WebKit/Source/core/animation/AnimationClock.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationClock.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationClock.h" #include "wtf/CurrentTime.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationClockTest.cpp b/third_party/WebKit/Source/core/animation/AnimationClockTest.cpp index 0c5384d..9eaddbc 100644 --- a/third_party/WebKit/Source/core/animation/AnimationClockTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationClockTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationClock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationEffect.cpp b/third_party/WebKit/Source/core/animation/AnimationEffect.cpp index 3d64889..2ed07ca 100644 --- a/third_party/WebKit/Source/core/animation/AnimationEffect.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationEffect.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationEffect.h" #include "core/animation/Animation.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationEffectTest.cpp b/third_party/WebKit/Source/core/animation/AnimationEffectTest.cpp index eb507d3c..63163ef 100644 --- a/third_party/WebKit/Source/core/animation/AnimationEffectTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationEffectTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationEffect.h" #include "core/animation/ComputedTimingProperties.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp index d07c5b90..55f8111 100644 --- a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/AnimationEffectTiming.h" #include "bindings/core/v8/UnionTypesCore.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp index 892df1e7..2f7d7ae 100644 --- a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp
@@ -2,30 +2,200 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/AnimationInputHelpers.h" +#include "core/SVGNames.h" +#include "core/XLinkNames.h" #include "core/css/CSSValueList.h" #include "core/css/parser/CSSParser.h" #include "core/css/resolver/CSSToStyleMap.h" +#include "core/svg/SVGElement.h" +#include "core/svg/animation/SVGSMILElement.h" #include "wtf/text/StringBuilder.h" namespace blink { -CSSPropertyID AnimationInputHelpers::keyframeAttributeToCSSPropertyID(const String& propertyName) +const char kSVGPrefix[] = "svg-"; +const unsigned kSVGPrefixLength = sizeof(kSVGPrefix) - 1; + +static bool isSVGPrefixed(const String& property) +{ + return property.startsWith(kSVGPrefix); +} + +static String removeSVGPrefix(const String& property) +{ + ASSERT(isSVGPrefixed(property)); + return property.substring(kSVGPrefixLength); +} + +CSSPropertyID AnimationInputHelpers::keyframeAttributeToCSSPropertyID(const String& property, const Element& element) { // Disallow prefixed properties. - if (propertyName[0] == '-' || isASCIIUpper(propertyName[0])) + if (property[0] == '-' || isASCIIUpper(property[0])) return CSSPropertyInvalid; - if (propertyName == "cssFloat") + if (property == "cssFloat") return CSSPropertyFloat; StringBuilder builder; - for (size_t i = 0; i < propertyName.length(); ++i) { - if (isASCIIUpper(propertyName[i])) + for (size_t i = 0; i < property.length(); ++i) { + if (isASCIIUpper(property[i])) builder.append('-'); - builder.append(propertyName[i]); + builder.append(property[i]); } - return cssPropertyID(builder.toString()); + + CSSPropertyID result = cssPropertyID(builder.toString()); + if (result != CSSPropertyInvalid || !RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !element.isSVGElement() || !isSVGPrefixed(property)) + return result; + + // TODO(alancutter): Don't alias these as their CSS property counterparts. + // Treat them as their own type of PropertyHandle so they can be applied in + // SVGElement::collectStyleForPresentationAttribute() instead of StyleResolver::applyAnimatedProperties(). + String unprefixedProperty = removeSVGPrefix(property); + if (SVGElement::isAnimatableCSSProperty(QualifiedName(nullAtom, AtomicString(unprefixedProperty), nullAtom))) + return cssPropertyID(unprefixedProperty); + + return CSSPropertyInvalid; +} + +using AttributeNameMap = HashMap<QualifiedName, const QualifiedName*>; + +const AttributeNameMap& getSupportedAttributes() +{ + DEFINE_STATIC_LOCAL(AttributeNameMap, supportedAttributes, ()); + if (supportedAttributes.isEmpty()) { + // Fill the set for the first use. + // Animatable attributes from http://www.w3.org/TR/SVG/attindex.html + const QualifiedName* attributes[] = { + &HTMLNames::classAttr, + &SVGNames::amplitudeAttr, + &SVGNames::azimuthAttr, + &SVGNames::baseFrequencyAttr, + &SVGNames::biasAttr, + &SVGNames::clipPathUnitsAttr, + &SVGNames::cxAttr, + &SVGNames::cyAttr, + &SVGNames::dAttr, + &SVGNames::diffuseConstantAttr, + &SVGNames::divisorAttr, + &SVGNames::dxAttr, + &SVGNames::dyAttr, + &SVGNames::edgeModeAttr, + &SVGNames::elevationAttr, + &SVGNames::exponentAttr, + &SVGNames::filterUnitsAttr, + &SVGNames::fxAttr, + &SVGNames::fyAttr, + &SVGNames::gradientTransformAttr, + &SVGNames::gradientUnitsAttr, + &SVGNames::heightAttr, + &SVGNames::in2Attr, + &SVGNames::inAttr, + &SVGNames::interceptAttr, + &SVGNames::k1Attr, + &SVGNames::k2Attr, + &SVGNames::k3Attr, + &SVGNames::k4Attr, + &SVGNames::kernelMatrixAttr, + &SVGNames::kernelUnitLengthAttr, + &SVGNames::lengthAdjustAttr, + &SVGNames::limitingConeAngleAttr, + &SVGNames::markerHeightAttr, + &SVGNames::markerUnitsAttr, + &SVGNames::markerWidthAttr, + &SVGNames::maskContentUnitsAttr, + &SVGNames::maskUnitsAttr, + &SVGNames::methodAttr, + &SVGNames::modeAttr, + &SVGNames::numOctavesAttr, + &SVGNames::offsetAttr, + &SVGNames::opacityAttr, + &SVGNames::operatorAttr, + &SVGNames::orderAttr, + &SVGNames::orientAttr, + &SVGNames::pathLengthAttr, + &SVGNames::patternContentUnitsAttr, + &SVGNames::patternTransformAttr, + &SVGNames::patternUnitsAttr, + &SVGNames::pointsAtXAttr, + &SVGNames::pointsAtYAttr, + &SVGNames::pointsAtZAttr, + &SVGNames::pointsAttr, + &SVGNames::preserveAlphaAttr, + &SVGNames::preserveAspectRatioAttr, + &SVGNames::primitiveUnitsAttr, + &SVGNames::rAttr, + &SVGNames::radiusAttr, + &SVGNames::refXAttr, + &SVGNames::refYAttr, + &SVGNames::resultAttr, + &SVGNames::rotateAttr, + &SVGNames::rxAttr, + &SVGNames::ryAttr, + &SVGNames::scaleAttr, + &SVGNames::seedAttr, + &SVGNames::slopeAttr, + &SVGNames::spacingAttr, + &SVGNames::specularConstantAttr, + &SVGNames::specularExponentAttr, + &SVGNames::spreadMethodAttr, + &SVGNames::startOffsetAttr, + &SVGNames::stdDeviationAttr, + &SVGNames::stitchTilesAttr, + &SVGNames::surfaceScaleAttr, + &SVGNames::tableValuesAttr, + &SVGNames::targetAttr, + &SVGNames::targetXAttr, + &SVGNames::targetYAttr, + &SVGNames::textLengthAttr, + &SVGNames::transformAttr, + &SVGNames::typeAttr, + &SVGNames::valuesAttr, + &SVGNames::viewBoxAttr, + &SVGNames::widthAttr, + &SVGNames::x1Attr, + &SVGNames::x2Attr, + &SVGNames::xAttr, + &SVGNames::xChannelSelectorAttr, + &SVGNames::y1Attr, + &SVGNames::y2Attr, + &SVGNames::yAttr, + &SVGNames::yChannelSelectorAttr, + &SVGNames::zAttr, + &XLinkNames::hrefAttr, + }; + for (size_t i = 0; i < WTF_ARRAY_LENGTH(attributes); i++) + supportedAttributes.set(*attributes[i], attributes[i]); + } + return supportedAttributes; +} + +QualifiedName svgAttributeName(const String& property) +{ + ASSERT(!isSVGPrefixed(property)); + + if (property == "href") + return XLinkNames::hrefAttr; + + return QualifiedName(nullAtom, AtomicString(property), nullAtom); +} + +const QualifiedName* AnimationInputHelpers::keyframeAttributeToQualifiedName(const String& property, Element& element) +{ + if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !element.isSVGElement() || !isSVGPrefixed(property)) + return nullptr; + + SVGElement& svgElement = toSVGElement(element); + if (isSVGSMILElement(svgElement)) + return nullptr; + + String unprefixedProperty = removeSVGPrefix(property); + QualifiedName attributeName = svgAttributeName(unprefixedProperty); + const AttributeNameMap& supportedAttributes = getSupportedAttributes(); + auto iter = supportedAttributes.find(attributeName); + if (iter == supportedAttributes.end() || !svgElement.propertyFromAttribute(*iter->value)) + return nullptr; + + return iter->value; } PassRefPtr<TimingFunction> AnimationInputHelpers::parseTimingFunction(const String& string)
diff --git a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.h b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.h index d08bc4d88..ae4a6fa7 100644 --- a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.h +++ b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.h
@@ -11,12 +11,15 @@ namespace blink { +class Element; class TimingFunction; +class QualifiedName; class CORE_EXPORT AnimationInputHelpers { STATIC_ONLY(AnimationInputHelpers); public: - static CSSPropertyID keyframeAttributeToCSSPropertyID(const String&); + static CSSPropertyID keyframeAttributeToCSSPropertyID(const String&, const Element&); + static const QualifiedName* keyframeAttributeToQualifiedName(const String&, Element&); static PassRefPtr<TimingFunction> parseTimingFunction(const String&); };
diff --git a/third_party/WebKit/Source/core/animation/AnimationInputHelpersTest.cpp b/third_party/WebKit/Source/core/animation/AnimationInputHelpersTest.cpp index 3f4f718b..aff5281 100644 --- a/third_party/WebKit/Source/core/animation/AnimationInputHelpersTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationInputHelpersTest.cpp
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/AnimationInputHelpers.h" +#include "core/testing/DummyPageHolder.h" #include "platform/animation/TimingFunction.h" #include "testing/gtest/include/gtest/gtest.h" @@ -12,23 +12,26 @@ TEST(AnimationAnimationInputHelpersTest, ParseKeyframePropertyAttributes) { - EXPECT_EQ(CSSPropertyLineHeight, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("line-height"))); - EXPECT_EQ(CSSPropertyLineHeight, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("lineHeight"))); - EXPECT_EQ(CSSPropertyBorderTopWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("borderTopWidth"))); - EXPECT_EQ(CSSPropertyBorderTopWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("border-topWidth"))); - EXPECT_EQ(CSSPropertyWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("width"))); - EXPECT_EQ(CSSPropertyFloat, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("float"))); - EXPECT_EQ(CSSPropertyFloat, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("cssFloat"))); + OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(); + const Element& dummyElement = *dummyPageHolder->document().documentElement(); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("Width"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-epub-text-transform"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("EpubTextTransform"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-internal-marquee-repetition"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("InternalMarqueeRepetition"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-webkit-filter"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-webkit-transform"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("webkitTransform"))); - EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("WebkitTransform"))); + EXPECT_EQ(CSSPropertyLineHeight, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("line-height"), dummyElement)); + EXPECT_EQ(CSSPropertyLineHeight, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("lineHeight"), dummyElement)); + EXPECT_EQ(CSSPropertyBorderTopWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("borderTopWidth"), dummyElement)); + EXPECT_EQ(CSSPropertyBorderTopWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("border-topWidth"), dummyElement)); + EXPECT_EQ(CSSPropertyWidth, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("width"), dummyElement)); + EXPECT_EQ(CSSPropertyFloat, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("float"), dummyElement)); + EXPECT_EQ(CSSPropertyFloat, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("cssFloat"), dummyElement)); + + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("Width"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-epub-text-transform"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("EpubTextTransform"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-internal-marquee-repetition"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("InternalMarqueeRepetition"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-webkit-filter"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("-webkit-transform"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("webkitTransform"), dummyElement)); + EXPECT_EQ(CSSPropertyInvalid, AnimationInputHelpers::keyframeAttributeToCSSPropertyID(String("WebkitTransform"), dummyElement)); } static bool timingFunctionRoundTrips(const String& string)
diff --git a/third_party/WebKit/Source/core/animation/AnimationStack.cpp b/third_party/WebKit/Source/core/animation/AnimationStack.cpp index 581f3da5..1bdc5814 100644 --- a/third_party/WebKit/Source/core/animation/AnimationStack.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationStack.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationStack.h" #include "core/animation/CompositorAnimations.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp index cd43e85..805f259 100644 --- a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/AnimationStack.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTest.cpp b/third_party/WebKit/Source/core/animation/AnimationTest.cpp index da9fad8..7860930 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/Animation.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTestHelper.cpp b/third_party/WebKit/Source/core/animation/AnimationTestHelper.cpp index 91e50f5..641a6e8 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTestHelper.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTestHelper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/AnimationTestHelper.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp index 1668c19..6ed49b4 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationTimeline.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTimelineTest.cpp b/third_party/WebKit/Source/core/animation/AnimationTimelineTest.cpp index 854bb1a..32275b9 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTimelineTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTimelineTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationTimeline.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTranslationUtil.cpp b/third_party/WebKit/Source/core/animation/AnimationTranslationUtil.cpp index 4cffa696..fe85013 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTranslationUtil.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTranslationUtil.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationTranslationUtil.h"
diff --git a/third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp b/third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp index 17f76fe3..4c04166d 100644 --- a/third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp +++ b/third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/AnimationTranslationUtil.h" #include "platform/graphics/filters/FilterOperations.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp index a5dd9cd7..e8e57e1 100644 --- a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSColorInterpolationType.h" #include "core/animation/ColorPropertyFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp index f8df2b8..96cc91a 100644 --- a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSImageInterpolationType.h" #include "core/animation/ImagePropertyFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp index e116686..4b68091 100644 --- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSImageListInterpolationType.h" #include "core/animation/CSSImageInterpolationType.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp index c3710571..902f6eb5 100644 --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSLengthInterpolationType.h" #include "core/animation/LengthPropertyFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSLengthListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthListInterpolationType.cpp index 32a9fc0..ca387ec 100644 --- a/third_party/WebKit/Source/core/animation/CSSLengthListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSLengthListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSLengthListInterpolationType.h" #include "core/animation/CSSLengthInterpolationType.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSNumberInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSNumberInterpolationType.cpp index 0cb257c..8b9b70e 100644 --- a/third_party/WebKit/Source/core/animation/CSSNumberInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSNumberInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSNumberInterpolationType.h" #include "core/animation/NumberPropertyFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp index 785cb1c..cd8a0f4f 100644 --- a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSPaintInterpolationType.h" #include "core/animation/CSSColorInterpolationType.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp index 074494f3..0f25cd3 100644 --- a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSShadowListInterpolationType.h" #include "core/animation/ListInterpolationFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp index 8f63aa54..2c6ca1d 100644 --- a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/CSSValueInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp b/third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp index 2f6d5f6..40cc56d 100644 --- a/third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/ColorPropertyFunctions.h" #include "core/style/ComputedStyle.h"
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp index f98c86d..9d1a1413 100644 --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/CompositorAnimations.h" #include "core/animation/AnimationEffect.h"
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp index 7e6d27e..8e99446 100644 --- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp +++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/CompositorAnimations.h"
diff --git a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp index 03f105c..4469d94f 100644 --- a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/CompositorPendingAnimations.h" #include "core/animation/AnimationTimeline.h"
diff --git a/third_party/WebKit/Source/core/animation/DefaultSVGInterpolation.cpp b/third_party/WebKit/Source/core/animation/DefaultSVGInterpolation.cpp index 874389f..09a80a7 100644 --- a/third_party/WebKit/Source/core/animation/DefaultSVGInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/DefaultSVGInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/DefaultSVGInterpolation.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp index 10bca36..93d929f 100644 --- a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/DeferredLegacyStyleInterpolation.h" #include "core/animation/ElementAnimations.h"
diff --git a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolationTest.cpp index 2b7b50bc..b2119e4 100644 --- a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/DeferredLegacyStyleInterpolation.h" #include "core/css/CSSInheritedValue.h"
diff --git a/third_party/WebKit/Source/core/animation/DocumentAnimations.cpp b/third_party/WebKit/Source/core/animation/DocumentAnimations.cpp index 4ea9d74..559460cf 100644 --- a/third_party/WebKit/Source/core/animation/DocumentAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/DocumentAnimations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/DocumentAnimations.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolation.cpp index 668ab32..19dcde8a5 100644 --- a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/DoubleStyleInterpolation.h" #include "core/css/CSSValueList.h"
diff --git a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp index 8220ee9..5491cbe 100644 --- a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/DoubleStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/EffectInput.cpp b/third_party/WebKit/Source/core/animation/EffectInput.cpp index 52138d92..762dd14 100644 --- a/third_party/WebKit/Source/core/animation/EffectInput.cpp +++ b/third_party/WebKit/Source/core/animation/EffectInput.cpp
@@ -28,175 +28,24 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/EffectInput.h" #include "bindings/core/v8/Dictionary.h" #include "bindings/core/v8/UnionTypesCore.h" -#include "core/HTMLNames.h" -#include "core/SVGNames.h" -#include "core/XLinkNames.h" #include "core/animation/AnimationInputHelpers.h" #include "core/animation/KeyframeEffectModel.h" #include "core/animation/StringKeyframe.h" -#include "core/css/resolver/StyleResolver.h" +#include "core/css/CSSStyleSheet.h" #include "core/dom/Document.h" #include "core/dom/Element.h" +#include "core/dom/ExceptionCode.h" #include "core/dom/NodeComputedStyle.h" -#include "core/svg/animation/SVGSMILElement.h" #include "wtf/ASCIICType.h" #include "wtf/HashSet.h" #include "wtf/NonCopyingSort.h" namespace blink { -namespace { - -bool isSVGPrefixed(const String& property) -{ - return property.startsWith("svg-"); -} - -QualifiedName svgAttributeName(String property) -{ - // Replace 'svg-transform' with 'transform', etc. - ASSERT(isSVGPrefixed(property)); - property.remove(0, 4); - - if (property == "href") - return XLinkNames::hrefAttr; - - return QualifiedName(nullAtom, AtomicString(property), SVGNames::amplitudeAttr.namespaceURI()); -} - -using AttributeNameMap = HashMap<QualifiedName, const QualifiedName*>; - -const AttributeNameMap& getSupportedAttributes() -{ - DEFINE_STATIC_LOCAL(AttributeNameMap, supportedAttributes, ()); - if (supportedAttributes.isEmpty()) { - // Fill the set for the first use. - // Animatable attributes from http://www.w3.org/TR/SVG/attindex.html - const QualifiedName* attributes[] = { - &HTMLNames::classAttr, - &SVGNames::amplitudeAttr, - &SVGNames::azimuthAttr, - &SVGNames::baseFrequencyAttr, - &SVGNames::biasAttr, - &SVGNames::clipPathUnitsAttr, - &SVGNames::cxAttr, - &SVGNames::cyAttr, - &SVGNames::dAttr, - &SVGNames::diffuseConstantAttr, - &SVGNames::divisorAttr, - &SVGNames::dxAttr, - &SVGNames::dyAttr, - &SVGNames::edgeModeAttr, - &SVGNames::elevationAttr, - &SVGNames::exponentAttr, - &SVGNames::filterUnitsAttr, - &SVGNames::fxAttr, - &SVGNames::fyAttr, - &SVGNames::gradientTransformAttr, - &SVGNames::gradientUnitsAttr, - &SVGNames::heightAttr, - &SVGNames::in2Attr, - &SVGNames::inAttr, - &SVGNames::interceptAttr, - &SVGNames::k1Attr, - &SVGNames::k2Attr, - &SVGNames::k3Attr, - &SVGNames::k4Attr, - &SVGNames::kernelMatrixAttr, - &SVGNames::kernelUnitLengthAttr, - &SVGNames::lengthAdjustAttr, - &SVGNames::limitingConeAngleAttr, - &SVGNames::markerHeightAttr, - &SVGNames::markerUnitsAttr, - &SVGNames::markerWidthAttr, - &SVGNames::maskContentUnitsAttr, - &SVGNames::maskUnitsAttr, - &SVGNames::methodAttr, - &SVGNames::modeAttr, - &SVGNames::numOctavesAttr, - &SVGNames::offsetAttr, - &SVGNames::operatorAttr, - &SVGNames::orderAttr, - &SVGNames::orientAttr, - &SVGNames::pathLengthAttr, - &SVGNames::patternContentUnitsAttr, - &SVGNames::patternTransformAttr, - &SVGNames::patternUnitsAttr, - &SVGNames::pointsAtXAttr, - &SVGNames::pointsAtYAttr, - &SVGNames::pointsAtZAttr, - &SVGNames::pointsAttr, - &SVGNames::preserveAlphaAttr, - &SVGNames::preserveAspectRatioAttr, - &SVGNames::primitiveUnitsAttr, - &SVGNames::rAttr, - &SVGNames::radiusAttr, - &SVGNames::refXAttr, - &SVGNames::refYAttr, - &SVGNames::resultAttr, - &SVGNames::rotateAttr, - &SVGNames::rxAttr, - &SVGNames::ryAttr, - &SVGNames::scaleAttr, - &SVGNames::seedAttr, - &SVGNames::slopeAttr, - &SVGNames::spacingAttr, - &SVGNames::specularConstantAttr, - &SVGNames::specularExponentAttr, - &SVGNames::spreadMethodAttr, - &SVGNames::startOffsetAttr, - &SVGNames::stdDeviationAttr, - &SVGNames::stitchTilesAttr, - &SVGNames::surfaceScaleAttr, - &SVGNames::tableValuesAttr, - &SVGNames::targetAttr, - &SVGNames::targetXAttr, - &SVGNames::targetYAttr, - &SVGNames::textLengthAttr, - &SVGNames::transformAttr, - &SVGNames::typeAttr, - &SVGNames::valuesAttr, - &SVGNames::viewBoxAttr, - &SVGNames::widthAttr, - &SVGNames::x1Attr, - &SVGNames::x2Attr, - &SVGNames::xAttr, - &SVGNames::xChannelSelectorAttr, - &SVGNames::y1Attr, - &SVGNames::y2Attr, - &SVGNames::yAttr, - &SVGNames::yChannelSelectorAttr, - &SVGNames::zAttr, - &XLinkNames::hrefAttr, - }; - for (size_t i = 0; i < WTF_ARRAY_LENGTH(attributes); i++) - supportedAttributes.set(*attributes[i], attributes[i]); - } - return supportedAttributes; -} - -const QualifiedName* findSVGAttributeForProperty(const String& property, SVGElement* svgElement) -{ - if (isSVGSMILElement(*svgElement)) - return nullptr; - - QualifiedName attributeName = svgAttributeName(property); - - const AttributeNameMap& supportedAttributes = getSupportedAttributes(); - auto iter = supportedAttributes.find(attributeName); - if (iter == supportedAttributes.end() || !svgElement->propertyFromAttribute(*iter->value)) - return nullptr; - - return iter->value; -} - -} // namespace - EffectModel* EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState) { if (!element) @@ -258,7 +107,7 @@ for (const auto& property : keyframeProperties) { String value; DictionaryHelper::get(keyframeDictionary, property, value); - CSSPropertyID id = AnimationInputHelpers::keyframeAttributeToCSSPropertyID(property); + CSSPropertyID id = AnimationInputHelpers::keyframeAttributeToCSSPropertyID(property, *element); if (id != CSSPropertyInvalid) { keyframe->setPropertyValue(id, value, element, styleSheetContents); continue; @@ -270,12 +119,10 @@ continue; } - if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !element->isSVGElement() || !isSVGPrefixed(property)) - continue; - - const QualifiedName* qualifiedName = findSVGAttributeForProperty(property, toSVGElement(element)); - if (qualifiedName) + const QualifiedName* qualifiedName = AnimationInputHelpers::keyframeAttributeToQualifiedName(property, *element); + if (qualifiedName) { keyframe->setPropertyValue(*qualifiedName, value); + } } }
diff --git a/third_party/WebKit/Source/core/animation/EffectInput.h b/third_party/WebKit/Source/core/animation/EffectInput.h index df4a3273..7b026ed8 100644 --- a/third_party/WebKit/Source/core/animation/EffectInput.h +++ b/third_party/WebKit/Source/core/animation/EffectInput.h
@@ -21,6 +21,7 @@ class CORE_EXPORT EffectInput { STATIC_ONLY(EffectInput); public: + // TODO(alancutter): Replace Element* parameter with Document&. static EffectModel* convert(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&); static EffectModel* convert(Element*, const EffectModelOrDictionarySequenceOrDictionary&, ExceptionState&); };
diff --git a/third_party/WebKit/Source/core/animation/EffectInputTest.cpp b/third_party/WebKit/Source/core/animation/EffectInputTest.cpp index 0b5ba0e9..baf6077 100644 --- a/third_party/WebKit/Source/core/animation/EffectInputTest.cpp +++ b/third_party/WebKit/Source/core/animation/EffectInputTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/EffectInput.h" #include "bindings/core/v8/Dictionary.h"
diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp index 7f62a55..8de58e9 100644 --- a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/ElementAnimations.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/animation/FilterStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/FilterStyleInterpolation.cpp index 32bf8d5..29bee103 100644 --- a/third_party/WebKit/Source/core/animation/FilterStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/FilterStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/FilterStyleInterpolation.h" #include "core/animation/LengthStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/FilterStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/FilterStyleInterpolationTest.cpp index 4393e356..1809922 100644 --- a/third_party/WebKit/Source/core/animation/FilterStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/FilterStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/FilterStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/ImageSliceStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/ImageSliceStyleInterpolation.cpp index 2ca06e1..29029d5 100644 --- a/third_party/WebKit/Source/core/animation/ImageSliceStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/ImageSliceStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/ImageSliceStyleInterpolation.h" #include "core/css/CSSBorderImageSliceValue.h"
diff --git a/third_party/WebKit/Source/core/animation/InertEffect.cpp b/third_party/WebKit/Source/core/animation/InertEffect.cpp index 948853c9..76230ae 100644 --- a/third_party/WebKit/Source/core/animation/InertEffect.cpp +++ b/third_party/WebKit/Source/core/animation/InertEffect.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/InertEffect.h" #include "core/animation/Interpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/InterpolableValue.cpp b/third_party/WebKit/Source/core/animation/InterpolableValue.cpp index 9bf5768..51f49fcc 100644 --- a/third_party/WebKit/Source/core/animation/InterpolableValue.cpp +++ b/third_party/WebKit/Source/core/animation/InterpolableValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/InterpolableValue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp index 9d4ec0c..701ca6d 100644 --- a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp +++ b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/InterpolableValue.h" #include "core/animation/Interpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/Interpolation.cpp b/third_party/WebKit/Source/core/animation/Interpolation.cpp index e18d249..a78379e 100644 --- a/third_party/WebKit/Source/core/animation/Interpolation.cpp +++ b/third_party/WebKit/Source/core/animation/Interpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/Interpolation.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/InterpolationEffect.cpp b/third_party/WebKit/Source/core/animation/InterpolationEffect.cpp index 80028fd2..dd7f3282 100644 --- a/third_party/WebKit/Source/core/animation/InterpolationEffect.cpp +++ b/third_party/WebKit/Source/core/animation/InterpolationEffect.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/InterpolationEffect.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/InterpolationEffectTest.cpp b/third_party/WebKit/Source/core/animation/InterpolationEffectTest.cpp index b76e500..d0d64c2 100644 --- a/third_party/WebKit/Source/core/animation/InterpolationEffectTest.cpp +++ b/third_party/WebKit/Source/core/animation/InterpolationEffectTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/InterpolationEffect.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp b/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp index 052b662..db2f53a 100644 --- a/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/InvalidatableInterpolation.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp index 11ca85fa..43abcbd 100644 --- a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp +++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/KeyframeEffect.h" #include "bindings/core/v8/Dictionary.h"
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp index 817d9ba..74c37247 100644 --- a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp +++ b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/KeyframeEffectModel.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectModelTest.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectModelTest.cpp index af67fb7..3cf2dd4 100644 --- a/third_party/WebKit/Source/core/animation/KeyframeEffectModelTest.cpp +++ b/third_party/WebKit/Source/core/animation/KeyframeEffectModelTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/KeyframeEffectModel.h" #include "core/animation/LegacyStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectTest.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectTest.cpp index c2cd0396..5748aeb 100644 --- a/third_party/WebKit/Source/core/animation/KeyframeEffectTest.cpp +++ b/third_party/WebKit/Source/core/animation/KeyframeEffectTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/KeyframeEffect.h" #include "bindings/core/v8/Dictionary.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolation.cpp index 37b6d2a..280961f 100644 --- a/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthBoxStyleInterpolation.h" #include "core/css/CSSQuadValue.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolationTest.cpp index adebc2e..0f13cc1 100644 --- a/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/LengthBoxStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthBoxStyleInterpolation.h" #include "core/animation/LengthStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolation.cpp index 0361ce27..d4429ee6 100644 --- a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthPairStyleInterpolation.h" #include "core/animation/LengthStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp index c23d630..f732def 100644 --- a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthPairStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthPropertyFunctions.cpp b/third_party/WebKit/Source/core/animation/LengthPropertyFunctions.cpp index 56fde5f3..4d35ecf 100644 --- a/third_party/WebKit/Source/core/animation/LengthPropertyFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/LengthPropertyFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthPropertyFunctions.h" #include "core/style/ComputedStyle.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthSVGInterpolation.cpp b/third_party/WebKit/Source/core/animation/LengthSVGInterpolation.cpp index 4245f0e..a836322 100644 --- a/third_party/WebKit/Source/core/animation/LengthSVGInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/LengthSVGInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthSVGInterpolation.h" #include "core/css/CSSHelper.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/LengthStyleInterpolation.cpp index 5195ba5..fc94fb3 100644 --- a/third_party/WebKit/Source/core/animation/LengthStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/LengthStyleInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthStyleInterpolation.h" #include "core/animation/LengthPropertyFunctions.h"
diff --git a/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp index e6186b7..4968ff3 100644 --- a/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/LengthStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.cpp index af2e0ce..d150cd0 100644 --- a/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/ListInterpolationFunctions.h" #include "core/animation/UnderlyingValue.h"
diff --git a/third_party/WebKit/Source/core/animation/ListStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/ListStyleInterpolationTest.cpp index 3f23b0c..8170203 100644 --- a/third_party/WebKit/Source/core/animation/ListStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/ListStyleInterpolationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/ListStyleInterpolation.h" #include "core/animation/LengthStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/NumberPropertyFunctions.cpp b/third_party/WebKit/Source/core/animation/NumberPropertyFunctions.cpp index 166efd8c..b3a6b43 100644 --- a/third_party/WebKit/Source/core/animation/NumberPropertyFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/NumberPropertyFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/NumberPropertyFunctions.h" #include "core/style/ComputedStyle.h"
diff --git a/third_party/WebKit/Source/core/animation/NumberSVGInterpolation.cpp b/third_party/WebKit/Source/core/animation/NumberSVGInterpolation.cpp index ee46a45f..34f98334 100644 --- a/third_party/WebKit/Source/core/animation/NumberSVGInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/NumberSVGInterpolation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/NumberSVGInterpolation.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/PaintPropertyFunctions.cpp b/third_party/WebKit/Source/core/animation/PaintPropertyFunctions.cpp index fd0efef..f4495bd 100644 --- a/third_party/WebKit/Source/core/animation/PaintPropertyFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/PaintPropertyFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/PaintPropertyFunctions.h" #include "core/css/StyleColor.h"
diff --git a/third_party/WebKit/Source/core/animation/PropertyHandle.cpp b/third_party/WebKit/Source/core/animation/PropertyHandle.cpp index 5c48916..049eb16 100644 --- a/third_party/WebKit/Source/core/animation/PropertyHandle.cpp +++ b/third_party/WebKit/Source/core/animation/PropertyHandle.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/PropertyHandle.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/PropertyHandleTest.cpp b/third_party/WebKit/Source/core/animation/PropertyHandleTest.cpp index c649cf4..9ecb7f1 100644 --- a/third_party/WebKit/Source/core/animation/PropertyHandleTest.cpp +++ b/third_party/WebKit/Source/core/animation/PropertyHandleTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/PropertyHandle.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGAngleInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGAngleInterpolationType.cpp index ddfa8c6d..8a5bde0 100644 --- a/third_party/WebKit/Source/core/animation/SVGAngleInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGAngleInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGAngleInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGIntegerInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGIntegerInterpolationType.cpp index 04aeb89c..5c6ebcd 100644 --- a/third_party/WebKit/Source/core/animation/SVGIntegerInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGIntegerInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGIntegerInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGIntegerOptionalIntegerInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGIntegerOptionalIntegerInterpolationType.cpp index e250521d..f63e096 100644 --- a/third_party/WebKit/Source/core/animation/SVGIntegerOptionalIntegerInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGIntegerOptionalIntegerInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGIntegerOptionalIntegerInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGInterpolationType.cpp index 80d9753..7a05d3a 100644 --- a/third_party/WebKit/Source/core/animation/SVGInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp index 98da652..e5ccf7eb 100644 --- a/third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGLengthInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGNumberInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGNumberInterpolationType.cpp index 8b561b84..6a4369d 100644 --- a/third_party/WebKit/Source/core/animation/SVGNumberInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGNumberInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGNumberInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp index 95da7cd..640fb93 100644 --- a/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGNumberListInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGNumberOptionalNumberInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGNumberOptionalNumberInterpolationType.cpp index 4d90fdea..6612f4a 100644 --- a/third_party/WebKit/Source/core/animation/SVGNumberOptionalNumberInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGNumberOptionalNumberInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGNumberOptionalNumberInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGPathInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGPathInterpolationType.cpp index 6dfafe2..e44c6f4 100644 --- a/third_party/WebKit/Source/core/animation/SVGPathInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGPathInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGPathInterpolationType.h" #include "core/animation/InterpolatedSVGPathSource.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp index 604411e..8526c8b 100644 --- a/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGPathSegInterpolationFunctions.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/SVGPointListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGPointListInterpolationType.cpp index 532a8c3..b63f9539 100644 --- a/third_party/WebKit/Source/core/animation/SVGPointListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGPointListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGPointListInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGRectInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGRectInterpolationType.cpp index 2cad227a..9b94e40 100644 --- a/third_party/WebKit/Source/core/animation/SVGRectInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGRectInterpolationType.cpp
@@ -1,7 +1,6 @@ // Copyright 2015 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGRectInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp index f557fa30..34ad24d 100644 --- a/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGTransformListInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGTransformListInterpolationType.h" #include "core/animation/InterpolableValue.h"
diff --git a/third_party/WebKit/Source/core/animation/SVGValueInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGValueInterpolationType.cpp index 49e4bc7..04e8628 100644 --- a/third_party/WebKit/Source/core/animation/SVGValueInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/SVGValueInterpolationType.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SVGValueInterpolationType.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/SampledEffect.cpp b/third_party/WebKit/Source/core/animation/SampledEffect.cpp index 06a29fd..dce57b16 100644 --- a/third_party/WebKit/Source/core/animation/SampledEffect.cpp +++ b/third_party/WebKit/Source/core/animation/SampledEffect.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/SampledEffect.h" #include "core/animation/InterpolationEnvironment.h"
diff --git a/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.cpp index ef4da31b..69c3350 100644 --- a/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.cpp +++ b/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/ShadowInterpolationFunctions.h" #include "core/animation/CSSColorInterpolationType.h"
diff --git a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp index 20b7a31..5e59085 100644 --- a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp +++ b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/StringKeyframe.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/animation/Timing.cpp b/third_party/WebKit/Source/core/animation/Timing.cpp index c854eb8..8e582054 100644 --- a/third_party/WebKit/Source/core/animation/Timing.cpp +++ b/third_party/WebKit/Source/core/animation/Timing.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/Timing.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp index fdc8a99..06ca2a9 100644 --- a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp +++ b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/TimingCalculations.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/TimingInput.cpp b/third_party/WebKit/Source/core/animation/TimingInput.cpp index 0e03462b..5cb20890 100644 --- a/third_party/WebKit/Source/core/animation/TimingInput.cpp +++ b/third_party/WebKit/Source/core/animation/TimingInput.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/TimingInput.h" #include "core/animation/AnimationInputHelpers.h"
diff --git a/third_party/WebKit/Source/core/animation/TimingInputTest.cpp b/third_party/WebKit/Source/core/animation/TimingInputTest.cpp index 8304d90..1b3844fb 100644 --- a/third_party/WebKit/Source/core/animation/TimingInputTest.cpp +++ b/third_party/WebKit/Source/core/animation/TimingInputTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/TimingInput.h" #include "bindings/core/v8/V8BindingForTesting.h"
diff --git a/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolation.cpp index 1246d68..5189691 100644 --- a/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolation.cpp +++ b/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolation.cpp
@@ -1,4 +1,3 @@ -#include "config.h" #include "core/animation/VisibilityStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolationTest.cpp index c233595..95a1535 100644 --- a/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolationTest.cpp +++ b/third_party/WebKit/Source/core/animation/VisibilityStyleInterpolationTest.cpp
@@ -1,4 +1,3 @@ -#include "config.h" #include "core/animation/VisibilityStyleInterpolation.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp index 63c7a709..052a782 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableClipPathOperation.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp index dc3d990c..2880b6c 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableColor.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableColorTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableColorTest.cpp index c2d472a77..6a3ef01 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableColorTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableColorTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableColor.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDouble.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDouble.cpp index 8f2bb1a..af5724e9 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDouble.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDouble.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableDouble.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp index 54b6fea..a60586f 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/animatable/AnimatableDoubleAndBool.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp index fe306e4..12aef57 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/animatable/AnimatableDoubleAndBool.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleTest.cpp index ad69f387..27c024d2e 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableDouble.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp index 692d8df..93441b32 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableFilterOperations.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableImage.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableImage.cpp index 70be5bd..fdd937f 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableImage.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableImage.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableImage.h" #include "core/css/CSSImageValue.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLength.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLength.cpp index e0e6429..ecc4e5a7 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLength.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLength.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLength.h" #include "platform/CalculationValue.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBox.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBox.cpp index 20a0d00..be07069 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBox.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBox.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLengthBox.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBoxAndBool.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBoxAndBool.cpp index 53dadf3..4d0e073a 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBoxAndBool.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthBoxAndBool.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLengthBoxAndBool.h" #include "core/animation/animatable/AnimatableLength.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint.cpp index b66a4125..3528cfd4 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLengthPoint.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint3D.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint3D.cpp index 0d05ca9..f204e1c 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint3D.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthPoint3D.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLengthPoint3D.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthSize.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthSize.cpp index 5fff41a..7298193 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthSize.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthSize.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableLengthSize.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthTest.cpp index caba8d4b..4d32c22 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableLengthTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/animatable/AnimatableLength.h" #include "platform/CalculationValue.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableNeutralTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableNeutralTest.cpp index cf848a8..8873e3e 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableNeutralTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableNeutralTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableNeutral.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp index e48c1e7b..95bf245b 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/animatable/AnimatablePath.h" #include "core/svg/SVGPathBlender.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.cpp index ce3ed4f..6fa82e9 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableRepeatable.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableRepeatable.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableSVGPaint.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableSVGPaint.cpp index c51be60..56d1c4c 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableSVGPaint.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableSVGPaint.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableSVGPaint.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableShadow.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableShadow.cpp index bf26e23..ba25095d 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableShadow.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableShadow.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableShadow.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableShapeValue.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableShapeValue.cpp index c3c4dd4..43726a4 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableShapeValue.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableShapeValue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableShapeValue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayList.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayList.cpp index 31b4da0..88b615c 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayList.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayList.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableStrokeDasharrayList.h" #include "core/animation/animatable/AnimatableLength.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayListTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayListTest.cpp index 8b23dfad..de9e85d 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayListTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableStrokeDasharrayListTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableStrokeDasharrayList.h" #include "core/style/SVGComputedStyleDefs.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableTransform.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableTransform.cpp index 46bfa93..ed797f0 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableTransform.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableTransform.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableTransform.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableUnknownTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableUnknownTest.cpp index c3cb247..99c6f66 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableUnknownTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableUnknownTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableUnknown.h" #include "core/animation/animatable/AnimatableNeutral.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp index 51388bf..f67cfaf 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableValue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableValue.h" #include "core/animation/animatable/AnimatableNeutral.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueKeyframe.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueKeyframe.cpp index 36c9ba5..73516bc 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueKeyframe.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/animatable/AnimatableValueKeyframe.h" #include "core/animation/LegacyStyleInterpolation.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelper.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelper.cpp index 7e190739..9cb8b3d8 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelper.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelper.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableValueTestHelper.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelperTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelperTest.cpp index f1ff0a2..283ca61a 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelperTest.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableValueTestHelperTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableValueTestHelper.h" #include "core/layout/ClipPathOperation.h"
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp index 3128f60..f0bb4860 100644 --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/animatable/AnimatableVisibility.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp index 67cc56ae..27d1e8f4 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/css/CSSAnimatableValueFactory.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimationData.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimationData.cpp index 07d653a..0c587793 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSAnimationData.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimationData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/css/CSSAnimationData.h" #include "core/animation/Timing.h"
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp index 47268c43..ab3bec8c 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/animation/css/CSSAnimations.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp b/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp index 0e1fb96..a32970b 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSPropertyEquality.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/css/CSSPropertyEquality.h" #include "core/animation/css/CSSAnimations.h"
diff --git a/third_party/WebKit/Source/core/animation/css/CSSTimingData.cpp b/third_party/WebKit/Source/core/animation/css/CSSTimingData.cpp index 837f7bd..7f9619f 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSTimingData.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSTimingData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/css/CSSTimingData.h" #include "core/animation/Timing.h"
diff --git a/third_party/WebKit/Source/core/animation/css/CSSTransitionData.cpp b/third_party/WebKit/Source/core/animation/css/CSSTransitionData.cpp index 19ef51a7..fd2743c 100644 --- a/third_party/WebKit/Source/core/animation/css/CSSTransitionData.cpp +++ b/third_party/WebKit/Source/core/animation/css/CSSTransitionData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/animation/css/CSSTransitionData.h" #include "core/animation/Timing.h"
diff --git a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp index 5928cf6..36ce9e1 100644 --- a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp +++ b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/HTMLNames.h" #include "core/dom/Element.h" #include "core/dom/ElementTraversal.h"
diff --git a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp index 50bc0e3..35e433c1 100644 --- a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp +++ b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp
@@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/css/BasicShapeFunctions.h" #include "core/css/CSSBasicShapeValues.h"
diff --git a/third_party/WebKit/Source/core/css/BinaryDataFontFaceSource.cpp b/third_party/WebKit/Source/core/css/BinaryDataFontFaceSource.cpp index ceae1d4c..a32be44 100644 --- a/third_party/WebKit/Source/core/css/BinaryDataFontFaceSource.cpp +++ b/third_party/WebKit/Source/core/css/BinaryDataFontFaceSource.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/BinaryDataFontFaceSource.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp b/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp index 6ae78c29..4328051 100644 --- a/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp +++ b/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp
@@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSBasicShapeValues.h" #include "core/css/CSSValuePair.h"
diff --git a/third_party/WebKit/Source/core/css/CSSBorderImage.cpp b/third_party/WebKit/Source/core/css/CSSBorderImage.cpp index fe10c50..d1244391 100644 --- a/third_party/WebKit/Source/core/css/CSSBorderImage.cpp +++ b/third_party/WebKit/Source/core/css/CSSBorderImage.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSBorderImage.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.cpp b/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.cpp index cfbe2733..28076aa 100644 --- a/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSBorderImageSliceValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp index 34375ad8..dfe32bc 100644 --- a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSPrimitiveValueMappings.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValueTest.cpp b/third_party/WebKit/Source/core/css/CSSCalculationValueTest.cpp index c7d2c88..0b0810bc 100644 --- a/third_party/WebKit/Source/core/css/CSSCalculationValueTest.cpp +++ b/third_party/WebKit/Source/core/css/CSSCalculationValueTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSCalculationValue.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp index a6e2fbc1..4d73333 100644 --- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp +++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -21,7 +21,6 @@ * 02110-1301 USA */ -#include "config.h" #include "core/css/CSSComputedStyleDeclaration.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/CSSContentDistributionValue.cpp b/third_party/WebKit/Source/core/css/CSSContentDistributionValue.cpp index d45b9976..bebffa7 100644 --- a/third_party/WebKit/Source/core/css/CSSContentDistributionValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSContentDistributionValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSContentDistributionValue.h" #include "core/css/CSSValueList.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCounterValue.cpp b/third_party/WebKit/Source/core/css/CSSCounterValue.cpp index 3e853d37..e185fe4 100644 --- a/third_party/WebKit/Source/core/css/CSSCounterValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCounterValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSCounterValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp index 6afcd5a5..402e574 100644 --- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSCrossfadeValue.h" #include "core/css/CSSImageValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp index f0ecb5c9..3bc875d 100644 --- a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSCursorImageValue.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCustomIdentValue.cpp b/third_party/WebKit/Source/core/css/CSSCustomIdentValue.cpp index a1a3661..f8f4e3a 100644 --- a/third_party/WebKit/Source/core/css/CSSCustomIdentValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCustomIdentValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSCustomIdentValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.cpp index c6f2b96..b769e9d 100644 --- a/third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.cpp +++ b/third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSCustomPropertyDeclaration.h" #include "core/css/parser/CSSParserTokenRange.h"
diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp index 6eaed6ed..52b293d 100644 --- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp +++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSDefaultStyleSheets.h" #include "core/MathMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.cpp b/third_party/WebKit/Source/core/css/CSSFontFace.cpp index 88c3b37..efd1ee6 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSFontFace.h" #include "core/css/CSSFontFaceSource.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceRule.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceRule.cpp index 174305d2..94954ad 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFaceRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFaceRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSFontFaceRule.h" #include "core/css/PropertySetCSSStyleDeclaration.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp index e0a7cf4c..6a4109d 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSFontFaceSource.h" #include "core/css/CSSFontFace.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp index e572cb7..0b2ceda 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSFontFaceSrcValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceTest.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceTest.cpp index 13fab49..e6abf9e 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFaceTest.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFaceTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSFontFace.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontFeatureValue.cpp b/third_party/WebKit/Source/core/css/CSSFontFeatureValue.cpp index 153c82c..374d377 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFeatureValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFeatureValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSFontFeatureValue.h" #include "wtf/text/StringBuilder.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp index 6eca679..6cadf2e5 100644 --- a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSFontSelector.h" #include "core/css/CSSFontSelectorClient.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFunctionValue.cpp b/third_party/WebKit/Source/core/css/CSSFunctionValue.cpp index 2ce9e4d..9916583 100644 --- a/third_party/WebKit/Source/core/css/CSSFunctionValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSFunctionValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSFunctionValue.h" #include "wtf/text/StringBuilder.h"
diff --git a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp index fe7d3d8..0a763778 100644 --- a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSGradientValue.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/CSSGridLineNamesValue.cpp b/third_party/WebKit/Source/core/css/CSSGridLineNamesValue.cpp index c60421f83..d7ea631 100644 --- a/third_party/WebKit/Source/core/css/CSSGridLineNamesValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSGridLineNamesValue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSGridLineNamesValue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/CSSGridTemplateAreasValue.cpp b/third_party/WebKit/Source/core/css/CSSGridTemplateAreasValue.cpp index cf311f0b..6f65191 100644 --- a/third_party/WebKit/Source/core/css/CSSGridTemplateAreasValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSGridTemplateAreasValue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSGridTemplateAreasValue.h" #include "wtf/text/StringBuilder.h"
diff --git a/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp b/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp index dec9b36..dcfb0f0 100644 --- a/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
@@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSGroupingRule.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp index 1a08049..e97f3d1 100644 --- a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSImageGeneratorValue.h" #include "core/css/CSSCrossfadeValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp index 0395de8..7e25d92 100644 --- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSImageSetValue.h" #include "core/css/CSSImageValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSImageValue.cpp b/third_party/WebKit/Source/core/css/CSSImageValue.cpp index e88af3ad..b8ee78fb 100644 --- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSImageValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSImportRule.cpp b/third_party/WebKit/Source/core/css/CSSImportRule.cpp index e37aae1..213cfa4 100644 --- a/third_party/WebKit/Source/core/css/CSSImportRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSImportRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSImportRule.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/css/CSSInheritedValue.cpp b/third_party/WebKit/Source/core/css/CSSInheritedValue.cpp index 510940f..895514a3 100644 --- a/third_party/WebKit/Source/core/css/CSSInheritedValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSInheritedValue.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSInheritedValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSInitialValue.cpp b/third_party/WebKit/Source/core/css/CSSInitialValue.cpp index 3e2ceec3..460c9620 100644 --- a/third_party/WebKit/Source/core/css/CSSInitialValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSInitialValue.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSInitialValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSKeyframeRule.cpp b/third_party/WebKit/Source/core/css/CSSKeyframeRule.cpp index 048d901..68a2663 100644 --- a/third_party/WebKit/Source/core/css/CSSKeyframeRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSKeyframeRule.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSKeyframeRule.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/CSSKeyframesRule.cpp b/third_party/WebKit/Source/core/css/CSSKeyframesRule.cpp index 788fe88..9dbadee 100644 --- a/third_party/WebKit/Source/core/css/CSSKeyframesRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSKeyframesRule.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSKeyframesRule.h" #include "core/css/CSSKeyframeRule.h"
diff --git a/third_party/WebKit/Source/core/css/CSSMarkup.cpp b/third_party/WebKit/Source/core/css/CSSMarkup.cpp index 8515fca..b9c1fec 100644 --- a/third_party/WebKit/Source/core/css/CSSMarkup.cpp +++ b/third_party/WebKit/Source/core/css/CSSMarkup.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSMarkup.h" #include "wtf/HexNumber.h"
diff --git a/third_party/WebKit/Source/core/css/CSSMatrix.cpp b/third_party/WebKit/Source/core/css/CSSMatrix.cpp index 3d61d7e..4b9c196 100644 --- a/third_party/WebKit/Source/core/css/CSSMatrix.cpp +++ b/third_party/WebKit/Source/core/css/CSSMatrix.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSMatrix.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/CSSMediaRule.cpp b/third_party/WebKit/Source/core/css/CSSMediaRule.cpp index fff5db2..ec671a02 100644 --- a/third_party/WebKit/Source/core/css/CSSMediaRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSMediaRule.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSMediaRule.h" #include "core/css/StyleRule.h"
diff --git a/third_party/WebKit/Source/core/css/CSSNamespaceRule.cpp b/third_party/WebKit/Source/core/css/CSSNamespaceRule.cpp index 6525371..8b62662 100644 --- a/third_party/WebKit/Source/core/css/CSSNamespaceRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSNamespaceRule.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSNamespaceRule.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSPageRule.cpp b/third_party/WebKit/Source/core/css/CSSPageRule.cpp index 993d5755..e608db8 100644 --- a/third_party/WebKit/Source/core/css/CSSPageRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSPageRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSPageRule.h" #include "core/css/CSSSelector.h"
diff --git a/third_party/WebKit/Source/core/css/CSSPathValue.cpp b/third_party/WebKit/Source/core/css/CSSPathValue.cpp index c995671..d455751 100644 --- a/third_party/WebKit/Source/core/css/CSSPathValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSPathValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSPathValue.h" #include "core/svg/SVGPathUtilities.h"
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp index cbbb45b..c7523674 100644 --- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSPrimitiveValue.h" #include "core/css/CSSCalculationValue.h" @@ -184,7 +183,7 @@ static CSSTextCache& cssTextCache() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<CSSTextCacheWrapper>, cache, new ThreadSpecific<CSSTextCacheWrapper>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<CSSTextCacheWrapper>, cache, new ThreadSpecific<CSSTextCacheWrapper>); return *cache; }
diff --git a/third_party/WebKit/Source/core/css/CSSProperty.cpp b/third_party/WebKit/Source/core/css/CSSProperty.cpp index 2b10755..36005d0 100644 --- a/third_party/WebKit/Source/core/css/CSSProperty.cpp +++ b/third_party/WebKit/Source/core/css/CSSProperty.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSProperty.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/CSSPropertySourceData.cpp b/third_party/WebKit/Source/core/css/CSSPropertySourceData.cpp index 305510f..c8ddbcd 100644 --- a/third_party/WebKit/Source/core/css/CSSPropertySourceData.cpp +++ b/third_party/WebKit/Source/core/css/CSSPropertySourceData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSPropertySourceData.h"
diff --git a/third_party/WebKit/Source/core/css/CSSQuadValue.cpp b/third_party/WebKit/Source/core/css/CSSQuadValue.cpp index 2ef2937..5fb5f12 100644 --- a/third_party/WebKit/Source/core/css/CSSQuadValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSQuadValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSQuadValue.h" #include "wtf/text/StringBuilder.h"
diff --git a/third_party/WebKit/Source/core/css/CSSReflectValue.cpp b/third_party/WebKit/Source/core/css/CSSReflectValue.cpp index 85847a1..2551992 100644 --- a/third_party/WebKit/Source/core/css/CSSReflectValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSReflectValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSReflectValue.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSRule.cpp b/third_party/WebKit/Source/core/css/CSSRule.cpp index 8631b5e..3bd73b4b 100644 --- a/third_party/WebKit/Source/core/css/CSSRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSRule.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/css/CSSRuleList.cpp b/third_party/WebKit/Source/core/css/CSSRuleList.cpp index 5a2e44a5..7df88a8 100644 --- a/third_party/WebKit/Source/core/css/CSSRuleList.cpp +++ b/third_party/WebKit/Source/core/css/CSSRuleList.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSRuleList.h" #include "core/css/CSSRule.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp b/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp index 22efa5dc..1065377 100644 --- a/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSSVGDocumentValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp index 4907f87..cc1f4bd1 100644 --- a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp +++ b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSSegmentedFontFace.h" #include "core/css/CSSFontFace.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSelector.cpp b/third_party/WebKit/Source/core/css/CSSSelector.cpp index 47de0758..2910c459 100644 --- a/third_party/WebKit/Source/core/css/CSSSelector.cpp +++ b/third_party/WebKit/Source/core/css/CSSSelector.cpp
@@ -23,7 +23,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSSelector.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp index 23cd25f0..1d5b7b4 100644 --- a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp +++ b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSSelectorList.h" #include "core/css/parser/CSSParserSelector.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSelectorTest.cpp b/third_party/WebKit/Source/core/css/CSSSelectorTest.cpp index 44afc9d45..5713705 100644 --- a/third_party/WebKit/Source/core/css/CSSSelectorTest.cpp +++ b/third_party/WebKit/Source/core/css/CSSSelectorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSTestHelper.h" #include "core/css/RuleSet.h"
diff --git a/third_party/WebKit/Source/core/css/CSSShadowValue.cpp b/third_party/WebKit/Source/core/css/CSSShadowValue.cpp index 8c1f903d..19e899ff 100644 --- a/third_party/WebKit/Source/core/css/CSSShadowValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSShadowValue.cpp
@@ -17,7 +17,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSShadowValue.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSStringValue.cpp b/third_party/WebKit/Source/core/css/CSSStringValue.cpp index 302a6b0..70b5f7ed 100644 --- a/third_party/WebKit/Source/core/css/CSSStringValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSStringValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSStringValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSStyleRule.cpp b/third_party/WebKit/Source/core/css/CSSStyleRule.cpp index 42ca6a7e..1b9d4fb 100644 --- a/third_party/WebKit/Source/core/css/CSSStyleRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSStyleRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSStyleRule.h" #include "core/css/CSSSelector.h"
diff --git a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp index b7461c1..cd14610 100644 --- a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp +++ b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSStyleSheet.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/CSSSupportsRule.cpp b/third_party/WebKit/Source/core/css/CSSSupportsRule.cpp index c291119..d2247f4 100644 --- a/third_party/WebKit/Source/core/css/CSSSupportsRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSSupportsRule.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSSupportsRule.h" #include "core/css/CSSRule.h"
diff --git a/third_party/WebKit/Source/core/css/CSSTestHelper.cpp b/third_party/WebKit/Source/core/css/CSSTestHelper.cpp index 200c4b2..10c1fc61 100644 --- a/third_party/WebKit/Source/core/css/CSSTestHelper.cpp +++ b/third_party/WebKit/Source/core/css/CSSTestHelper.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSTestHelper.h" #include "core/css/CSSRuleList.h"
diff --git a/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.cpp b/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.cpp index 8bde7265..3fa1eea 100644 --- a/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSTimingFunctionValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp index e34b3a6..a3c732e 100644 --- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp +++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSToLengthConversionData.h" #include "core/css/CSSHelper.h"
diff --git a/third_party/WebKit/Source/core/css/CSSURIValue.cpp b/third_party/WebKit/Source/core/css/CSSURIValue.cpp index c0f19c4..b9a388f 100644 --- a/third_party/WebKit/Source/core/css/CSSURIValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSURIValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSURIValue.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/CSSUnicodeRangeValue.cpp b/third_party/WebKit/Source/core/css/CSSUnicodeRangeValue.cpp index 75f3842..76cb95d 100644 --- a/third_party/WebKit/Source/core/css/CSSUnicodeRangeValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSUnicodeRangeValue.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSUnicodeRangeValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSUnsetValue.cpp b/third_party/WebKit/Source/core/css/CSSUnsetValue.cpp index e3e8903..db43ff4a 100644 --- a/third_party/WebKit/Source/core/css/CSSUnsetValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSUnsetValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSUnsetValue.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/css/CSSValue.cpp b/third_party/WebKit/Source/core/css/CSSValue.cpp index 462a560..7068c15e 100644 --- a/third_party/WebKit/Source/core/css/CSSValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/css/CSSValue.h" #include "core/css/CSSBasicShapeValues.h"
diff --git a/third_party/WebKit/Source/core/css/CSSValueList.cpp b/third_party/WebKit/Source/core/css/CSSValueList.cpp index 1648f67..2573fb9 100644 --- a/third_party/WebKit/Source/core/css/CSSValueList.cpp +++ b/third_party/WebKit/Source/core/css/CSSValueList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/CSSValueList.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/CSSValuePair.cpp b/third_party/WebKit/Source/core/css/CSSValuePair.cpp index e5596bd..9356f35 100644 --- a/third_party/WebKit/Source/core/css/CSSValuePair.cpp +++ b/third_party/WebKit/Source/core/css/CSSValuePair.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSValuePair.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/CSSValuePool.cpp b/third_party/WebKit/Source/core/css/CSSValuePool.cpp index 58bdbe0..5ec10a0 100644 --- a/third_party/WebKit/Source/core/css/CSSValuePool.cpp +++ b/third_party/WebKit/Source/core/css/CSSValuePool.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSValuePool.h" #include "core/css/CSSValueList.h"
diff --git a/third_party/WebKit/Source/core/css/CSSVariableData.cpp b/third_party/WebKit/Source/core/css/CSSVariableData.cpp index 0e6a310..75134d96 100644 --- a/third_party/WebKit/Source/core/css/CSSVariableData.cpp +++ b/third_party/WebKit/Source/core/css/CSSVariableData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSVariableData.h" #include "core/css/parser/CSSParserTokenRange.h"
diff --git a/third_party/WebKit/Source/core/css/CSSVariableReferenceValue.cpp b/third_party/WebKit/Source/core/css/CSSVariableReferenceValue.cpp index 76a9565..c9bd7c3a6 100644 --- a/third_party/WebKit/Source/core/css/CSSVariableReferenceValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSVariableReferenceValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/CSSVariableReferenceValue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/CSSViewportRule.cpp b/third_party/WebKit/Source/core/css/CSSViewportRule.cpp index 16a63d1d..00b10878 100644 --- a/third_party/WebKit/Source/core/css/CSSViewportRule.cpp +++ b/third_party/WebKit/Source/core/css/CSSViewportRule.cpp
@@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/css/CSSViewportRule.h" #include "core/css/PropertySetCSSStyleDeclaration.h"
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp index ef53f27..27c3863 100644 --- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp +++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -22,7 +22,6 @@ * 02110-1301 USA */ -#include "config.h" #include "core/css/ComputedStyleCSSValueMapping.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/DOMWindowCSS.cpp b/third_party/WebKit/Source/core/css/DOMWindowCSS.cpp index 8b05f6d03..c145f8a 100644 --- a/third_party/WebKit/Source/core/css/DOMWindowCSS.cpp +++ b/third_party/WebKit/Source/core/css/DOMWindowCSS.cpp
@@ -27,7 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/DOMWindowCSS.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/DocumentFontFaceSet.cpp b/third_party/WebKit/Source/core/css/DocumentFontFaceSet.cpp index a5f2056..a074f10 100644 --- a/third_party/WebKit/Source/core/css/DocumentFontFaceSet.cpp +++ b/third_party/WebKit/Source/core/css/DocumentFontFaceSet.cpp
@@ -23,7 +23,6 @@ * DAMAGE. */ -#include "config.h" #include "core/css/DocumentFontFaceSet.h" #include "core/css/FontFaceSet.h"
diff --git a/third_party/WebKit/Source/core/css/DragUpdateTest.cpp b/third_party/WebKit/Source/core/css/DragUpdateTest.cpp index b05dbe6..411cb99c 100644 --- a/third_party/WebKit/Source/core/css/DragUpdateTest.cpp +++ b/third_party/WebKit/Source/core/css/DragUpdateTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/Element.h" #include "core/dom/StyleEngine.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp index 9cabfb0..a98de1a 100644 --- a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp +++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/ElementRuleCollector.h" #include "core/css/CSSImportRule.h"
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp index 90bb5a9..b9c5417 100644 --- a/third_party/WebKit/Source/core/css/FontFace.cpp +++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/FontFace.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/FontFaceCache.cpp b/third_party/WebKit/Source/core/css/FontFaceCache.cpp index 740419c..20dd619 100644 --- a/third_party/WebKit/Source/core/css/FontFaceCache.cpp +++ b/third_party/WebKit/Source/core/css/FontFaceCache.cpp
@@ -25,7 +25,6 @@ */ -#include "config.h" #include "core/css/FontFaceCache.h" #include "core/css/CSSFontSelector.h"
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp index b802f2f..e8a1e1f 100644 --- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp +++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -23,7 +23,6 @@ * DAMAGE. */ -#include "config.h" #include "core/css/FontFaceSet.h" #include "bindings/core/v8/Dictionary.h"
diff --git a/third_party/WebKit/Source/core/css/FontFaceSetLoadEvent.cpp b/third_party/WebKit/Source/core/css/FontFaceSetLoadEvent.cpp index ffc2d66..16d087c5 100644 --- a/third_party/WebKit/Source/core/css/FontFaceSetLoadEvent.cpp +++ b/third_party/WebKit/Source/core/css/FontFaceSetLoadEvent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/FontFaceSetLoadEvent.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/FontLoader.cpp b/third_party/WebKit/Source/core/css/FontLoader.cpp index 60478cdf..fda44d7 100644 --- a/third_party/WebKit/Source/core/css/FontLoader.cpp +++ b/third_party/WebKit/Source/core/css/FontLoader.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/FontLoader.h" #include "core/css/CSSFontSelector.h"
diff --git a/third_party/WebKit/Source/core/css/FontSize.cpp b/third_party/WebKit/Source/core/css/FontSize.cpp index 0ca51677..21fb046 100644 --- a/third_party/WebKit/Source/core/css/FontSize.cpp +++ b/third_party/WebKit/Source/core/css/FontSize.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/FontSize.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp b/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp index f0d1fe8..eb86dfe 100644 --- a/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp +++ b/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp
@@ -25,7 +25,6 @@ */ -#include "config.h" #include "core/css/FontStyleMatcher.h" #include "core/css/CSSSegmentedFontFace.h"
diff --git a/third_party/WebKit/Source/core/css/KeyframeStyleRuleCSSStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/KeyframeStyleRuleCSSStyleDeclaration.cpp index c806f1a..18c9755 100644 --- a/third_party/WebKit/Source/core/css/KeyframeStyleRuleCSSStyleDeclaration.cpp +++ b/third_party/WebKit/Source/core/css/KeyframeStyleRuleCSSStyleDeclaration.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/KeyframeStyleRuleCSSStyleDeclaration.h" #include "core/css/CSSKeyframeRule.h"
diff --git a/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp b/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp index 5f2733b..59074cf4f 100644 --- a/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp +++ b/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/LocalFontFaceSource.h" #include "platform/fonts/FontCache.h"
diff --git a/third_party/WebKit/Source/core/css/MediaList.cpp b/third_party/WebKit/Source/core/css/MediaList.cpp index fa6542e..2eb049f 100644 --- a/third_party/WebKit/Source/core/css/MediaList.cpp +++ b/third_party/WebKit/Source/core/css/MediaList.cpp
@@ -17,7 +17,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/MediaList.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQuery.cpp b/third_party/WebKit/Source/core/css/MediaQuery.cpp index 8e3ef2e0..204208702 100644 --- a/third_party/WebKit/Source/core/css/MediaQuery.cpp +++ b/third_party/WebKit/Source/core/css/MediaQuery.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/MediaQuery.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp index 161fece..69f2e98 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -27,7 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/MediaQueryEvaluator.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluatorTest.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluatorTest.cpp index 25ee2ce..fc3aa382 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryEvaluatorTest.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluatorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaQueryEvaluator.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp index 46fe8c472..181b0965 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
@@ -27,7 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/MediaQueryExp.h" #include "core/css/parser/CSSParserToken.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryList.cpp b/third_party/WebKit/Source/core/css/MediaQueryList.cpp index abc25f2..abb3cd8 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryList.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryList.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/MediaQueryList.h" #include "core/css/MediaList.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryListListener.cpp b/third_party/WebKit/Source/core/css/MediaQueryListListener.cpp index a6be865..95c0b13 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryListListener.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryListListener.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/MediaQueryListListener.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/MediaQueryListTest.cpp b/third_party/WebKit/Source/core/css/MediaQueryListTest.cpp index ce876454..b703b374 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryListTest.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryListTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaQueryList.h" #include "core/css/MediaList.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp b/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp index 279d6e70..7579d1f 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/MediaQueryMatcher.h" #include "core/css/MediaList.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryMatcherTest.cpp b/third_party/WebKit/Source/core/css/MediaQueryMatcherTest.cpp index 3ce59b6..1d3611e 100644 --- a/third_party/WebKit/Source/core/css/MediaQueryMatcherTest.cpp +++ b/third_party/WebKit/Source/core/css/MediaQueryMatcherTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaQueryMatcher.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQuerySetTest.cpp b/third_party/WebKit/Source/core/css/MediaQuerySetTest.cpp index 19d7f85..a321604 100644 --- a/third_party/WebKit/Source/core/css/MediaQuerySetTest.cpp +++ b/third_party/WebKit/Source/core/css/MediaQuerySetTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaQuery.h" #include "core/css/MediaList.h"
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp index a36c341..bb9746db 100644 --- a/third_party/WebKit/Source/core/css/MediaValues.cpp +++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaValues.h" #include "core/css/CSSHelper.h"
diff --git a/third_party/WebKit/Source/core/css/MediaValuesCached.cpp b/third_party/WebKit/Source/core/css/MediaValuesCached.cpp index b4fd8efd..278f730 100644 --- a/third_party/WebKit/Source/core/css/MediaValuesCached.cpp +++ b/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaValuesCached.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/MediaValuesDynamic.cpp b/third_party/WebKit/Source/core/css/MediaValuesDynamic.cpp index eaf80b50..0ccb8d77 100644 --- a/third_party/WebKit/Source/core/css/MediaValuesDynamic.cpp +++ b/third_party/WebKit/Source/core/css/MediaValuesDynamic.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/MediaValuesDynamic.h" #include "core/css/CSSHelper.h"
diff --git a/third_party/WebKit/Source/core/css/MediaValuesTest.cpp b/third_party/WebKit/Source/core/css/MediaValuesTest.cpp index 789e102..cd5e14bd 100644 --- a/third_party/WebKit/Source/core/css/MediaValuesTest.cpp +++ b/third_party/WebKit/Source/core/css/MediaValuesTest.cpp
@@ -2,7 +2,6 @@ // Copyright 2014 The Chromium Authors. All rights reserved. // found in the LICENSE file. -#include "config.h" #include "core/css/MediaValues.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/css/PageRuleCollector.cpp b/third_party/WebKit/Source/core/css/PageRuleCollector.cpp index a8a2b0b7..da1a6e76 100644 --- a/third_party/WebKit/Source/core/css/PageRuleCollector.cpp +++ b/third_party/WebKit/Source/core/css/PageRuleCollector.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/PageRuleCollector.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp index 60dfabca..4efa6e3e 100644 --- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp +++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/PropertySetCSSStyleDeclaration.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp index 6a91ef5..e1c3423 100644 --- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp +++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/RemoteFontFaceSource.h" #include "core/css/CSSCustomFontData.h"
diff --git a/third_party/WebKit/Source/core/css/RuleFeature.cpp b/third_party/WebKit/Source/core/css/RuleFeature.cpp index d1239bc0..76f9b60c 100644 --- a/third_party/WebKit/Source/core/css/RuleFeature.cpp +++ b/third_party/WebKit/Source/core/css/RuleFeature.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/RuleFeature.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/RuleFeatureSetTest.cpp b/third_party/WebKit/Source/core/css/RuleFeatureSetTest.cpp index 83a0f646..4bf74af 100644 --- a/third_party/WebKit/Source/core/css/RuleFeatureSetTest.cpp +++ b/third_party/WebKit/Source/core/css/RuleFeatureSetTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/RuleFeature.h" #include "core/css/CSSSelectorList.h"
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp index b37c2b00..7839eba7 100644 --- a/third_party/WebKit/Source/core/css/RuleSet.cpp +++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/RuleSet.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/RuleSetTest.cpp b/third_party/WebKit/Source/core/css/RuleSetTest.cpp index c0189bcf..149afb806f 100644 --- a/third_party/WebKit/Source/core/css/RuleSetTest.cpp +++ b/third_party/WebKit/Source/core/css/RuleSetTest.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/RuleSet.h" #include "core/css/CSSTestHelper.h"
diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.cpp b/third_party/WebKit/Source/core/css/SelectorChecker.cpp index 4740117..059d75bd9 100644 --- a/third_party/WebKit/Source/core/css/SelectorChecker.cpp +++ b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/SelectorChecker.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/SelectorFilter.cpp b/third_party/WebKit/Source/core/css/SelectorFilter.cpp index 9fba0f6..2b4c9800 100644 --- a/third_party/WebKit/Source/core/css/SelectorFilter.cpp +++ b/third_party/WebKit/Source/core/css/SelectorFilter.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/SelectorFilter.h" #include "core/css/CSSSelector.h"
diff --git a/third_party/WebKit/Source/core/css/StyleColor.cpp b/third_party/WebKit/Source/core/css/StyleColor.cpp index f153d9a..05e74e3 100644 --- a/third_party/WebKit/Source/core/css/StyleColor.cpp +++ b/third_party/WebKit/Source/core/css/StyleColor.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/StyleColor.h" #include "core/layout/LayoutTheme.h"
diff --git a/third_party/WebKit/Source/core/css/StyleMedia.cpp b/third_party/WebKit/Source/core/css/StyleMedia.cpp index 22073480..570ced1 100644 --- a/third_party/WebKit/Source/core/css/StyleMedia.cpp +++ b/third_party/WebKit/Source/core/css/StyleMedia.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/StyleMedia.h" #include "core/css/MediaList.h"
diff --git a/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp b/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp index a38e538..c6351aea 100644 --- a/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp +++ b/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StylePropertySerializer.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/StylePropertySet.cpp b/third_party/WebKit/Source/core/css/StylePropertySet.cpp index 8dcf0ed..04da3ec 100644 --- a/third_party/WebKit/Source/core/css/StylePropertySet.cpp +++ b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StylePropertySet.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp b/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp index 2b05b02..d91cbb3 100644 --- a/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp +++ b/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/StylePropertyShorthand.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/StyleRule.cpp b/third_party/WebKit/Source/core/css/StyleRule.cpp index c7878768..7ff3eff76 100644 --- a/third_party/WebKit/Source/core/css/StyleRule.cpp +++ b/third_party/WebKit/Source/core/css/StyleRule.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StyleRule.h" #include "core/css/CSSFontFaceRule.h"
diff --git a/third_party/WebKit/Source/core/css/StyleRuleImport.cpp b/third_party/WebKit/Source/core/css/StyleRuleImport.cpp index 90eddf98..cc09ce7 100644 --- a/third_party/WebKit/Source/core/css/StyleRuleImport.cpp +++ b/third_party/WebKit/Source/core/css/StyleRuleImport.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StyleRuleImport.h" #include "core/css/StyleSheetContents.h"
diff --git a/third_party/WebKit/Source/core/css/StyleRuleKeyframe.cpp b/third_party/WebKit/Source/core/css/StyleRuleKeyframe.cpp index d2d1b44..c49fdd6 100644 --- a/third_party/WebKit/Source/core/css/StyleRuleKeyframe.cpp +++ b/third_party/WebKit/Source/core/css/StyleRuleKeyframe.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/StyleRuleKeyframe.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/css/StyleSheet.cpp b/third_party/WebKit/Source/core/css/StyleSheet.cpp index 4847413..e547835 100644 --- a/third_party/WebKit/Source/core/css/StyleSheet.cpp +++ b/third_party/WebKit/Source/core/css/StyleSheet.cpp
@@ -17,7 +17,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StyleSheet.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/StyleSheetContents.cpp b/third_party/WebKit/Source/core/css/StyleSheetContents.cpp index 4d9fd42..75f6e69 100644 --- a/third_party/WebKit/Source/core/css/StyleSheetContents.cpp +++ b/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StyleSheetContents.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/css/StyleSheetList.cpp b/third_party/WebKit/Source/core/css/StyleSheetList.cpp index 79a7e18..07210e87 100644 --- a/third_party/WebKit/Source/core/css/StyleSheetList.cpp +++ b/third_party/WebKit/Source/core/css/StyleSheetList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/StyleSheetList.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/cssom/KeywordValue.cpp b/third_party/WebKit/Source/core/css/cssom/KeywordValue.cpp index e4428945..ac5452af 100644 --- a/third_party/WebKit/Source/core/css/cssom/KeywordValue.cpp +++ b/third_party/WebKit/Source/core/css/cssom/KeywordValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/cssom/KeywordValue.h" #include "wtf/HashMap.h"
diff --git a/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp b/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp index 7cd23cb2..77302ef 100644 --- a/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp +++ b/third_party/WebKit/Source/core/css/cssom/LengthValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/cssom/LengthValue.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/css/cssom/StyleValue.cpp b/third_party/WebKit/Source/core/css/cssom/StyleValue.cpp index edcfebb..c2eef7e 100644 --- a/third_party/WebKit/Source/core/css/cssom/StyleValue.cpp +++ b/third_party/WebKit/Source/core/css/cssom/StyleValue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/cssom/StyleValue.h" #include "bindings/core/v8/ScriptValue.h"
diff --git a/third_party/WebKit/Source/core/css/invalidation/InvalidationData.cpp b/third_party/WebKit/Source/core/css/invalidation/InvalidationData.cpp index 2d9c084c..3700a81 100644 --- a/third_party/WebKit/Source/core/css/invalidation/InvalidationData.cpp +++ b/third_party/WebKit/Source/core/css/invalidation/InvalidationData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/invalidation/InvalidationData.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp index 1eff1df..e03ce1e4 100644 --- a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp +++ b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/invalidation/InvalidationSet.h" #include "core/css/resolver/StyleResolver.h"
diff --git a/third_party/WebKit/Source/core/css/invalidation/InvalidationSetTest.cpp b/third_party/WebKit/Source/core/css/invalidation/InvalidationSetTest.cpp index 79523e5..98cef08 100644 --- a/third_party/WebKit/Source/core/css/invalidation/InvalidationSetTest.cpp +++ b/third_party/WebKit/Source/core/css/invalidation/InvalidationSetTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/invalidation/InvalidationSet.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp index 6cd632a..962a8ae 100644 --- a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp +++ b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/css/invalidation/StyleInvalidator.h" #include "core/css/invalidation/InvalidationSet.h" @@ -69,8 +67,11 @@ PendingInvalidations& pendingInvalidations = ensurePendingInvalidations(element); if (element.nextSibling()) { - for (auto& invalidationSet : invalidationLists.siblings) + for (auto& invalidationSet : invalidationLists.siblings) { + if (pendingInvalidations.siblings().contains(invalidationSet)) + continue; pendingInvalidations.siblings().append(invalidationSet); + } } if (!requiresDescendantInvalidation) @@ -78,8 +79,11 @@ for (auto& invalidationSet : invalidationLists.descendants) { ASSERT(!invalidationSet->wholeSubtreeInvalid()); - if (!invalidationSet->isEmpty()) - pendingInvalidations.descendants().append(invalidationSet); + if (invalidationSet->isEmpty()) + continue; + if (pendingInvalidations.descendants().contains(invalidationSet)) + continue; + pendingInvalidations.descendants().append(invalidationSet); } }
diff --git a/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp b/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp index 893bef0..05b7df01 100644 --- a/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp +++ b/third_party/WebKit/Source/core/css/invalidation/StyleSheetInvalidationAnalysis.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/invalidation/StyleSheetInvalidationAnalysis.h" #include "core/css/CSSSelectorList.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSAtRuleID.cpp b/third_party/WebKit/Source/core/css/parser/CSSAtRuleID.cpp index 852fbcde..9276fbc 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSAtRuleID.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSAtRuleID.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSAtRuleID.h" #include "core/css/parser/CSSParserString.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSParser.cpp index 289ba57f..97f94ae 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParser.h" #include "core/css/CSSColorValue.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp index e16992d..9104ecc 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParserFastPaths.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp index a7f252e0..95e2f4a 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParserImpl.h" #include "core/css/CSSCustomPropertyDeclaration.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp index 0525e62..e377644c 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/parser/CSSParserMode.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserObserverWrapper.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserObserverWrapper.cpp index cb15da3..14a6ab3 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserObserverWrapper.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserObserverWrapper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParserObserverWrapper.h" #include "core/css/parser/CSSParserTokenRange.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp index 10d96a830..d01df94 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/parser/CSSParserSelector.h" #include "core/css/CSSSelectorList.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp index b131a94..5101465 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParserToken.h" #include "core/css/CSSMarkup.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp index 26747a9..7381a7c 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSParserTokenRange.h" #include "wtf/StaticConstructors.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp index 8067977..3aa4fe6 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/parser/CSSParserValues.h" #include "core/css/CSSFunctionValue.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserValuesTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserValuesTest.cpp index 546ffe52..02944863 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSParserValuesTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSParserValuesTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/parser/CSSParserValues.h" #include "core/css/parser/CSSParserTokenRange.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp index f73940f..12646019 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSPropertyParser.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserTest.cpp index c73ef9f..55f8f208 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSPropertyParser.h" #include "core/css/CSSValueList.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp index 564b31d..bfd0f9f 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSSelectorParser.h" #include "core/css/CSSSelectorList.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParserTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParserTest.cpp index 36fafa0..6596b844 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParserTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSSelectorParser.h" #include "core/css/CSSSelectorList.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSSupportsParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSupportsParser.cpp index 9b117be0..7764bff 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSSupportsParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSSupportsParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSSupportsParser.h" #include "core/css/parser/CSSParserImpl.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp index fcf22b2..31109d9e 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSTokenizer.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizerInputStream.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizerInputStream.cpp index 6544e7f..e0768df 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSTokenizerInputStream.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizerInputStream.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSTokenizerInputStream.h" #include "core/css/parser/CSSParserString.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp index 567aa11..546ed808 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSTokenizer.h" #include "core/css/parser/CSSParserTokenRange.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp index 87738009..297ff31 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/CSSVariableParser.h" #include "core/css/CSSCustomPropertyDeclaration.h"
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp index 4de1c36..57f492a 100644 --- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/parser/CSSPropertyParser.h" #include "core/StylePropertyShorthand.h"
diff --git a/third_party/WebKit/Source/core/css/parser/MediaConditionTest.cpp b/third_party/WebKit/Source/core/css/parser/MediaConditionTest.cpp index 0bad5458..029e44c 100644 --- a/third_party/WebKit/Source/core/css/parser/MediaConditionTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/MediaConditionTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/css/MediaList.h" #include "core/css/MediaQuery.h" #include "core/css/parser/CSSTokenizer.h"
diff --git a/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp b/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp index fd660ff7..b07bce97 100644 --- a/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp +++ b/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/MediaQueryBlockWatcher.h" #include "core/css/parser/CSSParserToken.h"
diff --git a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp index 4f1a03b..f1f8287 100644 --- a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/MediaQueryParser.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp b/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp index 6d2df6e..4b30ad1 100644 --- a/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/SizesAttributeParser.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/parser/SizesAttributeParserTest.cpp b/third_party/WebKit/Source/core/css/parser/SizesAttributeParserTest.cpp index 2f43208..433d3229 100644 --- a/third_party/WebKit/Source/core/css/parser/SizesAttributeParserTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/SizesAttributeParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/SizesAttributeParser.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/parser/SizesCalcParser.cpp b/third_party/WebKit/Source/core/css/parser/SizesCalcParser.cpp index 1713441..4dd16c9a 100644 --- a/third_party/WebKit/Source/core/css/parser/SizesCalcParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/SizesCalcParser.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/SizesCalcParser.h" #include "core/css/MediaValues.h"
diff --git a/third_party/WebKit/Source/core/css/parser/SizesCalcParserTest.cpp b/third_party/WebKit/Source/core/css/parser/SizesCalcParserTest.cpp index 037a5303..7348ff2 100644 --- a/third_party/WebKit/Source/core/css/parser/SizesCalcParserTest.cpp +++ b/third_party/WebKit/Source/core/css/parser/SizesCalcParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/parser/SizesCalcParser.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyDescriptor.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyDescriptor.cpp index 244b7cd2..28b75d53 100644 --- a/third_party/WebKit/Source/core/css/properties/CSSPropertyDescriptor.cpp +++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyDescriptor.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/properties/CSSPropertyDescriptor.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp index 8b8a148..e02bf93 100644 --- a/third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp +++ b/third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/resolver/AnimatedStyleBuilder.h" #include "core/animation/animatable/AnimatableClipPathOperation.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp index dba82c86..cdc394c 100644 --- a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp +++ b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/CSSToStyleMap.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp index b22cb6b..73284bf 100644 --- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp +++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/resolver/CSSVariableResolver.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp b/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp index 409465b2..7d8720e 100644 --- a/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp +++ b/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "core/css/resolver/ElementResolveContext.h" #include "core/dom/LayoutTreeBuilderTraversal.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp index 19b0184c..19c2824a 100644 --- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp +++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/css/resolver/ElementStyleResources.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp index c4a35e0..dcd1e5a 100644 --- a/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp +++ b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/FilterOperationResolver.h" #include "core/css/CSSFunctionValue.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp index 767f762f4..6dcfc217 100644 --- a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp +++ b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/css/resolver/FontBuilder.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilderTest.cpp b/third_party/WebKit/Source/core/css/resolver/FontBuilderTest.cpp index 291ca14..35d968a3 100644 --- a/third_party/WebKit/Source/core/css/resolver/FontBuilderTest.cpp +++ b/third_party/WebKit/Source/core/css/resolver/FontBuilderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/resolver/FontBuilder.h" #include "core/css/CSSFontSelector.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/MatchResult.cpp b/third_party/WebKit/Source/core/css/resolver/MatchResult.cpp index bbd768c..8a25c4e 100644 --- a/third_party/WebKit/Source/core/css/resolver/MatchResult.cpp +++ b/third_party/WebKit/Source/core/css/resolver/MatchResult.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/MatchResult.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/MatchResultTest.cpp b/third_party/WebKit/Source/core/css/resolver/MatchResultTest.cpp index 5b72c2e..c475ff5 100644 --- a/third_party/WebKit/Source/core/css/resolver/MatchResultTest.cpp +++ b/third_party/WebKit/Source/core/css/resolver/MatchResultTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/css/resolver/MatchResult.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/MatchedPropertiesCache.cpp b/third_party/WebKit/Source/core/css/resolver/MatchedPropertiesCache.cpp index fb94762..87dd602 100644 --- a/third_party/WebKit/Source/core/css/resolver/MatchedPropertiesCache.cpp +++ b/third_party/WebKit/Source/core/css/resolver/MatchedPropertiesCache.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/MatchedPropertiesCache.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp index d42cda2..101fcdf1 100644 --- a/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp +++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp
@@ -24,7 +24,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/resolver/ScopedStyleResolver.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp index ff251b5a..0f993d8 100644 --- a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp +++ b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/SharedStyleFinder.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp index e129549..406d71f 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/StyleAdjuster.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp index 9868c42..4ca4f2a 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/resolver/StyleBuilderConverter.h" #include "core/css/BasicShapeFunctions.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp index 015b87d5..92b2c77 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -36,8 +36,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/CSSPropertyNames.h" #include "core/CSSValueKeywords.h" #include "core/StyleBuilderFunctions.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp index 596e887..92e8830 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/StyleResolver.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverParentScope.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverParentScope.cpp index 76cae0e..9f04d603 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleResolverParentScope.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverParentScope.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/css/resolver/StyleResolverParentScope.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp index 1ea4bed7..2b8d923 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "core/css/resolver/StyleResolverState.h" #include "core/animation/css/CSSAnimations.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverStats.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverStats.cpp index 7076fe5..5572b87 100644 --- a/third_party/WebKit/Source/core/css/resolver/StyleResolverStats.cpp +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverStats.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/css/resolver/StyleResolverStats.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp index f6fdbc1..76d484f 100644 --- a/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp +++ b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/css/resolver/TransformBuilder.h" #include "core/css/CSSFunctionValue.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp index 5d47d3a..642508c 100644 --- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp +++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/css/resolver/ViewportStyleResolver.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/dom/AXObjectCache.cpp b/third_party/WebKit/Source/core/dom/AXObjectCache.cpp index fdafa02..60580af1 100644 --- a/third_party/WebKit/Source/core/dom/AXObjectCache.cpp +++ b/third_party/WebKit/Source/core/dom/AXObjectCache.cpp
@@ -26,8 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/AXObjectCache.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp b/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp index be89af3..f31c7a4 100644 --- a/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp +++ b/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/ActiveDOMObject.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/ActiveDOMObjectTest.cpp b/third_party/WebKit/Source/core/dom/ActiveDOMObjectTest.cpp index 4ff6770..f9589d4 100644 --- a/third_party/WebKit/Source/core/dom/ActiveDOMObjectTest.cpp +++ b/third_party/WebKit/Source/core/dom/ActiveDOMObjectTest.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/Document.h" #include "core/testing/DummyPageHolder.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/WebKit/Source/core/dom/AddConsoleMessageTask.cpp b/third_party/WebKit/Source/core/dom/AddConsoleMessageTask.cpp index 5b44bdf..66d680cf7 100644 --- a/third_party/WebKit/Source/core/dom/AddConsoleMessageTask.cpp +++ b/third_party/WebKit/Source/core/dom/AddConsoleMessageTask.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/AddConsoleMessageTask.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/Attr.cpp b/third_party/WebKit/Source/core/dom/Attr.cpp index 28fbb46..60369bc3 100644 --- a/third_party/WebKit/Source/core/dom/Attr.cpp +++ b/third_party/WebKit/Source/core/dom/Attr.cpp
@@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "config.h" + #include "core/dom/Attr.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/AttrTest.cpp b/third_party/WebKit/Source/core/dom/AttrTest.cpp index 842f435..101ce88 100644 --- a/third_party/WebKit/Source/core/dom/AttrTest.cpp +++ b/third_party/WebKit/Source/core/dom/AttrTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/Attr.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/CDATASection.cpp b/third_party/WebKit/Source/core/dom/CDATASection.cpp index e8b84995..1cfc95c 100644 --- a/third_party/WebKit/Source/core/dom/CDATASection.cpp +++ b/third_party/WebKit/Source/core/dom/CDATASection.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/CDATASection.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/CSSSelectorWatch.cpp b/third_party/WebKit/Source/core/dom/CSSSelectorWatch.cpp index 17943a6..b837585 100644 --- a/third_party/WebKit/Source/core/dom/CSSSelectorWatch.cpp +++ b/third_party/WebKit/Source/core/dom/CSSSelectorWatch.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/CSSSelectorWatch.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/dom/CharacterData.cpp b/third_party/WebKit/Source/core/dom/CharacterData.cpp index 90b06a7..d2e1a60f 100644 --- a/third_party/WebKit/Source/core/dom/CharacterData.cpp +++ b/third_party/WebKit/Source/core/dom/CharacterData.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/CharacterData.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp b/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp index 6a2429e..49a006a 100644 --- a/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp +++ b/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/ChildFrameDisconnector.h" #include "core/dom/shadow/ElementShadow.h"
diff --git a/third_party/WebKit/Source/core/dom/ChildListMutationScope.cpp b/third_party/WebKit/Source/core/dom/ChildListMutationScope.cpp index b57945e..94d5715 100644 --- a/third_party/WebKit/Source/core/dom/ChildListMutationScope.cpp +++ b/third_party/WebKit/Source/core/dom/ChildListMutationScope.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ChildListMutationScope.h" #include "core/dom/MutationObserverInterestGroup.h"
diff --git a/third_party/WebKit/Source/core/dom/ChildNodeList.cpp b/third_party/WebKit/Source/core/dom/ChildNodeList.cpp index 390567b..2477ce1 100644 --- a/third_party/WebKit/Source/core/dom/ChildNodeList.cpp +++ b/third_party/WebKit/Source/core/dom/ChildNodeList.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/ChildNodeList.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/ClassCollection.cpp b/third_party/WebKit/Source/core/dom/ClassCollection.cpp index 051af1f..2a55cb2 100644 --- a/third_party/WebKit/Source/core/dom/ClassCollection.cpp +++ b/third_party/WebKit/Source/core/dom/ClassCollection.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ClassCollection.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/ClientRect.cpp b/third_party/WebKit/Source/core/dom/ClientRect.cpp index b550fbb..da6f663 100644 --- a/third_party/WebKit/Source/core/dom/ClientRect.cpp +++ b/third_party/WebKit/Source/core/dom/ClientRect.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/ClientRect.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/ClientRectList.cpp b/third_party/WebKit/Source/core/dom/ClientRectList.cpp index 2e2dbd8..911d84d 100644 --- a/third_party/WebKit/Source/core/dom/ClientRectList.cpp +++ b/third_party/WebKit/Source/core/dom/ClientRectList.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/ClientRectList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/Comment.cpp b/third_party/WebKit/Source/core/dom/Comment.cpp index 371c3ce3..bbe68cfb 100644 --- a/third_party/WebKit/Source/core/dom/Comment.cpp +++ b/third_party/WebKit/Source/core/dom/Comment.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Comment.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxiedPropertySet.cpp b/third_party/WebKit/Source/core/dom/CompositorProxiedPropertySet.cpp index 8f6a458..90a49300 100644 --- a/third_party/WebKit/Source/core/dom/CompositorProxiedPropertySet.cpp +++ b/third_party/WebKit/Source/core/dom/CompositorProxiedPropertySet.cpp
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/CompositorProxiedPropertySet.h" + #include "wtf/PassOwnPtr.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp index a133bc3..3a5676c 100644 --- a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/CompositorProxy.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.cpp b/third_party/WebKit/Source/core/dom/ContainerNode.cpp index bcc1d15d..1e2fe05d 100644 --- a/third_party/WebKit/Source/core/dom/ContainerNode.cpp +++ b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/ContainerNode.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/ContextFeatures.cpp b/third_party/WebKit/Source/core/dom/ContextFeatures.cpp index 33c0c9eb..fb28796 100644 --- a/third_party/WebKit/Source/core/dom/ContextFeatures.cpp +++ b/third_party/WebKit/Source/core/dom/ContextFeatures.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ContextFeatures.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp b/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp index 68f61ba..840b2fc 100644 --- a/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp +++ b/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/ContextLifecycleNotifier.h" #include "core/dom/ActiveDOMObject.h"
diff --git a/third_party/WebKit/Source/core/dom/CrossThreadTaskTest.cpp b/third_party/WebKit/Source/core/dom/CrossThreadTaskTest.cpp index 2a74e26..275afde 100644 --- a/third_party/WebKit/Source/core/dom/CrossThreadTaskTest.cpp +++ b/third_party/WebKit/Source/core/dom/CrossThreadTaskTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/CrossThreadTask.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMArrayBuffer.cpp b/third_party/WebKit/Source/core/dom/DOMArrayBuffer.cpp index 0611241..5c6739a 100644 --- a/third_party/WebKit/Source/core/dom/DOMArrayBuffer.cpp +++ b/third_party/WebKit/Source/core/dom/DOMArrayBuffer.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMArrayBuffer.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMArrayPiece.cpp b/third_party/WebKit/Source/core/dom/DOMArrayPiece.cpp index 5e343a9..bdf69e975 100644 --- a/third_party/WebKit/Source/core/dom/DOMArrayPiece.cpp +++ b/third_party/WebKit/Source/core/dom/DOMArrayPiece.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMArrayPiece.h" #include "bindings/core/v8/UnionTypesCore.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMDataView.cpp b/third_party/WebKit/Source/core/dom/DOMDataView.cpp index a02e3a8..54672480 100644 --- a/third_party/WebKit/Source/core/dom/DOMDataView.cpp +++ b/third_party/WebKit/Source/core/dom/DOMDataView.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMDataView.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMError.cpp b/third_party/WebKit/Source/core/dom/DOMError.cpp index 4f2a7be0..96c92a9e 100644 --- a/third_party/WebKit/Source/core/dom/DOMError.cpp +++ b/third_party/WebKit/Source/core/dom/DOMError.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMError.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMException.cpp b/third_party/WebKit/Source/core/dom/DOMException.cpp index 4289a554..a8b1414e 100644 --- a/third_party/WebKit/Source/core/dom/DOMException.cpp +++ b/third_party/WebKit/Source/core/dom/DOMException.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMException.h" #include "core/dom/ExceptionCode.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp index fccfbfd..deb1c134 100644 --- a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp +++ b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DOMImplementation.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMImplementationTest.cpp b/third_party/WebKit/Source/core/dom/DOMImplementationTest.cpp index 797b569..c28d514f 100644 --- a/third_party/WebKit/Source/core/dom/DOMImplementationTest.cpp +++ b/third_party/WebKit/Source/core/dom/DOMImplementationTest.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMImplementation.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp index 76811ec..f5c727a 100644 --- a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp +++ b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMMatrix.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp index aed65e3..21b0df1 100644 --- a/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp +++ b/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMMatrix.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMNodeIds.cpp b/third_party/WebKit/Source/core/dom/DOMNodeIds.cpp index 958c095..25e5809 100644 --- a/third_party/WebKit/Source/core/dom/DOMNodeIds.cpp +++ b/third_party/WebKit/Source/core/dom/DOMNodeIds.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMNodeIds.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMPoint.cpp b/third_party/WebKit/Source/core/dom/DOMPoint.cpp index 4f28b38..757c292 100644 --- a/third_party/WebKit/Source/core/dom/DOMPoint.cpp +++ b/third_party/WebKit/Source/core/dom/DOMPoint.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMPoint.h" #include "core/dom/DOMPointInit.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp index 64f8647..b7b6bd08 100644 --- a/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp +++ b/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMPointReadOnly.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMRect.cpp b/third_party/WebKit/Source/core/dom/DOMRect.cpp index c486468..5e4ae8e 100644 --- a/third_party/WebKit/Source/core/dom/DOMRect.cpp +++ b/third_party/WebKit/Source/core/dom/DOMRect.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMRect.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMRectReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMRectReadOnly.cpp index f6de5c4c..e776f52 100644 --- a/third_party/WebKit/Source/core/dom/DOMRectReadOnly.cpp +++ b/third_party/WebKit/Source/core/dom/DOMRectReadOnly.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMRectReadOnly.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMSettableTokenList.cpp b/third_party/WebKit/Source/core/dom/DOMSettableTokenList.cpp index 69dcdf0..0d839b95 100644 --- a/third_party/WebKit/Source/core/dom/DOMSettableTokenList.cpp +++ b/third_party/WebKit/Source/core/dom/DOMSettableTokenList.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMSettableTokenList.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMSharedArrayBuffer.cpp b/third_party/WebKit/Source/core/dom/DOMSharedArrayBuffer.cpp index d0675569..76ca43d 100644 --- a/third_party/WebKit/Source/core/dom/DOMSharedArrayBuffer.cpp +++ b/third_party/WebKit/Source/core/dom/DOMSharedArrayBuffer.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMSharedArrayBuffer.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMStringList.cpp b/third_party/WebKit/Source/core/dom/DOMStringList.cpp index 55052ae..2ad458d8 100644 --- a/third_party/WebKit/Source/core/dom/DOMStringList.cpp +++ b/third_party/WebKit/Source/core/dom/DOMStringList.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMStringList.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMStringMap.cpp b/third_party/WebKit/Source/core/dom/DOMStringMap.cpp index 8b27d23..48ed337a 100644 --- a/third_party/WebKit/Source/core/dom/DOMStringMap.cpp +++ b/third_party/WebKit/Source/core/dom/DOMStringMap.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMStringMap.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/DOMTokenList.cpp b/third_party/WebKit/Source/core/dom/DOMTokenList.cpp index 52817c8cb..fe524336 100644 --- a/third_party/WebKit/Source/core/dom/DOMTokenList.cpp +++ b/third_party/WebKit/Source/core/dom/DOMTokenList.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMTokenList.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMTypedArray.cpp b/third_party/WebKit/Source/core/dom/DOMTypedArray.cpp index 676fe8d9..65bcf8c8 100644 --- a/third_party/WebKit/Source/core/dom/DOMTypedArray.cpp +++ b/third_party/WebKit/Source/core/dom/DOMTypedArray.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DOMTypedArray.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMURL.cpp b/third_party/WebKit/Source/core/dom/DOMURL.cpp index 89fc742..5f35cd9 100644 --- a/third_party/WebKit/Source/core/dom/DOMURL.cpp +++ b/third_party/WebKit/Source/core/dom/DOMURL.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMURL.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMURLUtils.cpp b/third_party/WebKit/Source/core/dom/DOMURLUtils.cpp index 361b37af..7b3d670 100644 --- a/third_party/WebKit/Source/core/dom/DOMURLUtils.cpp +++ b/third_party/WebKit/Source/core/dom/DOMURLUtils.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMURLUtils.h" #include "platform/weborigin/KnownPorts.h"
diff --git a/third_party/WebKit/Source/core/dom/DOMURLUtilsReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMURLUtilsReadOnly.cpp index a00007b..b4dbdbe 100644 --- a/third_party/WebKit/Source/core/dom/DOMURLUtilsReadOnly.cpp +++ b/third_party/WebKit/Source/core/dom/DOMURLUtilsReadOnly.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DOMURLUtilsReadOnly.h" #include "platform/weborigin/KnownPorts.h"
diff --git a/third_party/WebKit/Source/core/dom/DatasetDOMStringMap.cpp b/third_party/WebKit/Source/core/dom/DatasetDOMStringMap.cpp index 2e5fea47..6f0c972 100644 --- a/third_party/WebKit/Source/core/dom/DatasetDOMStringMap.cpp +++ b/third_party/WebKit/Source/core/dom/DatasetDOMStringMap.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DatasetDOMStringMap.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp index 39417c6..624b576 100644 --- a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp +++ b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DecodedDataDocumentParser.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp index bcfddf68..f0b37348 100644 --- a/third_party/WebKit/Source/core/dom/Document.cpp +++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Document.h" #include "bindings/core/v8/CustomElementConstructorBuilder.h" @@ -341,6 +340,13 @@ return element.document().frame() && element.rootEditableElement(); } +static bool isOriginPotentiallyTrustworthy(SecurityOrigin* origin, String* errorMessage) +{ + if (errorMessage) + return origin->isPotentiallyTrustworthy(*errorMessage); + return origin->isPotentiallyTrustworthy(); +} + uint64_t Document::s_globalTreeVersion = 0; static bool s_threadedParsingEnabledForTesting = true; @@ -3324,6 +3330,70 @@ setMimeType(other.contentType()); } +bool Document::isSecureContextImpl(String* errorMessage, const SecureContextCheck privilegeContextCheck) const +{ + // There may be exceptions for the secure context check defined for certain + // schemes. The exceptions are applied only to the special scheme and to + // sandboxed URLs from those origins, but *not* to any children. + // + // For example: + // <iframe src="http://host"> + // <iframe src="scheme-has-exception://host"></iframe> + // <iframe sandbox src="scheme-has-exception://host"></iframe> + // </iframe> + // both inner iframes pass this check, assuming that the scheme + // "scheme-has-exception:" is granted an exception. + // + // However, + // <iframe src="http://host"> + // <iframe sandbox src="http://host"></iframe> + // </iframe> + // would fail the check (that is, sandbox does not grant an exception itself). + // + // Additionally, with + // <iframe src="scheme-has-exception://host"> + // <iframe src="http://host"></iframe> + // <iframe sandbox src="http://host"></iframe> + // </iframe> + // both inner iframes would fail the check, even though the outermost iframe + // passes. + // + // In all cases, a frame must be potentially trustworthy in addition to + // having an exception listed in order for the exception to be granted. + if (SecurityContext::isSandboxed(SandboxOrigin)) { + RefPtr<SecurityOrigin> origin = SecurityOrigin::create(url()); + if (!isOriginPotentiallyTrustworthy(origin.get(), errorMessage)) + return false; + if (SchemeRegistry::schemeShouldBypassSecureContextCheck(origin->protocol())) + return true; + } else { + if (!isOriginPotentiallyTrustworthy(securityOrigin(), errorMessage)) + return false; + if (SchemeRegistry::schemeShouldBypassSecureContextCheck(securityOrigin()->protocol())) + return true; + } + + if (privilegeContextCheck == StandardSecureContextCheck) { + Document* context = parentDocument(); + while (context) { + // Skip to the next ancestor if it's a srcdoc. + if (!context->isSrcdocDocument()) { + if (context->securityContext().isSandboxed(SandboxOrigin)) { + // For a sandboxed origin, use the document's URL. + RefPtr<SecurityOrigin> origin = SecurityOrigin::create(context->url()); + if (!isOriginPotentiallyTrustworthy(origin.get(), errorMessage)) + return false; + } else { + if (!isOriginPotentiallyTrustworthy(context->securityOrigin(), errorMessage)) + return false; + } + } + context = context->parentDocument(); + } + } + return true; +} + StyleSheetList* Document::styleSheets() { if (!m_styleSheetList) @@ -5700,66 +5770,12 @@ bool Document::isSecureContext(String& errorMessage, const SecureContextCheck privilegeContextCheck) const { - // There may be exceptions for the secure context check defined for certain - // schemes. The exceptions are applied only to the special scheme and to - // sandboxed URLs from those origins, but *not* to any children. - // - // For example: - // <iframe src="http://host"> - // <iframe src="scheme-has-exception://host"></iframe> - // <iframe sandbox src="scheme-has-exception://host"></iframe> - // </iframe> - // both inner iframes pass this check, assuming that the scheme - // "scheme-has-exception:" is granted an exception. - // - // However, - // <iframe src="http://host"> - // <iframe sandbox src="http://host"></iframe> - // </iframe> - // would fail the check (that is, sandbox does not grant an exception itself). - // - // Additionally, with - // <iframe src="scheme-has-exception://host"> - // <iframe src="http://host"></iframe> - // <iframe sandbox src="http://host"></iframe> - // </iframe> - // both inner iframes would fail the check, even though the outermost iframe - // passes. - // - // In all cases, a frame must be potentially trustworthy in addition to - // having an exception listed in order for the exception to be granted. - if (SecurityContext::isSandboxed(SandboxOrigin)) { - RefPtr<SecurityOrigin> origin = SecurityOrigin::create(url()); - if (!origin->isPotentiallyTrustworthy(errorMessage)) - return false; - if (SchemeRegistry::schemeShouldBypassSecureContextCheck(origin->protocol())) - return true; - } else { - if (!securityOrigin()->isPotentiallyTrustworthy(errorMessage)) - return false; - if (SchemeRegistry::schemeShouldBypassSecureContextCheck(securityOrigin()->protocol())) - return true; - } + return isSecureContextImpl(&errorMessage, privilegeContextCheck); +} - if (privilegeContextCheck == StandardSecureContextCheck) { - Document* context = parentDocument(); - while (context) { - // Skip to the next ancestor if it's a srcdoc. - if (!context->isSrcdocDocument()) { - if (context->securityContext().isSandboxed(SandboxOrigin)) { - // For a sandboxed origin, use the document's URL. - RefPtr<SecurityOrigin> origin = SecurityOrigin::create(context->url()); - if (!origin->isPotentiallyTrustworthy(errorMessage)) - return false; - } else { - if (!context->securityOrigin()->isPotentiallyTrustworthy(errorMessage)) - return false; - } - } - context = context->parentDocument(); - } - } - return true; +bool Document::isSecureContext(const SecureContextCheck privilegeContextCheck) const +{ + return isSecureContextImpl(nullptr, privilegeContextCheck); } WebTaskRunner* Document::loadingTaskRunner() const
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h index 9c88579..707c2e1 100644 --- a/third_party/WebKit/Source/core/dom/Document.h +++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -1033,6 +1033,7 @@ NthIndexCache* nthIndexCache() const { return m_nthIndexCache; } bool isSecureContext(String& errorMessage, const SecureContextCheck = StandardSecureContextCheck) const override; + bool isSecureContext(const SecureContextCheck = StandardSecureContextCheck) const override; ClientHintsPreferences& clientHintsPreferences() { return m_clientHintsPreferences; } @@ -1119,6 +1120,7 @@ bool childTypeAllowed(NodeType) const final; PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep) final; void cloneDataFromDocument(const Document&); + bool isSecureContextImpl(String* errorMessage, const SecureContextCheck priviligeContextCheck) const; #if !ENABLE(OILPAN) void refExecutionContext() final { ref(); }
diff --git a/third_party/WebKit/Source/core/dom/DocumentEncodingData.cpp b/third_party/WebKit/Source/core/dom/DocumentEncodingData.cpp index ad80fb57..20a7fc1 100644 --- a/third_party/WebKit/Source/core/dom/DocumentEncodingData.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentEncodingData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DocumentEncodingData.h" #include "core/html/parser/TextResourceDecoder.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentFragment.cpp b/third_party/WebKit/Source/core/dom/DocumentFragment.cpp index dbc34e6b..87d98d12 100644 --- a/third_party/WebKit/Source/core/dom/DocumentFragment.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentFragment.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DocumentFragment.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentFullscreen.cpp b/third_party/WebKit/Source/core/dom/DocumentFullscreen.cpp index 6d75121..f19b4ee 100644 --- a/third_party/WebKit/Source/core/dom/DocumentFullscreen.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentFullscreen.cpp
@@ -23,7 +23,6 @@ * DAMAGE. */ -#include "config.h" #include "core/dom/DocumentFullscreen.h" #include "core/dom/Fullscreen.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp index f4bd748..d8e85c11 100644 --- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/DocumentInit.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp index 20a3fb5c..f1287b0b 100644 --- a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DocumentLifecycle.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.cpp b/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.cpp index e9b8cd0..301aaa02 100644 --- a/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.cpp
@@ -24,7 +24,6 @@ */ -#include "config.h" #include "core/dom/DocumentLifecycleNotifier.h" #include "core/dom/DocumentLifecycleObserver.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentOrderedList.cpp b/third_party/WebKit/Source/core/dom/DocumentOrderedList.cpp index 62e433cc..7c3f327e 100644 --- a/third_party/WebKit/Source/core/dom/DocumentOrderedList.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentOrderedList.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DocumentOrderedList.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentOrderedMap.cpp b/third_party/WebKit/Source/core/dom/DocumentOrderedMap.cpp index 9668c7c..85495be 100644 --- a/third_party/WebKit/Source/core/dom/DocumentOrderedMap.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentOrderedMap.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DocumentOrderedMap.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentParser.cpp b/third_party/WebKit/Source/core/dom/DocumentParser.cpp index 5a59239c..4413150 100644 --- a/third_party/WebKit/Source/core/dom/DocumentParser.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/DocumentParser.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp index 695cecac..010f9bc 100644 --- a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "DocumentStatisticsCollector.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollectorTest.cpp b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollectorTest.cpp index 97f1095..0612c8e 100644 --- a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollectorTest.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollectorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DocumentStatisticsCollector.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp index a3d35ad..fc9de90 100644 --- a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DocumentStyleSheetCollection.h" #include "core/css/resolver/StyleResolver.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollector.cpp b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollector.cpp index 8f745f2..a7ed3fc 100644 --- a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollector.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollector.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DocumentStyleSheetCollector.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentTest.cpp b/third_party/WebKit/Source/core/dom/DocumentTest.cpp index 40f3fe3..d773a49 100644 --- a/third_party/WebKit/Source/core/dom/DocumentTest.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/Document.h" #include "core/dom/DocumentVisibilityObserver.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentTiming.cpp b/third_party/WebKit/Source/core/dom/DocumentTiming.cpp index a047e59..65784a6b 100644 --- a/third_party/WebKit/Source/core/dom/DocumentTiming.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentTiming.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DocumentTiming.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentType.cpp b/third_party/WebKit/Source/core/dom/DocumentType.cpp index e01cc922..b1c8ba18 100644 --- a/third_party/WebKit/Source/core/dom/DocumentType.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentType.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/DocumentType.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentVisibilityObserver.cpp b/third_party/WebKit/Source/core/dom/DocumentVisibilityObserver.cpp index 012901f..18cd80a9 100644 --- a/third_party/WebKit/Source/core/dom/DocumentVisibilityObserver.cpp +++ b/third_party/WebKit/Source/core/dom/DocumentVisibilityObserver.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/DocumentVisibilityObserver.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp index 4d223532..316ab46 100644 --- a/third_party/WebKit/Source/core/dom/Element.cpp +++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -23,7 +23,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Element.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/ElementData.cpp b/third_party/WebKit/Source/core/dom/ElementData.cpp index 0e40cb9..86a7f2e 100644 --- a/third_party/WebKit/Source/core/dom/ElementData.cpp +++ b/third_party/WebKit/Source/core/dom/ElementData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ElementData.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/dom/ElementDataCache.cpp b/third_party/WebKit/Source/core/dom/ElementDataCache.cpp index 04a3c1ef..8506a87 100644 --- a/third_party/WebKit/Source/core/dom/ElementDataCache.cpp +++ b/third_party/WebKit/Source/core/dom/ElementDataCache.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/ElementDataCache.h" #include "core/dom/ElementData.h"
diff --git a/third_party/WebKit/Source/core/dom/ElementFullscreen.cpp b/third_party/WebKit/Source/core/dom/ElementFullscreen.cpp index a133e8f..ce6607e 100644 --- a/third_party/WebKit/Source/core/dom/ElementFullscreen.cpp +++ b/third_party/WebKit/Source/core/dom/ElementFullscreen.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/ElementFullscreen.h" #include "core/dom/Fullscreen.h"
diff --git a/third_party/WebKit/Source/core/dom/ElementRareData.cpp b/third_party/WebKit/Source/core/dom/ElementRareData.cpp index 7000ea9..2014dd8 100644 --- a/third_party/WebKit/Source/core/dom/ElementRareData.cpp +++ b/third_party/WebKit/Source/core/dom/ElementRareData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ElementRareData.h" #include "core/dom/CompositorProxiedPropertySet.h"
diff --git a/third_party/WebKit/Source/core/dom/EmptyNodeList.cpp b/third_party/WebKit/Source/core/dom/EmptyNodeList.cpp index 80132ae..5a009f21 100644 --- a/third_party/WebKit/Source/core/dom/EmptyNodeList.cpp +++ b/third_party/WebKit/Source/core/dom/EmptyNodeList.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/EmptyNodeList.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.cpp b/third_party/WebKit/Source/core/dom/ExecutionContext.cpp index ce4be12..323245f 100644 --- a/third_party/WebKit/Source/core/dom/ExecutionContext.cpp +++ b/third_party/WebKit/Source/core/dom/ExecutionContext.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/ExecutionContext.h" #include "core/dom/ExecutionContextTask.h" @@ -263,6 +262,12 @@ return m_windowInteractionTokens > 0; } +bool ExecutionContext::isSecureContext(const SecureContextCheck privilegeContextCheck) const +{ + String unusedErrorMessage; + return isSecureContext(unusedErrorMessage, privilegeContextCheck); +} + void ExecutionContext::setReferrerPolicy(ReferrerPolicy referrerPolicy) { // When a referrer policy has already been set, the latest value takes precedence.
diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.h b/third_party/WebKit/Source/core/dom/ExecutionContext.h index 1f0c0f47..6f14afe 100644 --- a/third_party/WebKit/Source/core/dom/ExecutionContext.h +++ b/third_party/WebKit/Source/core/dom/ExecutionContext.h
@@ -153,6 +153,7 @@ // Decides whether this context is privileged, as described in // https://w3c.github.io/webappsec/specs/powerfulfeatures/#settings-privileged. virtual bool isSecureContext(String& errorMessage, const SecureContextCheck = StandardSecureContextCheck) const = 0; + virtual bool isSecureContext(const SecureContextCheck = StandardSecureContextCheck) const; virtual void setReferrerPolicy(ReferrerPolicy); ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
diff --git a/third_party/WebKit/Source/core/dom/FirstLetterPseudoElement.cpp b/third_party/WebKit/Source/core/dom/FirstLetterPseudoElement.cpp index 0615fbf..936dd56 100644 --- a/third_party/WebKit/Source/core/dom/FirstLetterPseudoElement.cpp +++ b/third_party/WebKit/Source/core/dom/FirstLetterPseudoElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/FirstLetterPseudoElement.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp index cbbd3a24..f9e6469 100644 --- a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp +++ b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/FrameRequestCallbackCollection.h" #include "core/dom/FrameRequestCallback.h"
diff --git a/third_party/WebKit/Source/core/dom/Fullscreen.cpp b/third_party/WebKit/Source/core/dom/Fullscreen.cpp index 8c97a4c4..1644cda 100644 --- a/third_party/WebKit/Source/core/dom/Fullscreen.cpp +++ b/third_party/WebKit/Source/core/dom/Fullscreen.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/Fullscreen.h" #include "core/HTMLNames.h" @@ -200,11 +199,7 @@ void Fullscreen::requestFullscreen(Element& element, RequestType requestType) { - // It is required by isSecureContext() but isn't - // actually used. This could be used later if a warning is shown in the - // developer console. - String errorMessage; - if (document()->isSecureContext(errorMessage)) { + if (document()->isSecureContext()) { UseCounter::count(document(), UseCounter::FullscreenSecureOrigin); } else { UseCounter::count(document(), UseCounter::FullscreenInsecureOrigin);
diff --git a/third_party/WebKit/Source/core/dom/IconURL.cpp b/third_party/WebKit/Source/core/dom/IconURL.cpp index 6a8f4c9..78cbc8e 100644 --- a/third_party/WebKit/Source/core/dom/IconURL.cpp +++ b/third_party/WebKit/Source/core/dom/IconURL.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/IconURL.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/IdTargetObserver.cpp b/third_party/WebKit/Source/core/dom/IdTargetObserver.cpp index 6e64d5a..2521217 100644 --- a/third_party/WebKit/Source/core/dom/IdTargetObserver.cpp +++ b/third_party/WebKit/Source/core/dom/IdTargetObserver.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/IdTargetObserver.h" #include "core/dom/IdTargetObserverRegistry.h"
diff --git a/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.cpp b/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.cpp index 08cca4a..491950c9 100644 --- a/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.cpp +++ b/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/IdTargetObserverRegistry.h" #include "core/dom/IdTargetObserver.h"
diff --git a/third_party/WebKit/Source/core/dom/IdleDeadline.cpp b/third_party/WebKit/Source/core/dom/IdleDeadline.cpp index 2c4da53..5811fceb 100644 --- a/third_party/WebKit/Source/core/dom/IdleDeadline.cpp +++ b/third_party/WebKit/Source/core/dom/IdleDeadline.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/IdleDeadline.h" #include "core/timing/PerformanceBase.h"
diff --git a/third_party/WebKit/Source/core/dom/IncrementLoadEventDelayCount.cpp b/third_party/WebKit/Source/core/dom/IncrementLoadEventDelayCount.cpp index 920eff44..a087e91 100644 --- a/third_party/WebKit/Source/core/dom/IncrementLoadEventDelayCount.cpp +++ b/third_party/WebKit/Source/core/dom/IncrementLoadEventDelayCount.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/IncrementLoadEventDelayCount.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp b/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp index e8ca9eca..9da9591 100644 --- a/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp +++ b/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp
@@ -23,7 +23,6 @@ * */ -#include "config.h" #include "core/dom/LayoutTreeBuilder.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/LayoutTreeBuilderTraversal.cpp b/third_party/WebKit/Source/core/dom/LayoutTreeBuilderTraversal.cpp index a33857a..a20bbd1 100644 --- a/third_party/WebKit/Source/core/dom/LayoutTreeBuilderTraversal.cpp +++ b/third_party/WebKit/Source/core/dom/LayoutTreeBuilderTraversal.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/LayoutTreeBuilderTraversal.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/LiveNodeList.cpp b/third_party/WebKit/Source/core/dom/LiveNodeList.cpp index a6be953..58bb1071 100644 --- a/third_party/WebKit/Source/core/dom/LiveNodeList.cpp +++ b/third_party/WebKit/Source/core/dom/LiveNodeList.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/LiveNodeList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/LiveNodeListBase.cpp b/third_party/WebKit/Source/core/dom/LiveNodeListBase.cpp index bf945c8..ee93089 100644 --- a/third_party/WebKit/Source/core/dom/LiveNodeListBase.cpp +++ b/third_party/WebKit/Source/core/dom/LiveNodeListBase.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/LiveNodeListBase.h" #include "core/dom/LiveNodeList.h"
diff --git a/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.cpp b/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.cpp index fc8ac9e..1c3b1191 100644 --- a/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.cpp +++ b/third_party/WebKit/Source/core/dom/MainThreadTaskRunner.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/MainThreadTaskRunner.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/MainThreadTaskRunnerTest.cpp b/third_party/WebKit/Source/core/dom/MainThreadTaskRunnerTest.cpp index e2e9f37..33be64d 100644 --- a/third_party/WebKit/Source/core/dom/MainThreadTaskRunnerTest.cpp +++ b/third_party/WebKit/Source/core/dom/MainThreadTaskRunnerTest.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/MainThreadTaskRunner.h" #include "core/dom/ExecutionContextTask.h"
diff --git a/third_party/WebKit/Source/core/dom/MessageChannel.cpp b/third_party/WebKit/Source/core/dom/MessageChannel.cpp index f3a2116b..92fa87d 100644 --- a/third_party/WebKit/Source/core/dom/MessageChannel.cpp +++ b/third_party/WebKit/Source/core/dom/MessageChannel.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/MessageChannel.h" #include "core/dom/MessagePort.h"
diff --git a/third_party/WebKit/Source/core/dom/MessagePort.cpp b/third_party/WebKit/Source/core/dom/MessagePort.cpp index f34acf0e..82fceb63 100644 --- a/third_party/WebKit/Source/core/dom/MessagePort.cpp +++ b/third_party/WebKit/Source/core/dom/MessagePort.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/MessagePort.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/Microtask.cpp b/third_party/WebKit/Source/core/dom/Microtask.cpp index 1f7c3f7..933dbe5 100644 --- a/third_party/WebKit/Source/core/dom/Microtask.cpp +++ b/third_party/WebKit/Source/core/dom/Microtask.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/Microtask.h" #include "bindings/core/v8/V8PerIsolateData.h"
diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.cpp b/third_party/WebKit/Source/core/dom/MutationObserver.cpp index 774d465..c87e202b 100644 --- a/third_party/WebKit/Source/core/dom/MutationObserver.cpp +++ b/third_party/WebKit/Source/core/dom/MutationObserver.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/MutationObserver.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/MutationObserverInterestGroup.cpp b/third_party/WebKit/Source/core/dom/MutationObserverInterestGroup.cpp index 26e0a7e0..b5dcbbd 100644 --- a/third_party/WebKit/Source/core/dom/MutationObserverInterestGroup.cpp +++ b/third_party/WebKit/Source/core/dom/MutationObserverInterestGroup.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/MutationObserverInterestGroup.h" #include "core/dom/MutationRecord.h"
diff --git a/third_party/WebKit/Source/core/dom/MutationObserverRegistration.cpp b/third_party/WebKit/Source/core/dom/MutationObserverRegistration.cpp index d95dd79..b114f2a 100644 --- a/third_party/WebKit/Source/core/dom/MutationObserverRegistration.cpp +++ b/third_party/WebKit/Source/core/dom/MutationObserverRegistration.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/MutationObserverRegistration.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/dom/MutationRecord.cpp b/third_party/WebKit/Source/core/dom/MutationRecord.cpp index 14132bba..386df23fa 100644 --- a/third_party/WebKit/Source/core/dom/MutationRecord.cpp +++ b/third_party/WebKit/Source/core/dom/MutationRecord.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/MutationRecord.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/dom/NameNodeList.cpp b/third_party/WebKit/Source/core/dom/NameNodeList.cpp index 502d7404..1ccc113 100644 --- a/third_party/WebKit/Source/core/dom/NameNodeList.cpp +++ b/third_party/WebKit/Source/core/dom/NameNodeList.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/NameNodeList.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/NamedNodeMap.cpp b/third_party/WebKit/Source/core/dom/NamedNodeMap.cpp index f4339fb6..d1b10c20 100644 --- a/third_party/WebKit/Source/core/dom/NamedNodeMap.cpp +++ b/third_party/WebKit/Source/core/dom/NamedNodeMap.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/NamedNodeMap.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp index ca95f774..ea3cd12 100644 --- a/third_party/WebKit/Source/core/dom/Node.cpp +++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Node.h" #include "bindings/core/v8/DOMDataStore.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeChildRemovalTracker.cpp b/third_party/WebKit/Source/core/dom/NodeChildRemovalTracker.cpp index c541d59..1dc7923 100644 --- a/third_party/WebKit/Source/core/dom/NodeChildRemovalTracker.cpp +++ b/third_party/WebKit/Source/core/dom/NodeChildRemovalTracker.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/NodeChildRemovalTracker.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeFilter.cpp b/third_party/WebKit/Source/core/dom/NodeFilter.cpp index 50509dfe..d0a1fcc7 100644 --- a/third_party/WebKit/Source/core/dom/NodeFilter.cpp +++ b/third_party/WebKit/Source/core/dom/NodeFilter.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/dom/NodeFilter.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/NodeIterator.cpp b/third_party/WebKit/Source/core/dom/NodeIterator.cpp index 4d0fb7c..fd2da3f 100644 --- a/third_party/WebKit/Source/core/dom/NodeIterator.cpp +++ b/third_party/WebKit/Source/core/dom/NodeIterator.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/dom/NodeIterator.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp b/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp index fe1cd61..9b4d30ab0 100644 --- a/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp +++ b/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/dom/NodeIteratorBase.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeList.cpp b/third_party/WebKit/Source/core/dom/NodeList.cpp index 10d3f19..a11c40ae 100644 --- a/third_party/WebKit/Source/core/dom/NodeList.cpp +++ b/third_party/WebKit/Source/core/dom/NodeList.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/NodeList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/NodeListsNodeData.cpp b/third_party/WebKit/Source/core/dom/NodeListsNodeData.cpp index c34ccd0b..5f2c584 100644 --- a/third_party/WebKit/Source/core/dom/NodeListsNodeData.cpp +++ b/third_party/WebKit/Source/core/dom/NodeListsNodeData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/NodeListsNodeData.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/NodeRareData.cpp b/third_party/WebKit/Source/core/dom/NodeRareData.cpp index b70a454..7ed6f61 100644 --- a/third_party/WebKit/Source/core/dom/NodeRareData.cpp +++ b/third_party/WebKit/Source/core/dom/NodeRareData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/NodeRareData.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeTest.cpp b/third_party/WebKit/Source/core/dom/NodeTest.cpp index dbec516..d04ea15 100644 --- a/third_party/WebKit/Source/core/dom/NodeTest.cpp +++ b/third_party/WebKit/Source/core/dom/NodeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/Node.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeTraversal.cpp b/third_party/WebKit/Source/core/dom/NodeTraversal.cpp index 5b04a11..12059a8 100644 --- a/third_party/WebKit/Source/core/dom/NodeTraversal.cpp +++ b/third_party/WebKit/Source/core/dom/NodeTraversal.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/dom/NodeTraversal.h" #include "core/dom/ContainerNode.h"
diff --git a/third_party/WebKit/Source/core/dom/NthIndexCache.cpp b/third_party/WebKit/Source/core/dom/NthIndexCache.cpp index b6b919a1..a039019 100644 --- a/third_party/WebKit/Source/core/dom/NthIndexCache.cpp +++ b/third_party/WebKit/Source/core/dom/NthIndexCache.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/NthIndexCache.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp b/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp index 946b030..fe24da8 100644 --- a/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp +++ b/third_party/WebKit/Source/core/dom/NthIndexCacheTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/NthIndexCache.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/PendingScript.cpp b/third_party/WebKit/Source/core/dom/PendingScript.cpp index 81cd667..2a688e2 100644 --- a/third_party/WebKit/Source/core/dom/PendingScript.cpp +++ b/third_party/WebKit/Source/core/dom/PendingScript.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/PendingScript.h" #include "bindings/core/v8/ScriptSourceCode.h"
diff --git a/third_party/WebKit/Source/core/dom/PresentationAttributeStyle.cpp b/third_party/WebKit/Source/core/dom/PresentationAttributeStyle.cpp index b0c74768..f721756e 100644 --- a/third_party/WebKit/Source/core/dom/PresentationAttributeStyle.cpp +++ b/third_party/WebKit/Source/core/dom/PresentationAttributeStyle.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/PresentationAttributeStyle.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp b/third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp index d540c302..2557e82 100644 --- a/third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp +++ b/third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/ProcessingInstruction.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/dom/PseudoElement.cpp b/third_party/WebKit/Source/core/dom/PseudoElement.cpp index c8aba370..f23d31c 100644 --- a/third_party/WebKit/Source/core/dom/PseudoElement.cpp +++ b/third_party/WebKit/Source/core/dom/PseudoElement.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/PseudoElement.h" #include "core/dom/FirstLetterPseudoElement.h"
diff --git a/third_party/WebKit/Source/core/dom/QualifiedName.cpp b/third_party/WebKit/Source/core/dom/QualifiedName.cpp index c709861..7003a01 100644 --- a/third_party/WebKit/Source/core/dom/QualifiedName.cpp +++ b/third_party/WebKit/Source/core/dom/QualifiedName.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/dom/QualifiedName.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp index 885a310..c2203528 100644 --- a/third_party/WebKit/Source/core/dom/Range.cpp +++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Range.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/RangeTest.cpp b/third_party/WebKit/Source/core/dom/RangeTest.cpp index 88d5d40..077ee221 100644 --- a/third_party/WebKit/Source/core/dom/RangeTest.cpp +++ b/third_party/WebKit/Source/core/dom/RangeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/Range.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp b/third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp index f8cec4c..eaa158dd 100644 --- a/third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp +++ b/third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/RemoteSecurityContext.h" #include "core/frame/csp/ContentSecurityPolicy.h"
diff --git a/third_party/WebKit/Source/core/dom/SandboxFlags.cpp b/third_party/WebKit/Source/core/dom/SandboxFlags.cpp index d4e07c9..a44fea1 100644 --- a/third_party/WebKit/Source/core/dom/SandboxFlags.cpp +++ b/third_party/WebKit/Source/core/dom/SandboxFlags.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/SandboxFlags.h" #include "core/html/parser/HTMLParserIdioms.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp index 711c08e..8032539 100644 --- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/ScriptLoader.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptRunner.cpp b/third_party/WebKit/Source/core/dom/ScriptRunner.cpp index 67f31e34..b8af660 100644 --- a/third_party/WebKit/Source/core/dom/ScriptRunner.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptRunner.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ScriptRunner.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp index db7a582f..bb2bec7 100644 --- a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/ScriptRunner.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptableDocumentParser.cpp b/third_party/WebKit/Source/core/dom/ScriptableDocumentParser.cpp index d93abfb..b96bdc1 100644 --- a/third_party/WebKit/Source/core/dom/ScriptableDocumentParser.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptableDocumentParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/ScriptableDocumentParser.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp index c3175fc..9f84e55f0 100644 --- a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
@@ -23,7 +23,6 @@ * */ -#include "config.h" #include "core/dom/ScriptedAnimationController.h" #include "core/css/MediaQueryListListener.h"
diff --git a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp index 4f893975..a1d91cfe 100644 --- a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp +++ b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/ScriptedIdleTaskController.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.cpp b/third_party/WebKit/Source/core/dom/SecurityContext.cpp index 31a53b64..2a901a14 100644 --- a/third_party/WebKit/Source/core/dom/SecurityContext.cpp +++ b/third_party/WebKit/Source/core/dom/SecurityContext.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/dom/SecurityContext.h" #include "core/frame/csp/ContentSecurityPolicy.h"
diff --git a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp index 1daf2d2..37dbb07 100644 --- a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp +++ b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/SelectorQuery.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp index 0355e57..d6989848 100644 --- a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp +++ b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/ShadowTreeStyleSheetCollection.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/SpaceSplitString.cpp b/third_party/WebKit/Source/core/dom/SpaceSplitString.cpp index 4b65c88..1932bc15 100644 --- a/third_party/WebKit/Source/core/dom/SpaceSplitString.cpp +++ b/third_party/WebKit/Source/core/dom/SpaceSplitString.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02111-1307, USA. */ -#include "config.h" #include "core/dom/SpaceSplitString.h" #include "core/html/parser/HTMLParserIdioms.h"
diff --git a/third_party/WebKit/Source/core/dom/StringCallback.cpp b/third_party/WebKit/Source/core/dom/StringCallback.cpp index 9a56acc..ee1f1f3 100644 --- a/third_party/WebKit/Source/core/dom/StringCallback.cpp +++ b/third_party/WebKit/Source/core/dom/StringCallback.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/StringCallback.h" #include "core/dom/ExecutionContext.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleChangeReason.cpp b/third_party/WebKit/Source/core/dom/StyleChangeReason.cpp index 84e0c7c6..903047c 100644 --- a/third_party/WebKit/Source/core/dom/StyleChangeReason.cpp +++ b/third_party/WebKit/Source/core/dom/StyleChangeReason.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/StyleChangeReason.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleElement.cpp b/third_party/WebKit/Source/core/dom/StyleElement.cpp index d7303a3..db89d92 100644 --- a/third_party/WebKit/Source/core/dom/StyleElement.cpp +++ b/third_party/WebKit/Source/core/dom/StyleElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/StyleElement.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleElementTest.cpp b/third_party/WebKit/Source/core/dom/StyleElementTest.cpp index 2e15ecb..c5546e8 100644 --- a/third_party/WebKit/Source/core/dom/StyleElementTest.cpp +++ b/third_party/WebKit/Source/core/dom/StyleElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/StyleElement.h" #include "core/css/StyleSheetContents.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleEngine.cpp b/third_party/WebKit/Source/core/dom/StyleEngine.cpp index 0f96af7..374e9e8 100644 --- a/third_party/WebKit/Source/core/dom/StyleEngine.cpp +++ b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/StyleEngine.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp b/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp index fc398a4e..1a7c418 100644 --- a/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp +++ b/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/StyleSheetCandidate.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp index 8a25320..c074cc4 100644 --- a/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp +++ b/third_party/WebKit/Source/core/dom/StyleSheetCollection.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/StyleSheetCollection.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/dom/TagCollection.cpp b/third_party/WebKit/Source/core/dom/TagCollection.cpp index 0d6d691..dcee6d5e 100644 --- a/third_party/WebKit/Source/core/dom/TagCollection.cpp +++ b/third_party/WebKit/Source/core/dom/TagCollection.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/TagCollection.h" #include "core/dom/NodeRareData.h"
diff --git a/third_party/WebKit/Source/core/dom/Text.cpp b/third_party/WebKit/Source/core/dom/Text.cpp index 8823163..647966b8 100644 --- a/third_party/WebKit/Source/core/dom/Text.cpp +++ b/third_party/WebKit/Source/core/dom/Text.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/Text.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/TextLinkColors.cpp b/third_party/WebKit/Source/core/dom/TextLinkColors.cpp index 56d1cbd..de475c2 100644 --- a/third_party/WebKit/Source/core/dom/TextLinkColors.cpp +++ b/third_party/WebKit/Source/core/dom/TextLinkColors.cpp
@@ -25,7 +25,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/TextLinkColors.h" #include "core/css/CSSColorValue.h"
diff --git a/third_party/WebKit/Source/core/dom/Touch.cpp b/third_party/WebKit/Source/core/dom/Touch.cpp index 3cea6ce..d75a1722 100644 --- a/third_party/WebKit/Source/core/dom/Touch.cpp +++ b/third_party/WebKit/Source/core/dom/Touch.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/Touch.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/dom/TouchList.cpp b/third_party/WebKit/Source/core/dom/TouchList.cpp index 8d6ad1c..ae425838 100644 --- a/third_party/WebKit/Source/core/dom/TouchList.cpp +++ b/third_party/WebKit/Source/core/dom/TouchList.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/TouchList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/TransformSourceLibxslt.cpp b/third_party/WebKit/Source/core/dom/TransformSourceLibxslt.cpp index dbfdd9b..ecfb0e11 100644 --- a/third_party/WebKit/Source/core/dom/TransformSourceLibxslt.cpp +++ b/third_party/WebKit/Source/core/dom/TransformSourceLibxslt.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/dom/TransformSource.h" #include <libxml/tree.h>
diff --git a/third_party/WebKit/Source/core/dom/TreeScope.cpp b/third_party/WebKit/Source/core/dom/TreeScope.cpp index b1ef5db..d536fa33 100644 --- a/third_party/WebKit/Source/core/dom/TreeScope.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScope.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/TreeScope.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp b/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp index b48de5b..d24a7b9 100644 --- a/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp
@@ -22,7 +22,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/TreeScopeAdopter.h" #include "core/dom/Attr.h"
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp index 8feeee5..276bacbb 100644 --- a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
@@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/TreeScopeStyleSheetCollection.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollectionTest.cpp b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollectionTest.cpp index cf020719..0cbfcba 100644 --- a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollectionTest.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollectionTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/TreeScopeStyleSheetCollection.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp b/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp index cdebb83..180c495b 100644 --- a/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp +++ b/third_party/WebKit/Source/core/dom/TreeScopeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/TreeScope.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/TreeWalker.cpp b/third_party/WebKit/Source/core/dom/TreeWalker.cpp index 496d13a..9fc4177 100644 --- a/third_party/WebKit/Source/core/dom/TreeWalker.cpp +++ b/third_party/WebKit/Source/core/dom/TreeWalker.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/dom/TreeWalker.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/dom/URLSearchParams.cpp b/third_party/WebKit/Source/core/dom/URLSearchParams.cpp index 5ecad6cc..bb2d8be6 100644 --- a/third_party/WebKit/Source/core/dom/URLSearchParams.cpp +++ b/third_party/WebKit/Source/core/dom/URLSearchParams.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/URLSearchParams.h" #include "platform/network/FormDataEncoder.h"
diff --git a/third_party/WebKit/Source/core/dom/URLSearchParamsTest.cpp b/third_party/WebKit/Source/core/dom/URLSearchParamsTest.cpp index 9f883473..70915d0 100644 --- a/third_party/WebKit/Source/core/dom/URLSearchParamsTest.cpp +++ b/third_party/WebKit/Source/core/dom/URLSearchParamsTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/URLSearchParams.h" #include <gtest/gtest.h>
diff --git a/third_party/WebKit/Source/core/dom/UserActionElementSet.cpp b/third_party/WebKit/Source/core/dom/UserActionElementSet.cpp index e9ec739d..e1761fe5 100644 --- a/third_party/WebKit/Source/core/dom/UserActionElementSet.cpp +++ b/third_party/WebKit/Source/core/dom/UserActionElementSet.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/UserActionElementSet.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/ViewportDescription.cpp b/third_party/WebKit/Source/core/dom/ViewportDescription.cpp index f49d897..017adb9 100644 --- a/third_party/WebKit/Source/core/dom/ViewportDescription.cpp +++ b/third_party/WebKit/Source/core/dom/ViewportDescription.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/dom/ViewportDescription.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp b/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp index 6f0e10691..6adbb08 100644 --- a/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp +++ b/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp
@@ -26,7 +26,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/dom/VisitedLinkState.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/XMLDocument.cpp b/third_party/WebKit/Source/core/dom/XMLDocument.cpp index 9193967d..0ca652e 100644 --- a/third_party/WebKit/Source/core/dom/XMLDocument.cpp +++ b/third_party/WebKit/Source/core/dom/XMLDocument.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/XMLDocument.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElement.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElement.cpp index 6fd1ea3..cb3932c5 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElement.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementAsyncImportMicrotaskQueue.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementAsyncImportMicrotaskQueue.cpp index 5682a80..8ee92d4 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementAsyncImportMicrotaskQueue.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementAsyncImportMicrotaskQueue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementAsyncImportMicrotaskQueue.h" #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackInvocation.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackInvocation.cpp index a219b05..d98ffdf 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackInvocation.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackInvocation.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementCallbackInvocation.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.cpp index 09c270c..7735a219 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementCallbackQueue.h" #include "core/dom/shadow/ShadowRoot.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp index 0cb66aa..b071a54 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementDefinition.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementException.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementException.cpp index ca948717..b4735db 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementException.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementException.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementException.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp index 3896f80..2cdd7688 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/custom/CustomElementMicrotaskDispatcher.h" #include "core/dom/Microtask.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp index 27d7f85..cae941f 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementMicrotaskImportStep.h" #include "core/dom/custom/CustomElementMicrotaskDispatcher.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskQueueBase.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskQueueBase.cpp index aaa753d..5c4f4e3 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskQueueBase.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskQueueBase.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/custom/CustomElementMicrotaskQueueBase.h" #include "core/dom/custom/CustomElementProcessingStack.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskResolutionStep.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskResolutionStep.cpp index af33e96..8502d0b 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskResolutionStep.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskResolutionStep.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementMicrotaskResolutionStep.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskRunQueue.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskRunQueue.cpp index 81592a8f..514d23da 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskRunQueue.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementMicrotaskRunQueue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/custom/CustomElementMicrotaskRunQueue.h" #include "core/dom/Microtask.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementObserver.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementObserver.cpp index 2684ca6..573ff69 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementObserver.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementObserver.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementObserver.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementProcessingStack.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementProcessingStack.cpp index f67db5c9..f939c46 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementProcessingStack.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementProcessingStack.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementProcessingStack.h" #include "core/dom/custom/CustomElementCallbackQueue.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp index 16c7370d..fb75c5ce 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementRegistrationContext.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistry.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementRegistry.cpp index 8626685a..c46e8809 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistry.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementRegistry.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementRegistry.h" #include "bindings/core/v8/CustomElementConstructorBuilder.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp index 31e8325..a4df3af 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementScheduler.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementSyncMicrotaskQueue.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementSyncMicrotaskQueue.cpp index b6c0ba6..16fd480a 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementSyncMicrotaskQueue.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementSyncMicrotaskQueue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeCandidateMap.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeCandidateMap.cpp index 68336e8..768fea8 100644 --- a/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeCandidateMap.cpp +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeCandidateMap.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/custom/CustomElementUpgradeCandidateMap.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversal.cpp b/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversal.cpp index 8c3a700..4050ea18 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversal.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversal.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/ComposedTreeTraversal.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversalTest.cpp b/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversalTest.cpp index 1f1eb2ee..12f29ac0 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversalTest.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/ComposedTreeTraversalTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/shadow/ComposedTreeTraversal.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp b/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp index 0447413..32e9774 100644 --- a/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/DistributedNodes.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/DistributedNodes.h" #include "core/dom/shadow/InsertionPoint.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp index bae3b84..6690aa02 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/ElementShadow.h" #include "core/css/StyleSheetList.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp b/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp index ef486a9..03f5048f 100644 --- a/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/InsertionPoint.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/SelectRuleFeatureSet.cpp b/third_party/WebKit/Source/core/dom/shadow/SelectRuleFeatureSet.cpp index ddb5c32..a21c096 100644 --- a/third_party/WebKit/Source/core/dom/shadow/SelectRuleFeatureSet.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/SelectRuleFeatureSet.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/SelectRuleFeatureSet.h" #include "core/css/CSSSelector.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp index 0ad8b55..3a4a3e9 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/dom/shadow/ShadowRoot.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp b/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp index 6c791be..9699e4a 100644 --- a/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/SlotAssignment.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/dom/shadow/SlotAssignment.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/CaretBase.cpp b/third_party/WebKit/Source/core/editing/CaretBase.cpp index efe3c5c..1ceb458c 100644 --- a/third_party/WebKit/Source/core/editing/CaretBase.cpp +++ b/third_party/WebKit/Source/core/editing/CaretBase.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/CaretBase.h" #include "core/editing/EditingUtilities.h"
diff --git a/third_party/WebKit/Source/core/editing/DOMSelection.cpp b/third_party/WebKit/Source/core/editing/DOMSelection.cpp index cad8eb8..56b7fb9e 100644 --- a/third_party/WebKit/Source/core/editing/DOMSelection.cpp +++ b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
@@ -28,7 +28,6 @@ */ -#include "config.h" #include "core/editing/DOMSelection.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/editing/DragCaretController.cpp b/third_party/WebKit/Source/core/editing/DragCaretController.cpp index a2419f89..a9dfc12 100644 --- a/third_party/WebKit/Source/core/editing/DragCaretController.cpp +++ b/third_party/WebKit/Source/core/editing/DragCaretController.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/DragCaretController.h" #include "core/editing/EditingUtilities.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingBehavior.cpp b/third_party/WebKit/Source/core/editing/EditingBehavior.cpp index 3b5f5db..ef462e6 100644 --- a/third_party/WebKit/Source/core/editing/EditingBehavior.cpp +++ b/third_party/WebKit/Source/core/editing/EditingBehavior.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/EditingBehavior.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingStrategy.cpp b/third_party/WebKit/Source/core/editing/EditingStrategy.cpp index a2398b7f..cdf3200f 100644 --- a/third_party/WebKit/Source/core/editing/EditingStrategy.cpp +++ b/third_party/WebKit/Source/core/editing/EditingStrategy.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/EditingStrategy.h" #include "core/editing/EditingUtilities.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp b/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp index 4ab4ae9..66469a4 100644 --- a/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditingStrategyTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/editing/EditingStrategy.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp index 015b29e7..e733314 100644 --- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp +++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/EditingStyle.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingTestBase.cpp b/third_party/WebKit/Source/core/editing/EditingTestBase.cpp index da40097..13afe508 100644 --- a/third_party/WebKit/Source/core/editing/EditingTestBase.cpp +++ b/third_party/WebKit/Source/core/editing/EditingTestBase.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/EditingTestBase.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp index 216159a..6616b4bc 100644 --- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp +++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/EditingUtilities.h" #include "core/HTMLElementFactory.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp b/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp index 5e331924..6448d2060 100644 --- a/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp +++ b/third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/EditingUtilities.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp index efec60f7..a84363f2 100644 --- a/third_party/WebKit/Source/core/editing/Editor.cpp +++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/Editor.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/EditorKeyBindings.cpp b/third_party/WebKit/Source/core/editing/EditorKeyBindings.cpp index c3dfd76..5b7dd0e 100644 --- a/third_party/WebKit/Source/core/editing/EditorKeyBindings.cpp +++ b/third_party/WebKit/Source/core/editing/EditorKeyBindings.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/Editor.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/editing/EphemeralRange.cpp b/third_party/WebKit/Source/core/editing/EphemeralRange.cpp index e8dbd6740..7a373bc 100644 --- a/third_party/WebKit/Source/core/editing/EphemeralRange.cpp +++ b/third_party/WebKit/Source/core/editing/EphemeralRange.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/EphemeralRange.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp index 7a96e160..ceb95a4 100644 --- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp +++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/FrameSelection.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp index 4916f08..7e0c168 100644 --- a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp +++ b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/FrameSelection.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp b/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp index a10539f..04d955b 100644 --- a/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp +++ b/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/GranularityStrategy.h" #include "core/editing/EditingUtilities.h"
diff --git a/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp b/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp index 8b8c8af..ab2b9d8a 100644 --- a/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp +++ b/third_party/WebKit/Source/core/editing/GranularityStrategyTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "bindings/core/v8/ExceptionStatePlaceholder.h" #include "core/HTMLNames.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.cpp b/third_party/WebKit/Source/core/editing/InputMethodController.cpp index f3f4828c..d1f22bb 100644 --- a/third_party/WebKit/Source/core/editing/InputMethodController.cpp +++ b/third_party/WebKit/Source/core/editing/InputMethodController.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/InputMethodController.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp index a263acb6..20ad741 100644 --- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp +++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/InputMethodController.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/editing/PendingSelection.cpp b/third_party/WebKit/Source/core/editing/PendingSelection.cpp index e9e796c..c33d170 100644 --- a/third_party/WebKit/Source/core/editing/PendingSelection.cpp +++ b/third_party/WebKit/Source/core/editing/PendingSelection.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/editing/PendingSelection.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/PlainTextRange.cpp b/third_party/WebKit/Source/core/editing/PlainTextRange.cpp index 2b18256..d0b7331c 100644 --- a/third_party/WebKit/Source/core/editing/PlainTextRange.cpp +++ b/third_party/WebKit/Source/core/editing/PlainTextRange.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/PlainTextRange.h" #include "core/dom/ContainerNode.h"
diff --git a/third_party/WebKit/Source/core/editing/Position.cpp b/third_party/WebKit/Source/core/editing/Position.cpp index 2f13c06..5268054 100644 --- a/third_party/WebKit/Source/core/editing/Position.cpp +++ b/third_party/WebKit/Source/core/editing/Position.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/Position.h" #include "core/dom/shadow/ElementShadow.h"
diff --git a/third_party/WebKit/Source/core/editing/PositionIterator.cpp b/third_party/WebKit/Source/core/editing/PositionIterator.cpp index 4943b0a..f6cb27b 100644 --- a/third_party/WebKit/Source/core/editing/PositionIterator.cpp +++ b/third_party/WebKit/Source/core/editing/PositionIterator.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/PositionIterator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/PositionTest.cpp b/third_party/WebKit/Source/core/editing/PositionTest.cpp index c6bc2c2..b348eabe 100644 --- a/third_party/WebKit/Source/core/editing/PositionTest.cpp +++ b/third_party/WebKit/Source/core/editing/PositionTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/Position.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/PositionWithAffinity.cpp b/third_party/WebKit/Source/core/editing/PositionWithAffinity.cpp index 004ef80..5e77c8e 100644 --- a/third_party/WebKit/Source/core/editing/PositionWithAffinity.cpp +++ b/third_party/WebKit/Source/core/editing/PositionWithAffinity.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file./* -#include "config.h" #include "core/editing/PositionWithAffinity.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/RenderedPosition.cpp b/third_party/WebKit/Source/core/editing/RenderedPosition.cpp index 96e85c1b..a675bfdf 100644 --- a/third_party/WebKit/Source/core/editing/RenderedPosition.cpp +++ b/third_party/WebKit/Source/core/editing/RenderedPosition.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/RenderedPosition.h" #include "core/editing/TextAffinity.h"
diff --git a/third_party/WebKit/Source/core/editing/SelectionController.cpp b/third_party/WebKit/Source/core/editing/SelectionController.cpp index 4f74bd14..60f179a 100644 --- a/third_party/WebKit/Source/core/editing/SelectionController.cpp +++ b/third_party/WebKit/Source/core/editing/SelectionController.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/SelectionController.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/SelectionEditor.cpp b/third_party/WebKit/Source/core/editing/SelectionEditor.cpp index 74656231..4b980a2 100644 --- a/third_party/WebKit/Source/core/editing/SelectionEditor.cpp +++ b/third_party/WebKit/Source/core/editing/SelectionEditor.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/SelectionEditor.h" #include "core/editing/EditingUtilities.h"
diff --git a/third_party/WebKit/Source/core/editing/SurroundingText.cpp b/third_party/WebKit/Source/core/editing/SurroundingText.cpp index b1984ad..ea69868 100644 --- a/third_party/WebKit/Source/core/editing/SurroundingText.cpp +++ b/third_party/WebKit/Source/core/editing/SurroundingText.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/SurroundingText.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp b/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp index a524b4d..3a9b2c942 100644 --- a/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp +++ b/third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/SurroundingText.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp index 4687c606..095ef9f 100644 --- a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp +++ b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/VisiblePosition.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/VisiblePositionTest.cpp b/third_party/WebKit/Source/core/editing/VisiblePositionTest.cpp index 42517d9..d6e2878 100644 --- a/third_party/WebKit/Source/core/editing/VisiblePositionTest.cpp +++ b/third_party/WebKit/Source/core/editing/VisiblePositionTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/VisiblePosition.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp index 3369e7f..bb227941 100644 --- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/VisibleSelection.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp index 2944e13..f2389234 100644 --- a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/VisibleSelection.h" #include "core/dom/Range.h"
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp index fce62b7b..f3c9222 100644 --- a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/VisibleUnits.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp b/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp index 4a4be2a1..ce80b5cc 100644 --- a/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp +++ b/third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/VisibleUnits.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/AppendNodeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/AppendNodeCommand.cpp index 1f4a801..0312f0d2 100644 --- a/third_party/WebKit/Source/core/editing/commands/AppendNodeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/AppendNodeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/AppendNodeCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp index a3cea54..7d7e65e 100644 --- a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/ApplyBlockElementCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp index b54f6e5..ae543b5 100644 --- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/ApplyStyleCommand.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/BreakBlockquoteCommand.cpp b/third_party/WebKit/Source/core/editing/commands/BreakBlockquoteCommand.cpp index 616fdaf1..6eefd2ea 100644 --- a/third_party/WebKit/Source/core/editing/commands/BreakBlockquoteCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/BreakBlockquoteCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/BreakBlockquoteCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp index bbbb2bd..76a54f1 100644 --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/CompositeEditCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/CreateLinkCommand.cpp b/third_party/WebKit/Source/core/editing/commands/CreateLinkCommand.cpp index b5fe600..7a8838d 100644 --- a/third_party/WebKit/Source/core/editing/commands/CreateLinkCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/CreateLinkCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/CreateLinkCommand.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteFromTextNodeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/DeleteFromTextNodeCommand.cpp index 97c5296..5f1723d 100644 --- a/third_party/WebKit/Source/core/editing/commands/DeleteFromTextNodeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/DeleteFromTextNodeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/DeleteFromTextNodeCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp index 53eb52bf..30606a3 100644 --- a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/DeleteSelectionCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp b/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp index 937170a..f7a74e9 100644 --- a/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/EditCommand.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp index 0a0cb671..00580828 100644 --- a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/Editor.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp b/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp index 27e2d70a..f16db4d 100644 --- a/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/FormatBlockCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp b/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp index c3e6843..87cd3d6 100644 --- a/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/IndentOutdentCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.cpp index 14a4b07..a9e1a29 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertIntoTextNodeCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertLineBreakCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertLineBreakCommand.cpp index 350f0e7c..352946d 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertLineBreakCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertLineBreakCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertLineBreakCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp index 1343fc9..559d6f67 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertListCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp index 60e6259..d38fb50 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertNodeBeforeCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp index 868182be..289dc4a8 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertParagraphSeparatorCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertTextCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertTextCommand.cpp index 75792cc2..843d25f 100644 --- a/third_party/WebKit/Source/core/editing/commands/InsertTextCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/InsertTextCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/InsertTextCommand.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp index a7a6b65..81f9c19 100644 --- a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/MergeIdenticalElementsCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp index f71d234..82522ac 100644 --- a/third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/MoveSelectionCommand.h" #include "core/dom/DocumentFragment.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp b/third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp index 8b403ce..61964b3 100644 --- a/third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/RemoveCSSPropertyCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/RemoveFormatCommand.cpp b/third_party/WebKit/Source/core/editing/commands/RemoveFormatCommand.cpp index cc520f75..7a6163e 100644 --- a/third_party/WebKit/Source/core/editing/commands/RemoveFormatCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/RemoveFormatCommand.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/RemoveFormatCommand.h" #include "core/CSSValueKeywords.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp index 9645893..7bc51dc 100644 --- a/third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/RemoveNodeCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp b/third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp index b2607f0..53e5b7e1 100644 --- a/third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/RemoveNodePreservingChildrenCommand.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceNodeWithSpanCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ReplaceNodeWithSpanCommand.cpp index 10ca60b39..a4bcf1ce 100644 --- a/third_party/WebKit/Source/core/editing/commands/ReplaceNodeWithSpanCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/ReplaceNodeWithSpanCommand.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/ReplaceNodeWithSpanCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp index 1284b2d8..6083763 100644 --- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/ReplaceSelectionCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/SetNodeAttributeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/SetNodeAttributeCommand.cpp index 0b85651..53c0c79 100644 --- a/third_party/WebKit/Source/core/editing/commands/SetNodeAttributeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SetNodeAttributeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SetNodeAttributeCommand.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp b/third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp index ff9a3d43..f201ad3d 100644 --- a/third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SimplifyMarkupCommand.h" #include "core/dom/NodeComputedStyle.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/SmartReplaceCF.cpp b/third_party/WebKit/Source/core/editing/commands/SmartReplaceCF.cpp index 32e04e3..81738f2 100644 --- a/third_party/WebKit/Source/core/editing/commands/SmartReplaceCF.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SmartReplaceCF.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SmartReplace.h" #include <CoreFoundation/CFCharacterSet.h>
diff --git a/third_party/WebKit/Source/core/editing/commands/SmartReplaceICU.cpp b/third_party/WebKit/Source/core/editing/commands/SmartReplaceICU.cpp index 3519af0..ad144a9 100644 --- a/third_party/WebKit/Source/core/editing/commands/SmartReplaceICU.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SmartReplaceICU.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SmartReplace.h" #if !OS(MACOSX)
diff --git a/third_party/WebKit/Source/core/editing/commands/SplitElementCommand.cpp b/third_party/WebKit/Source/core/editing/commands/SplitElementCommand.cpp index bbfa434a..06b6163 100644 --- a/third_party/WebKit/Source/core/editing/commands/SplitElementCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SplitElementCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SplitElementCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/SplitTextNodeCommand.cpp b/third_party/WebKit/Source/core/editing/commands/SplitTextNodeCommand.cpp index 386941f..e1e9aa9 100644 --- a/third_party/WebKit/Source/core/editing/commands/SplitTextNodeCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SplitTextNodeCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SplitTextNodeCommand.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/SplitTextNodeContainingElementCommand.cpp b/third_party/WebKit/Source/core/editing/commands/SplitTextNodeContainingElementCommand.cpp index 9cd8ef3..9b58361b 100644 --- a/third_party/WebKit/Source/core/editing/commands/SplitTextNodeContainingElementCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/SplitTextNodeContainingElementCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/SplitTextNodeContainingElementCommand.h" #include "core/dom/Element.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/TextInsertionBaseCommand.cpp b/third_party/WebKit/Source/core/editing/commands/TextInsertionBaseCommand.cpp index 32f7c3e..fe59b2a6 100644 --- a/third_party/WebKit/Source/core/editing/commands/TextInsertionBaseCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/TextInsertionBaseCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/TextInsertionBaseCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp b/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp index 0808cfb..c041c57 100644 --- a/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/TypingCommand.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp b/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp index 0454512..bff41c2 100644 --- a/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp +++ b/third_party/WebKit/Source/core/editing/commands/UndoStack.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/UndoStack.h" #include "core/dom/ContainerNode.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/UnlinkCommand.cpp b/third_party/WebKit/Source/core/editing/commands/UnlinkCommand.cpp index 5011bdc..a0cf56f 100644 --- a/third_party/WebKit/Source/core/editing/commands/UnlinkCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/UnlinkCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/UnlinkCommand.h" #include "core/html/HTMLAnchorElement.h"
diff --git a/third_party/WebKit/Source/core/editing/commands/WrapContentsInDummySpanCommand.cpp b/third_party/WebKit/Source/core/editing/commands/WrapContentsInDummySpanCommand.cpp index 6e061f0..50a2ae5 100644 --- a/third_party/WebKit/Source/core/editing/commands/WrapContentsInDummySpanCommand.cpp +++ b/third_party/WebKit/Source/core/editing/commands/WrapContentsInDummySpanCommand.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/commands/WrapContentsInDummySpanCommand.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/BackwardsCharacterIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/BackwardsCharacterIterator.cpp index bf7b5ae..eb9b9f2 100644 --- a/third_party/WebKit/Source/core/editing/iterators/BackwardsCharacterIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/BackwardsCharacterIterator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/BackwardsCharacterIterator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/iterators/BitStack.cpp b/third_party/WebKit/Source/core/editing/iterators/BitStack.cpp index 2cc8904..fd699c4 100644 --- a/third_party/WebKit/Source/core/editing/iterators/BitStack.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/BitStack.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/BitStack.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/iterators/CharacterIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/CharacterIterator.cpp index 255ac9a6..ced82921 100644 --- a/third_party/WebKit/Source/core/editing/iterators/CharacterIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/CharacterIterator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/CharacterIterator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp index 3409063..ad67277 100644 --- a/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/CharacterIteratorTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/CharacterIterator.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/FullyClippedStateStack.cpp b/third_party/WebKit/Source/core/editing/iterators/FullyClippedStateStack.cpp index cd9c286..5b3a7cd 100644 --- a/third_party/WebKit/Source/core/editing/iterators/FullyClippedStateStack.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/FullyClippedStateStack.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/iterators/FullyClippedStateStack.h" #include "core/dom/ContainerNode.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp b/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp index a17d949..f829b23 100644 --- a/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/SearchBuffer.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/SearchBufferTest.cpp b/third_party/WebKit/Source/core/editing/iterators/SearchBufferTest.cpp index 0cb33f1..5185b6a 100644 --- a/third_party/WebKit/Source/core/editing/iterators/SearchBufferTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/SearchBufferTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/SearchBuffer.h" #include "core/dom/Range.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp index d10bede..666f536 100644 --- a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/SimplifiedBackwardsTextIterator.h" #include "core/dom/FirstLetterPseudoElement.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp index 2934dfc..b6e0e1b7 100644 --- a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIteratorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/iterators/SimplifiedBackwardsTextIterator.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp index 6c7fa6bb..d7c94cb 100644 --- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/TextIterator.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp index c71ce92d..eb4e3ef 100644 --- a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/TextIterator.h" #include "core/editing/EditingTestBase.h"
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTextState.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTextState.cpp index 89e78b1..712ac63 100644 --- a/third_party/WebKit/Source/core/editing/iterators/TextIteratorTextState.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/TextIteratorTextState.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/TextIteratorTextState.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/iterators/WordAwareIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/WordAwareIterator.cpp index d7225bd7..224a5f4 100644 --- a/third_party/WebKit/Source/core/editing/iterators/WordAwareIterator.cpp +++ b/third_party/WebKit/Source/core/editing/iterators/WordAwareIterator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/iterators/WordAwareIterator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp index eb0103e..f4c2d3e 100644 --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/markers/DocumentMarker.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp index 4dc17fe..74c20b4 100644 --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/editing/markers/DocumentMarkerController.h" #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp index db1581a0..199c7b9 100644 --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/markers/DocumentMarkerController.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/HTMLInterchange.cpp b/third_party/WebKit/Source/core/editing/serializers/HTMLInterchange.cpp index 762188e..34d9a48 100644 --- a/third_party/WebKit/Source/core/editing/serializers/HTMLInterchange.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/HTMLInterchange.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/HTMLInterchange.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.cpp b/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.cpp index 24c87e5..b40cc07 100644 --- a/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/MarkupAccumulator.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/MarkupFormatter.cpp b/third_party/WebKit/Source/core/editing/serializers/MarkupFormatter.cpp index 317e8c6f..fdfe7b0 100644 --- a/third_party/WebKit/Source/core/editing/serializers/MarkupFormatter.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/MarkupFormatter.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/MarkupFormatter.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp b/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp index f7850f0..675c0ca 100644 --- a/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/Serialization.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp index 7c62a93..83d4b788 100644 --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/StyledMarkupAccumulator.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp index 13893b5..696e40d 100644 --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/serializers/StyledMarkupSerializer.h" #include "core/css/StylePropertySet.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp index 838aa4d..c0cad22 100644 --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/serializers/StyledMarkupSerializer.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/editing/serializers/TextOffset.cpp b/third_party/WebKit/Source/core/editing/serializers/TextOffset.cpp index e1e31b1c..efdc11c 100644 --- a/third_party/WebKit/Source/core/editing/serializers/TextOffset.cpp +++ b/third_party/WebKit/Source/core/editing/serializers/TextOffset.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/editing/serializers/TextOffset.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp index 23073795..3671c29 100644 --- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp +++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/spellcheck/SpellCheckRequester.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp index 8dbfcaae..972d1a10 100644 --- a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp +++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/spellcheck/SpellChecker.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/TextCheckingHelper.cpp b/third_party/WebKit/Source/core/editing/spellcheck/TextCheckingHelper.cpp index c2186724..720266816 100644 --- a/third_party/WebKit/Source/core/editing/spellcheck/TextCheckingHelper.cpp +++ b/third_party/WebKit/Source/core/editing/spellcheck/TextCheckingHelper.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/editing/spellcheck/TextCheckingHelper.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/events/EventListenerMap.cpp b/third_party/WebKit/Source/core/events/EventListenerMap.cpp index c2b85e5..7c8486f 100644 --- a/third_party/WebKit/Source/core/events/EventListenerMap.cpp +++ b/third_party/WebKit/Source/core/events/EventListenerMap.cpp
@@ -49,7 +49,7 @@ #if ENABLE(ASSERT) static Mutex& activeIteratorCountMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex()); return mutex; }
diff --git a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp index 38be6ee..b6d7ca3 100644 --- a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp +++ b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp
@@ -57,7 +57,7 @@ bool isOnAccessControlResponseHeaderWhitelist(const String& name) { - DEFINE_STATIC_LOCAL_THREAD_SAFE(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().leakPtr())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().leakPtr())); return allowedCrossOriginResponseHeaders.contains(name); } @@ -130,9 +130,9 @@ bool passesAccessControlCheck(const ResourceResponse& response, StoredCredentials includeCredentials, SecurityOrigin* securityOrigin, String& errorDescription, WebURLRequest::RequestContext context) { - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowOriginHeaderName, (new AtomicString("access-control-allow-origin", AtomicString::ConstructFromLiteral))); - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowCredentialsHeaderName, (new AtomicString("access-control-allow-credentials", AtomicString::ConstructFromLiteral))); - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowSuboriginHeaderName, (new AtomicString("access-control-allow-suborigin", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowOriginHeaderName, (new AtomicString("access-control-allow-origin", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowCredentialsHeaderName, (new AtomicString("access-control-allow-credentials", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowSuboriginHeaderName, (new AtomicString("access-control-allow-suborigin", AtomicString::ConstructFromLiteral))); int statusCode = response.httpStatusCode();
diff --git a/third_party/WebKit/Source/core/fetch/FetchUtils.cpp b/third_party/WebKit/Source/core/fetch/FetchUtils.cpp index 96f58da..2c6aa51 100644 --- a/third_party/WebKit/Source/core/fetch/FetchUtils.cpp +++ b/third_party/WebKit/Source/core/fetch/FetchUtils.cpp
@@ -70,7 +70,7 @@ const ForbiddenHeaderNames& ForbiddenHeaderNames::get() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const ForbiddenHeaderNames, instance, new ForbiddenHeaderNames); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const ForbiddenHeaderNames, instance, new ForbiddenHeaderNames); return instance; }
diff --git a/third_party/WebKit/Source/core/fileapi/Blob.cpp b/third_party/WebKit/Source/core/fileapi/Blob.cpp index e415616..41426182 100644 --- a/third_party/WebKit/Source/core/fileapi/Blob.cpp +++ b/third_party/WebKit/Source/core/fileapi/Blob.cpp
@@ -69,7 +69,7 @@ // (This code assumes it is safe to register or unregister URLs on // BlobURLRegistry (that is implemented by the embedder) on // multiple threads.) - DEFINE_STATIC_LOCAL_THREAD_SAFE(BlobURLRegistry, instance, new BlobURLRegistry()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(BlobURLRegistry, instance, new BlobURLRegistry()); return instance; }
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp index 6bc07af..75d4fc3 100644 --- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp +++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
@@ -166,8 +166,7 @@ if (!frame()) return false; - String unusedErrorMessage; - return document()->isSecureContext(unusedErrorMessage, ExecutionContext::StandardSecureContextCheck); + return document()->isSecureContext(ExecutionContext::StandardSecureContextCheck); } void DOMWindow::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, const String& targetOrigin, LocalDOMWindow* source, ExceptionState& exceptionState)
diff --git a/third_party/WebKit/Source/core/frame/NavigatorID.cpp b/third_party/WebKit/Source/core/frame/NavigatorID.cpp index 36aa4eb..7a403ae3 100644 --- a/third_party/WebKit/Source/core/frame/NavigatorID.cpp +++ b/third_party/WebKit/Source/core/frame/NavigatorID.cpp
@@ -67,7 +67,7 @@ return "Win32"; #else // Unix-like systems struct utsname osname; - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<String>, platformName, new ThreadSpecific<String>()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<String>, platformName, new ThreadSpecific<String>()); if (platformName->isNull()) { *platformName = String(uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString()); }
diff --git a/third_party/WebKit/Source/core/html/AutoplayExperimentHelper.cpp b/third_party/WebKit/Source/core/html/AutoplayExperimentHelper.cpp index a06dc57..65b7483b 100644 --- a/third_party/WebKit/Source/core/html/AutoplayExperimentHelper.cpp +++ b/third_party/WebKit/Source/core/html/AutoplayExperimentHelper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/AutoplayExperimentHelper.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/ClassList.cpp b/third_party/WebKit/Source/core/html/ClassList.cpp index 53afc2e..b003caa 100644 --- a/third_party/WebKit/Source/core/html/ClassList.cpp +++ b/third_party/WebKit/Source/core/html/ClassList.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/ClassList.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp b/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp index a8b2f69..05da0e7 100644 --- a/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp +++ b/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/CrossOriginAttribute.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/DocumentNameCollection.cpp b/third_party/WebKit/Source/core/html/DocumentNameCollection.cpp index 664b0f1d..ee74259 100644 --- a/third_party/WebKit/Source/core/html/DocumentNameCollection.cpp +++ b/third_party/WebKit/Source/core/html/DocumentNameCollection.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/DocumentNameCollection.h" #include "core/html/HTMLEmbedElement.h"
diff --git a/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp b/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp index d98ae0a..af5fa67 100644 --- a/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp +++ b/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/FormAssociatedElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/FormData.cpp b/third_party/WebKit/Source/core/html/FormData.cpp index aac1c6f2..470f40cb 100644 --- a/third_party/WebKit/Source/core/html/FormData.cpp +++ b/third_party/WebKit/Source/core/html/FormData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/FormData.h" #include "core/fileapi/Blob.h"
diff --git a/third_party/WebKit/Source/core/html/FormDataTest.cpp b/third_party/WebKit/Source/core/html/FormDataTest.cpp index c7b21a08..0eb0a66 100644 --- a/third_party/WebKit/Source/core/html/FormDataTest.cpp +++ b/third_party/WebKit/Source/core/html/FormDataTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/FormData.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLAllCollection.cpp b/third_party/WebKit/Source/core/html/HTMLAllCollection.cpp index 9b7c0e29..834bfb9 100644 --- a/third_party/WebKit/Source/core/html/HTMLAllCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLAllCollection.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLAllCollection.h" #include "bindings/core/v8/UnionTypesCore.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp index 45c444fa..3dbdcc3b 100644 --- a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLAnchorElement.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLAreaElement.cpp b/third_party/WebKit/Source/core/html/HTMLAreaElement.cpp index 57963a05..d52b2d0 100644 --- a/third_party/WebKit/Source/core/html/HTMLAreaElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLAreaElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLAreaElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLAudioElement.cpp b/third_party/WebKit/Source/core/html/HTMLAudioElement.cpp index 6607ab4..71b329b 100644 --- a/third_party/WebKit/Source/core/html/HTMLAudioElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLAudioElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLAudioElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLBRElement.cpp b/third_party/WebKit/Source/core/html/HTMLBRElement.cpp index a8747c8..e336d42 100644 --- a/third_party/WebKit/Source/core/html/HTMLBRElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLBRElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLBRElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLBaseElement.cpp b/third_party/WebKit/Source/core/html/HTMLBaseElement.cpp index 3348998..94850ba7 100644 --- a/third_party/WebKit/Source/core/html/HTMLBaseElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLBaseElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLBaseElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp b/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp index ba44f05..4e53552d 100644 --- a/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLBodyElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLBodyElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp b/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp index b62d0e8..3f653b69 100644 --- a/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp
@@ -23,7 +23,6 @@ * */ -#include "config.h" #include "core/html/HTMLButtonElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp index e318fc7..11eb39f 100644 --- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLCanvasElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLCollection.cpp b/third_party/WebKit/Source/core/html/HTMLCollection.cpp index 0cf1470..194ae8e 100644 --- a/third_party/WebKit/Source/core/html/HTMLCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLCollection.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/html/HTMLCollection.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLContentElement.cpp b/third_party/WebKit/Source/core/html/HTMLContentElement.cpp index 30b10bf..36d42a5 100644 --- a/third_party/WebKit/Source/core/html/HTMLContentElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLContentElement.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLContentElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDListElement.cpp b/third_party/WebKit/Source/core/html/HTMLDListElement.cpp index 1ee9a97..6eb38a7 100644 --- a/third_party/WebKit/Source/core/html/HTMLDListElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDListElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLDListElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDataListElement.cpp b/third_party/WebKit/Source/core/html/HTMLDataListElement.cpp index 6e57b31d..ff510b7 100644 --- a/third_party/WebKit/Source/core/html/HTMLDataListElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDataListElement.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLDataListElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp index 2a7f224..92005264 100644 --- a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "core/html/HTMLDetailsElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp b/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp index 03fb812..0e86879 100644 --- a/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLDialogElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDimension.cpp b/third_party/WebKit/Source/core/html/HTMLDimension.cpp index c85e02d0..80a8df9 100644 --- a/third_party/WebKit/Source/core/html/HTMLDimension.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDimension.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLDimension.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDimensionTest.cpp b/third_party/WebKit/Source/core/html/HTMLDimensionTest.cpp index f990832..0bb3de85 100644 --- a/third_party/WebKit/Source/core/html/HTMLDimensionTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDimensionTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLDimension.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDirectoryElement.cpp b/third_party/WebKit/Source/core/html/HTMLDirectoryElement.cpp index cf4af33..d63ff305 100644 --- a/third_party/WebKit/Source/core/html/HTMLDirectoryElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDirectoryElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLDirectoryElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDivElement.cpp b/third_party/WebKit/Source/core/html/HTMLDivElement.cpp index 9622f00..7ee4144 100644 --- a/third_party/WebKit/Source/core/html/HTMLDivElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDivElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLDivElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDocument.cpp b/third_party/WebKit/Source/core/html/HTMLDocument.cpp index 87bcb04..d634c1e 100644 --- a/third_party/WebKit/Source/core/html/HTMLDocument.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDocument.cpp
@@ -50,7 +50,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/html/HTMLDocument.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLElement.cpp b/third_party/WebKit/Source/core/html/HTMLElement.cpp index e54d4128..c93cc61 100644 --- a/third_party/WebKit/Source/core/html/HTMLElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp index 71f9481..d90c9e1 100644 --- a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLEmbedElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp b/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp index e113b1b5..666ffbb 100644 --- a/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLFieldSetElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFontElement.cpp b/third_party/WebKit/Source/core/html/HTMLFontElement.cpp index 06269fa..01b72c534 100644 --- a/third_party/WebKit/Source/core/html/HTMLFontElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFontElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLFontElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp index 7847d89..1e45b74 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLFormControlElement.h" #include "core/dom/ElementTraversal.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp index 2e26776..f9d1eed 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLFormControlElement.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlElementWithState.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlElementWithState.cpp index 88c2036..8e953ad 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormControlElementWithState.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElementWithState.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLFormControlElementWithState.h" #include "core/frame/FrameHost.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp index bbdceba87..5059685 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/html/HTMLFormControlsCollection.h" #include "bindings/core/v8/UnionTypesCore.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp index c4c074b..39a0f252 100644 --- a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLFormElement.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElement.cpp index 72692047..f9ca0a2 100644 --- a/third_party/WebKit/Source/core/html/HTMLFrameElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFrameElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLFrameElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp index b88f3f2..cfa82039 100644 --- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLFrameElementBase.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp index 4272b022..fb6be83 100644 --- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "core/html/HTMLFrameOwnerElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp index fb95d5f..b474542 100644 --- a/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLFrameSetElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLHRElement.cpp b/third_party/WebKit/Source/core/html/HTMLHRElement.cpp index f3b2f3c..1b8e7ad3 100644 --- a/third_party/WebKit/Source/core/html/HTMLHRElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLHRElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLHRElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLHeadElement.cpp b/third_party/WebKit/Source/core/html/HTMLHeadElement.cpp index 71935d0..eb57fa4 100644 --- a/third_party/WebKit/Source/core/html/HTMLHeadElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLHeadElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLHeadElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLHeadingElement.cpp b/third_party/WebKit/Source/core/html/HTMLHeadingElement.cpp index 7a6edad..a9fd36d7 100644 --- a/third_party/WebKit/Source/core/html/HTMLHeadingElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLHeadingElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLHeadingElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/HTMLHtmlElement.cpp b/third_party/WebKit/Source/core/html/HTMLHtmlElement.cpp index ef0936d..537412f 100644 --- a/third_party/WebKit/Source/core/html/HTMLHtmlElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLHtmlElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLHtmlElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp b/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp index 43abe48..c99c1339 100644 --- a/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLIFrameElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp index 858b47a..f1fed960 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLImageElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp index 51046607..9768137 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLImageElement.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp b/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp index 59a634e..8994abc8 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageFallbackHelper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLImageFallbackHelper.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp b/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp index eabff06e..58e990c 100644 --- a/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp +++ b/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLImageLoader.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp index e816a553..c28defb 100644 --- a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
@@ -26,7 +26,6 @@ * */ -#include "config.h" #include "core/html/HTMLInputElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp index 36c8593..b8b7b194 100644 --- a/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLInputElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLInputElement.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp b/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp index cdf6b78..fab51b6 100644 --- a/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLKeygenElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLIElement.cpp b/third_party/WebKit/Source/core/html/HTMLLIElement.cpp index 3d9fb71..4fa70f6 100644 --- a/third_party/WebKit/Source/core/html/HTMLLIElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLIElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLLIElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp b/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp index 52932b1..46a8ca7a 100644 --- a/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLabelElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLLabelElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLegendElement.cpp b/third_party/WebKit/Source/core/html/HTMLLegendElement.cpp index 19e95de..4a81014 100644 --- a/third_party/WebKit/Source/core/html/HTMLLegendElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLegendElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLLegendElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp index 5930a5a3..2ad3eee6 100644 --- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLLinkElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElementSizesAttributeTest.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElementSizesAttributeTest.cpp index 9586d35..d600eb9 100644 --- a/third_party/WebKit/Source/core/html/HTMLLinkElementSizesAttributeTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLLinkElementSizesAttributeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLLinkElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMapElement.cpp b/third_party/WebKit/Source/core/html/HTMLMapElement.cpp index d1e48c2..9885a5e7 100644 --- a/third_party/WebKit/Source/core/html/HTMLMapElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMapElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLMapElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMarqueeElement.cpp b/third_party/WebKit/Source/core/html/HTMLMarqueeElement.cpp index 95a8d107..8317dac0 100644 --- a/third_party/WebKit/Source/core/html/HTMLMarqueeElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMarqueeElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLMarqueeElement.h" #include "bindings/core/v8/PrivateScriptRunner.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp index cbef8326..65ec407 100644 --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLMediaElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaSource.cpp b/third_party/WebKit/Source/core/html/HTMLMediaSource.cpp index ac069696..a2f6eac 100644 --- a/third_party/WebKit/Source/core/html/HTMLMediaSource.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMediaSource.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLMediaSource.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/HTMLMenuElement.cpp b/third_party/WebKit/Source/core/html/HTMLMenuElement.cpp index b27a0521..e496b7d0 100644 --- a/third_party/WebKit/Source/core/html/HTMLMenuElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMenuElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLMenuElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp b/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp index 94163c3..8d512dd 100644 --- a/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLMenuItemElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMetaElement-in.cpp b/third_party/WebKit/Source/core/html/HTMLMetaElement-in.cpp index 94e2597b..1a486c4 100644 --- a/third_party/WebKit/Source/core/html/HTMLMetaElement-in.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMetaElement-in.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLMetaElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLMeterElement.cpp b/third_party/WebKit/Source/core/html/HTMLMeterElement.cpp index e148c221..34378d43 100644 --- a/third_party/WebKit/Source/core/html/HTMLMeterElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMeterElement.cpp
@@ -18,8 +18,6 @@ * */ -#include "config.h" - #include "core/html/HTMLMeterElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLModElement.cpp b/third_party/WebKit/Source/core/html/HTMLModElement.cpp index c3e8dba..d69cf16 100644 --- a/third_party/WebKit/Source/core/html/HTMLModElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLModElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLModElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLNameCollection.cpp b/third_party/WebKit/Source/core/html/HTMLNameCollection.cpp index 5583817..92f7e4d 100644 --- a/third_party/WebKit/Source/core/html/HTMLNameCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLNameCollection.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLNameCollection.h" #include "core/dom/NodeRareData.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLNoEmbedElement.cpp b/third_party/WebKit/Source/core/html/HTMLNoEmbedElement.cpp index 3feab6f..01f87bd 100644 --- a/third_party/WebKit/Source/core/html/HTMLNoEmbedElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLNoEmbedElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLNoEmbedElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLNoScriptElement.cpp b/third_party/WebKit/Source/core/html/HTMLNoScriptElement.cpp index 9f1893f5..24b7d16 100644 --- a/third_party/WebKit/Source/core/html/HTMLNoScriptElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLNoScriptElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLNoScriptElement.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOListElement.cpp b/third_party/WebKit/Source/core/html/HTMLOListElement.cpp index ff79326..16398a93 100644 --- a/third_party/WebKit/Source/core/html/HTMLOListElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOListElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLOListElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp index bab324a..ecaafa6 100644 --- a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLObjectElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp index f29cd36..48e5638 100644 --- a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLOptGroupElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp index 07ba7a7..7c203d1 100644 --- a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "core/html/HTMLOptionElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOptionsCollection.cpp b/third_party/WebKit/Source/core/html/HTMLOptionsCollection.cpp index 1b9c619..f0be24c 100644 --- a/third_party/WebKit/Source/core/html/HTMLOptionsCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOptionsCollection.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "core/html/HTMLOptionsCollection.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp b/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp index b275d29..d34d228 100644 --- a/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLOutputElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOutputElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLOutputElementTest.cpp index 55f809e..681c65e 100644 --- a/third_party/WebKit/Source/core/html/HTMLOutputElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLOutputElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLOutputElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp b/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp index 0558de6..42e2475 100644 --- a/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLParagraphElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLParamElement.cpp b/third_party/WebKit/Source/core/html/HTMLParamElement.cpp index cea83e9..605f220 100644 --- a/third_party/WebKit/Source/core/html/HTMLParamElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLParamElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLParamElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLPictureElement.cpp b/third_party/WebKit/Source/core/html/HTMLPictureElement.cpp index f71379d..d8621e4 100644 --- a/third_party/WebKit/Source/core/html/HTMLPictureElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLPictureElement.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLPictureElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp index 98f8549..dde905f7 100644 --- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLPlugInElement.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLPreElement.cpp b/third_party/WebKit/Source/core/html/HTMLPreElement.cpp index c38f5b7..d1aaca04 100644 --- a/third_party/WebKit/Source/core/html/HTMLPreElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLPreElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLPreElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLProgressElement.cpp b/third_party/WebKit/Source/core/html/HTMLProgressElement.cpp index 5775a2b..e61bce0f 100644 --- a/third_party/WebKit/Source/core/html/HTMLProgressElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLProgressElement.cpp
@@ -18,8 +18,6 @@ * */ -#include "config.h" - #include "core/html/HTMLProgressElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLQuoteElement.cpp b/third_party/WebKit/Source/core/html/HTMLQuoteElement.cpp index fbf77d4f..6643c0eb5 100644 --- a/third_party/WebKit/Source/core/html/HTMLQuoteElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLQuoteElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLQuoteElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLRTElement.cpp b/third_party/WebKit/Source/core/html/HTMLRTElement.cpp index 70c8bad..37409f79 100644 --- a/third_party/WebKit/Source/core/html/HTMLRTElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLRTElement.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLRTElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLRubyElement.cpp b/third_party/WebKit/Source/core/html/HTMLRubyElement.cpp index 64d9cf2..97820da5 100644 --- a/third_party/WebKit/Source/core/html/HTMLRubyElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLRubyElement.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLRubyElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLScriptElement.cpp b/third_party/WebKit/Source/core/html/HTMLScriptElement.cpp index 040685b6..117f628 100644 --- a/third_party/WebKit/Source/core/html/HTMLScriptElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLScriptElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLScriptElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp index 8dd4727..fb8cc0d92 100644 --- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/html/HTMLSelectElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp index 0ced232b..a539b19 100644 --- a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLSelectElement.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLShadowElement.cpp b/third_party/WebKit/Source/core/html/HTMLShadowElement.cpp index 4b0a945..1ec5c2c 100644 --- a/third_party/WebKit/Source/core/html/HTMLShadowElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLShadowElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLShadowElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp b/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp index 57e12cd..cf907c2 100644 --- a/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSlotElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLSlotElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSourceElement.cpp b/third_party/WebKit/Source/core/html/HTMLSourceElement.cpp index 36f820d..edb3afb 100644 --- a/third_party/WebKit/Source/core/html/HTMLSourceElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSourceElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLSourceElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSpanElement.cpp b/third_party/WebKit/Source/core/html/HTMLSpanElement.cpp index 7d78b9d..da43a32e 100644 --- a/third_party/WebKit/Source/core/html/HTMLSpanElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSpanElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLSpanElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLStyleElement.cpp b/third_party/WebKit/Source/core/html/HTMLStyleElement.cpp index f562876..f4625703 100644 --- a/third_party/WebKit/Source/core/html/HTMLStyleElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLStyleElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLStyleElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp b/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp index b517bbc..48dde839 100644 --- a/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSummaryElement.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "core/html/HTMLSummaryElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableCaptionElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableCaptionElement.cpp index 0064905..b197a11 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableCaptionElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableCaptionElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableCaptionElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp index cc43b02..f5738e4 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableCellElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableCellElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableColElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableColElement.cpp index 81a9a0c..e5ea531 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableColElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableColElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableColElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp index 2b4669c..60fd74cc 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp b/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp index 137d35a..c4e8931 100644 --- a/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTablePartElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableRowElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableRowElement.cpp index 8c071d6..4cd1b55 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableRowElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableRowElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableRowElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableRowElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLTableRowElementTest.cpp index 221f7b6..d6fd3363 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableRowElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableRowElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLTableRowElement.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableRowsCollection.cpp b/third_party/WebKit/Source/core/html/HTMLTableRowsCollection.cpp index 986ee225..0eb4e69 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableRowsCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableRowsCollection.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLTableRowsCollection.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTableSectionElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableSectionElement.cpp index 17d8a3e..d26f9c76 100644 --- a/third_party/WebKit/Source/core/html/HTMLTableSectionElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTableSectionElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTableSectionElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTagCollection.cpp b/third_party/WebKit/Source/core/html/HTMLTagCollection.cpp index 8f78fc94..ba08802 100644 --- a/third_party/WebKit/Source/core/html/HTMLTagCollection.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTagCollection.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "HTMLTagCollection.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/HTMLTemplateElement.cpp b/third_party/WebKit/Source/core/html/HTMLTemplateElement.cpp index 8ab2334..91ab92b 100644 --- a/third_party/WebKit/Source/core/html/HTMLTemplateElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTemplateElement.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/html/HTMLTemplateElement.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp index a8de3ca..e0c03a3 100644 --- a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
@@ -23,7 +23,6 @@ * */ -#include "config.h" #include "core/html/HTMLTextAreaElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp b/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp index 40a2317c..55ef1282 100644 --- a/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/HTMLTextFormControlElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTextFormControlElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLTextFormControlElementTest.cpp index 590560d9..f2ad8b4 100644 --- a/third_party/WebKit/Source/core/html/HTMLTextFormControlElementTest.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTextFormControlElementTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/HTMLTextFormControlElement.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTitleElement.cpp b/third_party/WebKit/Source/core/html/HTMLTitleElement.cpp index 30e6735b..02eadd3 100644 --- a/third_party/WebKit/Source/core/html/HTMLTitleElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTitleElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/HTMLTitleElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp b/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp index 07e7acf1..f17b2df 100644 --- a/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLTrackElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLUListElement.cpp b/third_party/WebKit/Source/core/html/HTMLUListElement.cpp index 8015d7e..9d186316 100644 --- a/third_party/WebKit/Source/core/html/HTMLUListElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLUListElement.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/HTMLUListElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp b/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp index afae0fe3..6847cd14 100644 --- a/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLVideoElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLViewSourceDocument.cpp b/third_party/WebKit/Source/core/html/HTMLViewSourceDocument.cpp index 9cfa174..265b95b8 100644 --- a/third_party/WebKit/Source/core/html/HTMLViewSourceDocument.cpp +++ b/third_party/WebKit/Source/core/html/HTMLViewSourceDocument.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLViewSourceDocument.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLWBRElement.cpp b/third_party/WebKit/Source/core/html/HTMLWBRElement.cpp index f06075a..3dfbfa1 100644 --- a/third_party/WebKit/Source/core/html/HTMLWBRElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLWBRElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/HTMLWBRElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/ImageData.cpp b/third_party/WebKit/Source/core/html/ImageData.cpp index 27d788b1..13987f5 100644 --- a/third_party/WebKit/Source/core/html/ImageData.cpp +++ b/third_party/WebKit/Source/core/html/ImageData.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/ImageData.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp index 0b160dd..2fd5401 100644 --- a/third_party/WebKit/Source/core/html/ImageDocument.cpp +++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/ImageDocument.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/LabelableElement.cpp b/third_party/WebKit/Source/core/html/LabelableElement.cpp index 8b211b83..48678edd 100644 --- a/third_party/WebKit/Source/core/html/LabelableElement.cpp +++ b/third_party/WebKit/Source/core/html/LabelableElement.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/html/LabelableElement.h" #include "core/dom/NodeRareData.h"
diff --git a/third_party/WebKit/Source/core/html/LabelsNodeList.cpp b/third_party/WebKit/Source/core/html/LabelsNodeList.cpp index bbf43f5..cb881e7 100644 --- a/third_party/WebKit/Source/core/html/LabelsNodeList.cpp +++ b/third_party/WebKit/Source/core/html/LabelsNodeList.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/LabelsNodeList.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/LinkManifest.cpp b/third_party/WebKit/Source/core/html/LinkManifest.cpp index eb67d21..2e80c5c 100644 --- a/third_party/WebKit/Source/core/html/LinkManifest.cpp +++ b/third_party/WebKit/Source/core/html/LinkManifest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/LinkManifest.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp b/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp index 9d04ca2e..0c87a40 100644 --- a/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp +++ b/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp
@@ -29,7 +29,6 @@ * */ -#include "config.h" #include "core/html/LinkRelAttribute.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/core/html/LinkRelAttributeTest.cpp b/third_party/WebKit/Source/core/html/LinkRelAttributeTest.cpp index 36af255..d1e4cd0 100644 --- a/third_party/WebKit/Source/core/html/LinkRelAttributeTest.cpp +++ b/third_party/WebKit/Source/core/html/LinkRelAttributeTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/LinkRelAttribute.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/core/html/LinkResource.cpp b/third_party/WebKit/Source/core/html/LinkResource.cpp index ee7a3345..4ae98b11d 100644 --- a/third_party/WebKit/Source/core/html/LinkResource.cpp +++ b/third_party/WebKit/Source/core/html/LinkResource.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/LinkResource.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/MediaDocument.cpp b/third_party/WebKit/Source/core/html/MediaDocument.cpp index f402f94..3425cdbe 100644 --- a/third_party/WebKit/Source/core/html/MediaDocument.cpp +++ b/third_party/WebKit/Source/core/html/MediaDocument.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/html/MediaDocument.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/MediaFragmentURIParser.cpp b/third_party/WebKit/Source/core/html/MediaFragmentURIParser.cpp index f3f4e39..ff94b20 100644 --- a/third_party/WebKit/Source/core/html/MediaFragmentURIParser.cpp +++ b/third_party/WebKit/Source/core/html/MediaFragmentURIParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/MediaFragmentURIParser.h" #include "wtf/text/CString.h"
diff --git a/third_party/WebKit/Source/core/html/MediaKeyEvent.cpp b/third_party/WebKit/Source/core/html/MediaKeyEvent.cpp index 4b6c527..1f6f902 100644 --- a/third_party/WebKit/Source/core/html/MediaKeyEvent.cpp +++ b/third_party/WebKit/Source/core/html/MediaKeyEvent.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/MediaKeyEvent.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/PluginDocument.cpp b/third_party/WebKit/Source/core/html/PluginDocument.cpp index b10bfbf..1243925 100644 --- a/third_party/WebKit/Source/core/html/PluginDocument.cpp +++ b/third_party/WebKit/Source/core/html/PluginDocument.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/PluginDocument.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/PublicURLManager.cpp b/third_party/WebKit/Source/core/html/PublicURLManager.cpp index 4266c16..02e547dab 100644 --- a/third_party/WebKit/Source/core/html/PublicURLManager.cpp +++ b/third_party/WebKit/Source/core/html/PublicURLManager.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/PublicURLManager.h" #include "core/fetch/MemoryCache.h"
diff --git a/third_party/WebKit/Source/core/html/RadioNodeList.cpp b/third_party/WebKit/Source/core/html/RadioNodeList.cpp index 2f2831fa..3bdad8f 100644 --- a/third_party/WebKit/Source/core/html/RadioNodeList.cpp +++ b/third_party/WebKit/Source/core/html/RadioNodeList.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/RadioNodeList.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/RelList.cpp b/third_party/WebKit/Source/core/html/RelList.cpp index 0204a9b..7d620f2b 100644 --- a/third_party/WebKit/Source/core/html/RelList.cpp +++ b/third_party/WebKit/Source/core/html/RelList.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/RelList.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/TextDocument.cpp b/third_party/WebKit/Source/core/html/TextDocument.cpp index 48c7355..8f5364e 100644 --- a/third_party/WebKit/Source/core/html/TextDocument.cpp +++ b/third_party/WebKit/Source/core/html/TextDocument.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/TextDocument.h" #include "core/html/parser/TextDocumentParser.h"
diff --git a/third_party/WebKit/Source/core/html/TimeRanges.cpp b/third_party/WebKit/Source/core/html/TimeRanges.cpp index ac9caa27..507e7bb 100644 --- a/third_party/WebKit/Source/core/html/TimeRanges.cpp +++ b/third_party/WebKit/Source/core/html/TimeRanges.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/TimeRanges.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/TimeRangesTest.cpp b/third_party/WebKit/Source/core/html/TimeRangesTest.cpp index cf30053..e15728a 100644 --- a/third_party/WebKit/Source/core/html/TimeRangesTest.cpp +++ b/third_party/WebKit/Source/core/html/TimeRangesTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/TimeRanges.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/ValidityState.cpp b/third_party/WebKit/Source/core/html/ValidityState.cpp index 850b867..af1329b 100644 --- a/third_party/WebKit/Source/core/html/ValidityState.cpp +++ b/third_party/WebKit/Source/core/html/ValidityState.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/html/ValidityState.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/WindowNameCollection.cpp b/third_party/WebKit/Source/core/html/WindowNameCollection.cpp index 4adf390..7981901 100644 --- a/third_party/WebKit/Source/core/html/WindowNameCollection.cpp +++ b/third_party/WebKit/Source/core/html/WindowNameCollection.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/WindowNameCollection.h" #include "core/html/HTMLImageElement.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp index e3dc53e2..4158ea9 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "CanvasAsyncBlobCreator.h" #include "core/fileapi/File.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp index 0c9ea6f..3b33467 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/html/canvas/CanvasFontCache.h" #include "core/css/parser/CSSParser.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp index 6245573..e643b44 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasFontCacheTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/canvas/CanvasFontCache.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp index e7c8d4e1..517c7fbf0 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/canvas/CanvasRenderingContext.h" #include "core/html/canvas/CanvasImageSource.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/OffScreenCanvas.cpp b/third_party/WebKit/Source/core/html/canvas/OffScreenCanvas.cpp index 94e7e62b5..ced18e86 100644 --- a/third_party/WebKit/Source/core/html/canvas/OffScreenCanvas.cpp +++ b/third_party/WebKit/Source/core/html/canvas/OffScreenCanvas.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/canvas/OffScreenCanvas.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseButtonInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseButtonInputType.cpp index 91b0f75..9eb0bba 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseButtonInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseButtonInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/BaseButtonInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp index 0a202b2..f30b2e6 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/BaseCheckableInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.cpp index 3b6f8aae..63c40441 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if !ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/BaseChooserOnlyDateAndTimeInputType.h" +#if !ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "bindings/core/v8/ExceptionStatePlaceholder.h" #include "core/dom/Document.h" #include "core/dom/shadow/ShadowRoot.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h index 492e76f..552d1d1 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h +++ b/third_party/WebKit/Source/core/html/forms/BaseChooserOnlyDateAndTimeInputType.h
@@ -26,6 +26,8 @@ #ifndef BaseChooserOnlyDateAndTimeInputType_h #define BaseChooserOnlyDateAndTimeInputType_h +#include "wtf/build_config.h" + #if !ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/BaseClickableWithKeyInputType.h" #include "core/html/forms/BaseDateAndTimeInputType.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseClickableWithKeyInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseClickableWithKeyInputType.cpp index 30f511f..dd26b17 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseClickableWithKeyInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseClickableWithKeyInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/BaseClickableWithKeyInputType.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp index 5f7cd3c0..1e199efa 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/BaseDateAndTimeInputType.h" #include "core/html/HTMLInputElement.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp index 35bfcbe6..29b1784 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp
@@ -28,10 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/BaseMultipleFieldsDateAndTimeInputType.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/CSSValueKeywords.h" #include "core/dom/shadow/ShadowRoot.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.h b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.h index 7273906..21df580 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.h +++ b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.h
@@ -31,9 +31,10 @@ #ifndef BaseMultipleFieldsDateAndTimeInputType_h #define BaseMultipleFieldsDateAndTimeInputType_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/BaseDateAndTimeInputType.h" - #include "core/html/shadow/ClearButtonElement.h" #include "core/html/shadow/DateTimeEditElement.h" #include "core/html/shadow/PickerIndicatorElement.h"
diff --git a/third_party/WebKit/Source/core/html/forms/BaseTextInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseTextInputType.cpp index 8f6e02f..8d7065a 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseTextInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseTextInputType.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/html/forms/BaseTextInputType.h" #include "bindings/core/v8/ScriptRegexp.h"
diff --git a/third_party/WebKit/Source/core/html/forms/ButtonInputType.cpp b/third_party/WebKit/Source/core/html/forms/ButtonInputType.cpp index 2b86cc73e..dfea82d7 100644 --- a/third_party/WebKit/Source/core/html/forms/ButtonInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ButtonInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/ButtonInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp b/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp index 2be0d960..fee27cc 100644 --- a/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/CheckboxInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/ColorChooser.cpp b/third_party/WebKit/Source/core/html/forms/ColorChooser.cpp index e248313..825be42 100644 --- a/third_party/WebKit/Source/core/html/forms/ColorChooser.cpp +++ b/third_party/WebKit/Source/core/html/forms/ColorChooser.cpp
@@ -27,7 +27,6 @@ * */ -#include "config.h" #include "core/html/forms/ColorChooser.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/ColorChooserClient.cpp b/third_party/WebKit/Source/core/html/forms/ColorChooserClient.cpp index 45a03a29..3642a5f 100644 --- a/third_party/WebKit/Source/core/html/forms/ColorChooserClient.cpp +++ b/third_party/WebKit/Source/core/html/forms/ColorChooserClient.cpp
@@ -27,7 +27,6 @@ * */ -#include "config.h" #include "core/html/forms/ColorChooserClient.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp b/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp index efab8d9..4f3585c 100644 --- a/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/ColorInputType.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/forms/DateInputType.cpp b/third_party/WebKit/Source/core/html/forms/DateInputType.cpp index 91732e39..708f308 100644 --- a/third_party/WebKit/Source/core/html/forms/DateInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/DateInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeChooser.cpp b/third_party/WebKit/Source/core/html/forms/DateTimeChooser.cpp index f441840..cfb6e66f 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeChooser.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateTimeChooser.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/DateTimeChooser.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeChooserClient.cpp b/third_party/WebKit/Source/core/html/forms/DateTimeChooserClient.cpp index 1ca1583c..2c4f03c3 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeChooserClient.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateTimeChooserClient.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/DateTimeChooserClient.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.cpp b/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.cpp index 7306767..aa15d8f 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/DateTimeFieldsState.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/FormController.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.h b/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.h index c97b9299..1db5f4df 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.h +++ b/third_party/WebKit/Source/core/html/forms/DateTimeFieldsState.h
@@ -26,8 +26,9 @@ #ifndef DateTimeFieldsState_h #define DateTimeFieldsState_h -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) +#include "wtf/build_config.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp b/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp index 34fc45a..243f53cf 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/DateTimeLocalInputType.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp index 9494e68..9dfcb16 100644 --- a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "core/html/forms/EmailInputType.h" #include "bindings/core/v8/ScriptRegexp.h"
diff --git a/third_party/WebKit/Source/core/html/forms/EmailInputTypeTest.cpp b/third_party/WebKit/Source/core/html/forms/EmailInputTypeTest.cpp index 8286283..917e591 100644 --- a/third_party/WebKit/Source/core/html/forms/EmailInputTypeTest.cpp +++ b/third_party/WebKit/Source/core/html/forms/EmailInputTypeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/forms/EmailInputType.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/forms/FileInputType.cpp b/third_party/WebKit/Source/core/html/forms/FileInputType.cpp index c672cb2..fd6fc16 100644 --- a/third_party/WebKit/Source/core/html/forms/FileInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/FileInputType.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "core/html/forms/FileInputType.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h" @@ -242,12 +241,8 @@ void FileInputType::countUsage() { - // It is required by isSecureContext() but isn't - // actually used. This could be used later if a warning is shown in the - // developer console. - String insecureOriginMsg; Document* document = &element().document(); - if (document->isSecureContext(insecureOriginMsg)) + if (document->isSecureContext()) UseCounter::count(*document, UseCounter::InputTypeFileInsecureOrigin); else UseCounter::count(*document, UseCounter::InputTypeFileSecureOrigin);
diff --git a/third_party/WebKit/Source/core/html/forms/FileInputTypeTest.cpp b/third_party/WebKit/Source/core/html/forms/FileInputTypeTest.cpp index cb1e012..f0b540e 100644 --- a/third_party/WebKit/Source/core/html/forms/FileInputTypeTest.cpp +++ b/third_party/WebKit/Source/core/html/forms/FileInputTypeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/forms/FileInputType.h" #include "core/clipboard/DataObject.h"
diff --git a/third_party/WebKit/Source/core/html/forms/FormController.cpp b/third_party/WebKit/Source/core/html/forms/FormController.cpp index fa042f2..1584793 100644 --- a/third_party/WebKit/Source/core/html/forms/FormController.cpp +++ b/third_party/WebKit/Source/core/html/forms/FormController.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/forms/FormController.h" #include "core/html/HTMLFormControlElementWithState.h"
diff --git a/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp b/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp index 26f98ee..b81b5cd 100644 --- a/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/HiddenInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp index a1286c18..9705409 100644 --- a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "core/html/forms/ImageInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/InputType.cpp b/third_party/WebKit/Source/core/html/forms/InputType.cpp index 64eb9bbf..4fe4acc 100644 --- a/third_party/WebKit/Source/core/html/forms/InputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/InputType.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/html/forms/InputType.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/forms/InputTypeView.cpp b/third_party/WebKit/Source/core/html/forms/InputTypeView.cpp index 76f135d..9fba1e2 100644 --- a/third_party/WebKit/Source/core/html/forms/InputTypeView.cpp +++ b/third_party/WebKit/Source/core/html/forms/InputTypeView.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/html/forms/InputTypeView.h" #include "core/dom/shadow/ShadowRoot.h"
diff --git a/third_party/WebKit/Source/core/html/forms/MonthInputType.cpp b/third_party/WebKit/Source/core/html/forms/MonthInputType.cpp index e5a6c09..1f038c7 100644 --- a/third_party/WebKit/Source/core/html/forms/MonthInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/MonthInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/MonthInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp index 7ceeda8c..c789b11 100644 --- a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/NumberInputType.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/forms/PasswordInputType.cpp b/third_party/WebKit/Source/core/html/forms/PasswordInputType.cpp index 32cfdc3..5f67434f 100644 --- a/third_party/WebKit/Source/core/html/forms/PasswordInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/PasswordInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/PasswordInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/RadioButtonGroupScope.cpp b/third_party/WebKit/Source/core/html/forms/RadioButtonGroupScope.cpp index f1805ca..de3c04c5 100644 --- a/third_party/WebKit/Source/core/html/forms/RadioButtonGroupScope.cpp +++ b/third_party/WebKit/Source/core/html/forms/RadioButtonGroupScope.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "core/html/forms/RadioButtonGroupScope.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp b/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp index cd00b8f6..eca599d 100644 --- a/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "core/html/forms/RadioInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp index 19f08bea..061b62d 100644 --- a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/RangeInputType.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp b/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp index 7c129e3..142a130 100644 --- a/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/ResetInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp b/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp index 3acf576..948102533 100644 --- a/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/SearchInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/SearchInputType.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/forms/StepRange.cpp b/third_party/WebKit/Source/core/html/forms/StepRange.cpp index 6921115..da77af29 100644 --- a/third_party/WebKit/Source/core/html/forms/StepRange.cpp +++ b/third_party/WebKit/Source/core/html/forms/StepRange.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "core/html/forms/StepRange.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/StepRangeTest.cpp b/third_party/WebKit/Source/core/html/forms/StepRangeTest.cpp index 5d0a083..ea7509b4c 100644 --- a/third_party/WebKit/Source/core/html/forms/StepRangeTest.cpp +++ b/third_party/WebKit/Source/core/html/forms/StepRangeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/forms/StepRange.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp b/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp index 70f2be7..756c662 100644 --- a/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/SubmitInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/TelephoneInputType.cpp b/third_party/WebKit/Source/core/html/forms/TelephoneInputType.cpp index ae854b8..6e5cc61 100644 --- a/third_party/WebKit/Source/core/html/forms/TelephoneInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/TelephoneInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/TelephoneInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp b/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp index c1078b80..a17897f 100644 --- a/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/TextFieldInputType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/TextFieldInputType.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/forms/TextInputType.cpp b/third_party/WebKit/Source/core/html/forms/TextInputType.cpp index 06e04463..a14b49b 100644 --- a/third_party/WebKit/Source/core/html/forms/TextInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/TextInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/TextInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/TimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/TimeInputType.cpp index 0ec641c..be602f5 100644 --- a/third_party/WebKit/Source/core/html/forms/TimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/TimeInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/TimeInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/TypeAhead.cpp b/third_party/WebKit/Source/core/html/forms/TypeAhead.cpp index 4415ea9..2e93b0a6 100644 --- a/third_party/WebKit/Source/core/html/forms/TypeAhead.cpp +++ b/third_party/WebKit/Source/core/html/forms/TypeAhead.cpp
@@ -25,7 +25,6 @@ * */ -#include "config.h" #include "core/html/forms/TypeAhead.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/html/forms/URLInputType.cpp b/third_party/WebKit/Source/core/html/forms/URLInputType.cpp index 7a81dac..d1c45fa 100644 --- a/third_party/WebKit/Source/core/html/forms/URLInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/URLInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/URLInputType.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/forms/WeekInputType.cpp b/third_party/WebKit/Source/core/html/forms/WeekInputType.cpp index e15a0c0..d32765f 100644 --- a/third_party/WebKit/Source/core/html/forms/WeekInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/WeekInputType.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/forms/WeekInputType.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImport.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImport.cpp index da1f42545..ab5e786 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImport.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImport.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/HTMLImport.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportChild.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportChild.cpp index 190cd7ea..afc59cb 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImportChild.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportChild.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/HTMLImportChild.h" #include "core/css/StyleSheetList.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp index a31d1c17..12d9196 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/HTMLImportLoader.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportStateResolver.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportStateResolver.cpp index 56518aea..e0e3a9c3 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImportStateResolver.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportStateResolver.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/HTMLImportStateResolver.h" #include "core/html/imports/HTMLImport.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportTreeRoot.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportTreeRoot.cpp index 24eb1b9..9c198ebf 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImportTreeRoot.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportTreeRoot.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/imports/HTMLImportTreeRoot.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp index 9bdbec1d..733d5f1 100644 --- a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/HTMLImportsController.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/imports/LinkImport.cpp b/third_party/WebKit/Source/core/html/imports/LinkImport.cpp index 913676b..06eb0fc 100644 --- a/third_party/WebKit/Source/core/html/imports/LinkImport.cpp +++ b/third_party/WebKit/Source/core/html/imports/LinkImport.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/imports/LinkImport.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.cpp b/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.cpp index c047e35..7336f407 100644 --- a/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.cpp +++ b/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/AtomicHTMLToken.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/parser/AtomicHTMLTokenTest.cpp b/third_party/WebKit/Source/core/html/parser/AtomicHTMLTokenTest.cpp index c6ac43a..613f916 100644 --- a/third_party/WebKit/Source/core/html/parser/AtomicHTMLTokenTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/AtomicHTMLTokenTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/AtomicHTMLToken.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLInputStream.cpp b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLInputStream.cpp index 69e99c6..74a0c19 100644 --- a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLInputStream.cpp +++ b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLInputStream.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/BackgroundHTMLInputStream.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp index 946fe85..1df91cf 100644 --- a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/BackgroundHTMLParser.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp b/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp index fcbde6e3..f47d85e4 100644 --- a/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp +++ b/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/CSSPreloadScanner.h" #include "core/fetch/FetchInitiatorTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/CompactHTMLToken.cpp b/third_party/WebKit/Source/core/html/parser/CompactHTMLToken.cpp index 0194017..54452a4 100644 --- a/third_party/WebKit/Source/core/html/parser/CompactHTMLToken.cpp +++ b/third_party/WebKit/Source/core/html/parser/CompactHTMLToken.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/CompactHTMLToken.h" #include "core/dom/QualifiedName.h"
diff --git a/third_party/WebKit/Source/core/html/parser/CompactHTMLTokenTest.cpp b/third_party/WebKit/Source/core/html/parser/CompactHTMLTokenTest.cpp index 4946e11..b9d04051 100644 --- a/third_party/WebKit/Source/core/html/parser/CompactHTMLTokenTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/CompactHTMLTokenTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/CompactHTMLToken.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp index b8b8cba6..b3f3787 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLConstructionSite.h" #include "core/HTMLElementFactory.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp index 4bd762f..20332f4 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLDocumentParser.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp b/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp index 2df710a..f99afe2 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLElementStack.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLEntityParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLEntityParser.cpp index 62167ef4..43fc4eb 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLEntityParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLEntityParser.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLEntityParser.h" #include "core/html/parser/HTMLEntitySearch.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLEntityParserTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLEntityParserTest.cpp index dde8f8d5..5e7b86d 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLEntityParserTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLEntityParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/HTMLEntityParser.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLEntitySearch.cpp b/third_party/WebKit/Source/core/html/parser/HTMLEntitySearch.cpp index 318be1c8..b239cfe 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLEntitySearch.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLEntitySearch.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLEntitySearch.h" #include "core/html/parser/HTMLEntityTable.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp index 78507d5..72688ca 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLFormattingElementList.h" #ifndef NDEBUG
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.cpp index ffe4cd8..1763835 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLMetaCharsetParser.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp index eb108dc..7f11d2b 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLParserIdioms.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp index ce813d4b..a5c037c 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLParserOptions.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.cpp index 72f996b..dd2032a 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLParserScheduler.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp index 49df732d..c34d221e 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLParserThread.h" #include "platform/Task.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserThreadTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserThreadTest.cpp index 1380023..1270a77a 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserThreadTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserThreadTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/HTMLParserThread.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp index 4ac883c4..50f18fd 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLPreloadScanner.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp index 2d6b94bf..6277e33 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/HTMLPreloadScanner.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp index 9e333e2..91127c4 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLResourcePreloader.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloaderTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloaderTest.cpp index 41e44140..b2a477f8 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloaderTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloaderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/HTMLResourcePreloader.h" #include "core/html/parser/PreloadRequest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp index 35b1258..81212fc 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLScriptRunner.h" #include "bindings/core/v8/ScriptSourceCode.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSourceTracker.cpp b/third_party/WebKit/Source/core/html/parser/HTMLSourceTracker.cpp index 3f77426..ffca609 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLSourceTracker.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLSourceTracker.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLSourceTracker.h" #include "core/html/parser/HTMLTokenizer.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp index 28f7bab..574041c9 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLSrcsetParser.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp index 9fbef79..665c3bca 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/HTMLSrcsetParser.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTokenizer.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTokenizer.cpp index 29d87a2..2984b7ce 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLTokenizer.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLTokenizer.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLTokenizer.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp index b88efa1..385cb1a 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLTreeBuilder.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp index 407ea02..46ce267 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLTreeBuilderSimulator.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLViewSourceParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLViewSourceParser.cpp index ed0b8a8..8694b25 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLViewSourceParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLViewSourceParser.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/HTMLViewSourceParser.h" #include "core/dom/DOMImplementation.h"
diff --git a/third_party/WebKit/Source/core/html/parser/ParsedChunkQueue.cpp b/third_party/WebKit/Source/core/html/parser/ParsedChunkQueue.cpp index 338717a..8ae2a7b 100644 --- a/third_party/WebKit/Source/core/html/parser/ParsedChunkQueue.cpp +++ b/third_party/WebKit/Source/core/html/parser/ParsedChunkQueue.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/ParsedChunkQueue.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp b/third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp index e270b331..d3453d2 100644 --- a/third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp +++ b/third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/PreloadRequest.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp b/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp index 16c53d6..15c773a 100644 --- a/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp +++ b/third_party/WebKit/Source/core/html/parser/ResourcePreloader.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/parser/ResourcePreloader.h" #include "core/loader/NetworkHintsInterface.h"
diff --git a/third_party/WebKit/Source/core/html/parser/TextDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/TextDocumentParser.cpp index 2737f5a..ba4df86 100644 --- a/third_party/WebKit/Source/core/html/parser/TextDocumentParser.cpp +++ b/third_party/WebKit/Source/core/html/parser/TextDocumentParser.cpp
@@ -22,7 +22,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/TextDocumentParser.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp index be1084d..a5b05a2 100644 --- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp +++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
@@ -19,7 +19,6 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/html/parser/TextResourceDecoder.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp index 37bfb2a..62bdefd186 100644 --- a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp +++ b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/XSSAuditor.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/parser/XSSAuditorDelegate.cpp b/third_party/WebKit/Source/core/html/parser/XSSAuditorDelegate.cpp index 0b5427b..29176e6 100644 --- a/third_party/WebKit/Source/core/html/parser/XSSAuditorDelegate.cpp +++ b/third_party/WebKit/Source/core/html/parser/XSSAuditorDelegate.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/parser/XSSAuditorDelegate.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/ClearButtonElement.cpp b/third_party/WebKit/Source/core/html/shadow/ClearButtonElement.cpp index ffb2cf8..836bf7fa 100644 --- a/third_party/WebKit/Source/core/html/shadow/ClearButtonElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/ClearButtonElement.cpp
@@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/ClearButtonElement.h" #include "core/events/MouseEvent.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp index cf18359..4b9d13af 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeEditElement.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "bindings/core/v8/ExceptionStatePlaceholder.h" #include "core/HTMLNames.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.h b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.h index 3d7d976..440fec9 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.h +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.h
@@ -26,6 +26,8 @@ #ifndef DateTimeEditElement_h #define DateTimeEditElement_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/StepRange.h" #include "core/html/shadow/DateTimeFieldElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp index d28e676d..93b0dbc 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeFieldElement.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/HTMLNames.h" #include "core/dom/Document.h" #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.h b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.h index a0239df..a9b40f5b 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.h +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.h
@@ -26,6 +26,8 @@ #ifndef DateTimeFieldElement_h #define DateTimeFieldElement_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/HTMLDivElement.h" #include "core/html/HTMLSpanElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp index f16d397..8850929 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeFieldElements.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/DateTimeFieldsState.h" #include "platform/DateComponents.h" #include "platform/text/PlatformLocale.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.h b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.h index 88c73a3..26122d0 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.h +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.h
@@ -26,6 +26,8 @@ #ifndef DateTimeFieldElements_h #define DateTimeFieldElements_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeNumericFieldElement.h" #include "core/html/shadow/DateTimeSymbolicFieldElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.cpp index 71365a2c..cb5e2156 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeNumericFieldElement.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/CSSPropertyNames.h" #include "core/CSSValueKeywords.h" #include "core/events/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.h b/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.h index ee57798..3c2f54c2 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.h +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeNumericFieldElement.h
@@ -26,9 +26,10 @@ #ifndef DateTimeNumericFieldElement_h #define DateTimeNumericFieldElement_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeFieldElement.h" - #include "wtf/Allocator.h" #include "wtf/text/StringBuilder.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.cpp index 58cb90047..adbc28e 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.cpp
@@ -23,10 +23,9 @@ * SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/DateTimeSymbolicFieldElement.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/events/KeyboardEvent.h" #include "platform/fonts/Font.h" #include "platform/text/TextBreakIterator.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.h b/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.h index 51124264..51690dd 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.h +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeSymbolicFieldElement.h
@@ -26,6 +26,8 @@ #ifndef DateTimeSymbolicFieldElement_h #define DateTimeSymbolicFieldElement_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/forms/TypeAhead.h" #include "core/html/shadow/DateTimeFieldElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DetailsMarkerControl.cpp b/third_party/WebKit/Source/core/html/shadow/DetailsMarkerControl.cpp index 8a62dba..466e3adc 100644 --- a/third_party/WebKit/Source/core/html/shadow/DetailsMarkerControl.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DetailsMarkerControl.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/DetailsMarkerControl.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp index 2ea2f3d..ddbca23 100644 --- a/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp +++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp
@@ -27,8 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/html/shadow/MediaControlElementTypes.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp index 39072ac..f8227ce 100644 --- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp +++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/MediaControlElements.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp index f0c2d40..6378d42d 100644 --- a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp +++ b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/MediaControls.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp index 8ef1ad20..f8fb262 100644 --- a/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp +++ b/third_party/WebKit/Source/core/html/shadow/MediaControlsTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/shadow/MediaControls.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/MeterShadowElement.cpp b/third_party/WebKit/Source/core/html/shadow/MeterShadowElement.cpp index b6f78cc..ef2c5911 100644 --- a/third_party/WebKit/Source/core/html/shadow/MeterShadowElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/MeterShadowElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/MeterShadowElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.cpp b/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.cpp index 22b03e5..e0f2a38 100644 --- a/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.cpp
@@ -28,10 +28,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/shadow/PickerIndicatorElement.h" +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/events/Event.h" #include "core/events/KeyboardEvent.h" #include "core/frame/Settings.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.h b/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.h index 7ce6bfe..16c96e94 100644 --- a/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.h +++ b/third_party/WebKit/Source/core/html/shadow/PickerIndicatorElement.h
@@ -31,6 +31,8 @@ #ifndef PickerIndicatorElement_h #define PickerIndicatorElement_h +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "core/html/HTMLDivElement.h" #include "core/html/forms/DateTimeChooser.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/ProgressShadowElement.cpp b/third_party/WebKit/Source/core/html/shadow/ProgressShadowElement.cpp index 266264e..c9d8f820 100644 --- a/third_party/WebKit/Source/core/html/shadow/ProgressShadowElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/ProgressShadowElement.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/html/shadow/ProgressShadowElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/ShadowElementNames.cpp b/third_party/WebKit/Source/core/html/shadow/ShadowElementNames.cpp index b44a63b..1a79e54 100644 --- a/third_party/WebKit/Source/core/html/shadow/ShadowElementNames.cpp +++ b/third_party/WebKit/Source/core/html/shadow/ShadowElementNames.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/ShadowElementNames.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp b/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp index 39043fd..2c366e1 100644 --- a/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/SliderThumbElement.h" #include "core/events/Event.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/SpinButtonElement.cpp b/third_party/WebKit/Source/core/html/shadow/SpinButtonElement.cpp index 718adba..40f3b24c 100644 --- a/third_party/WebKit/Source/core/html/shadow/SpinButtonElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/SpinButtonElement.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/SpinButtonElement.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp b/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp index bcd2ce7..092c582 100644 --- a/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp +++ b/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/shadow/TextControlInnerElements.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/html/track/AudioTrack.cpp b/third_party/WebKit/Source/core/html/track/AudioTrack.cpp index 7bf36b1..05cbf8a 100644 --- a/third_party/WebKit/Source/core/html/track/AudioTrack.cpp +++ b/third_party/WebKit/Source/core/html/track/AudioTrack.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/AudioTrack.h" #include "core/html/HTMLMediaElement.h"
diff --git a/third_party/WebKit/Source/core/html/track/AudioTrackList.cpp b/third_party/WebKit/Source/core/html/track/AudioTrackList.cpp index 1bf6f4c..7ef8cb1 100644 --- a/third_party/WebKit/Source/core/html/track/AudioTrackList.cpp +++ b/third_party/WebKit/Source/core/html/track/AudioTrackList.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/AudioTrackList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/track/AutomaticTrackSelection.cpp b/third_party/WebKit/Source/core/html/track/AutomaticTrackSelection.cpp index 2e8dd15..c226541 100644 --- a/third_party/WebKit/Source/core/html/track/AutomaticTrackSelection.cpp +++ b/third_party/WebKit/Source/core/html/track/AutomaticTrackSelection.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/AutomaticTrackSelection.h" #include "core/html/track/TextTrack.h"
diff --git a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp index 3fd1485..f0820b54d 100644 --- a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp +++ b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/CueTimeline.h" #include "core/events/Event.h"
diff --git a/third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp b/third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp index eb96b319..cb85d2c 100644 --- a/third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp +++ b/third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/InbandTextTrack.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp b/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp index 48a12d5..f059ec6 100644 --- a/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp +++ b/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/LoadableTextTrack.h" #include "core/dom/ElementTraversal.h"
diff --git a/third_party/WebKit/Source/core/html/track/TextTrack.cpp b/third_party/WebKit/Source/core/html/track/TextTrack.cpp index 36148b3..1cd6017 100644 --- a/third_party/WebKit/Source/core/html/track/TextTrack.cpp +++ b/third_party/WebKit/Source/core/html/track/TextTrack.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TextTrack.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/html/track/TextTrackContainer.cpp b/third_party/WebKit/Source/core/html/track/TextTrackContainer.cpp index e4ab0c3..1137ae9 100644 --- a/third_party/WebKit/Source/core/html/track/TextTrackContainer.cpp +++ b/third_party/WebKit/Source/core/html/track/TextTrackContainer.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TextTrackContainer.h" #include "core/html/HTMLVideoElement.h"
diff --git a/third_party/WebKit/Source/core/html/track/TextTrackCue.cpp b/third_party/WebKit/Source/core/html/track/TextTrackCue.cpp index 56320a9b..d1dd77d 100644 --- a/third_party/WebKit/Source/core/html/track/TextTrackCue.cpp +++ b/third_party/WebKit/Source/core/html/track/TextTrackCue.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TextTrackCue.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp b/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp index 63d02aee..77775dbe 100644 --- a/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp +++ b/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TextTrackCueList.h" #include "wtf/StdLibExtras.h"
diff --git a/third_party/WebKit/Source/core/html/track/TextTrackList.cpp b/third_party/WebKit/Source/core/html/track/TextTrackList.cpp index 1cd12b4f..e6169d8 100644 --- a/third_party/WebKit/Source/core/html/track/TextTrackList.cpp +++ b/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TextTrackList.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/html/track/TrackBase.cpp b/third_party/WebKit/Source/core/html/track/TrackBase.cpp index f8901994..c408822f 100644 --- a/third_party/WebKit/Source/core/html/track/TrackBase.cpp +++ b/third_party/WebKit/Source/core/html/track/TrackBase.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TrackBase.h" #include "core/html/HTMLMediaElement.h"
diff --git a/third_party/WebKit/Source/core/html/track/TrackEvent.cpp b/third_party/WebKit/Source/core/html/track/TrackEvent.cpp index 687f825..7c88c6d 100644 --- a/third_party/WebKit/Source/core/html/track/TrackEvent.cpp +++ b/third_party/WebKit/Source/core/html/track/TrackEvent.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/TrackEvent.h" #include "bindings/core/v8/UnionTypesCore.h"
diff --git a/third_party/WebKit/Source/core/html/track/VideoTrack.cpp b/third_party/WebKit/Source/core/html/track/VideoTrack.cpp index 30f9684..394ced2 100644 --- a/third_party/WebKit/Source/core/html/track/VideoTrack.cpp +++ b/third_party/WebKit/Source/core/html/track/VideoTrack.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/VideoTrack.h" #include "core/html/HTMLMediaElement.h"
diff --git a/third_party/WebKit/Source/core/html/track/VideoTrackList.cpp b/third_party/WebKit/Source/core/html/track/VideoTrackList.cpp index 719bfe7..401c102 100644 --- a/third_party/WebKit/Source/core/html/track/VideoTrackList.cpp +++ b/third_party/WebKit/Source/core/html/track/VideoTrackList.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/html/track/VideoTrackList.h" #include "core/html/HTMLMediaElement.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReader.cpp b/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReader.cpp index 6c997494..4b84e43 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReader.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReader.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/BufferedLineReader.h" #include "wtf/text/CharacterNames.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReaderTest.cpp b/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReaderTest.cpp index b5e6458..acb679a 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReaderTest.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/BufferedLineReaderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/BufferedLineReader.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp index 990ec66e..a09e9a33 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTCue.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTElement.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTElement.cpp index ff2204a..9e95ec1a 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTElement.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTElement.h" #include "core/HTMLElementFactory.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp index b61b57a..c29663bf 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTParser.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp index d3e044f..71f26d9 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTRegion.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTRegionList.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTRegionList.cpp index a2081f7..f5855042 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTRegionList.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTRegionList.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTRegionList.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTScanner.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTScanner.cpp index 7604794..92970cb 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTScanner.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTScanner.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTScanner.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTScannerTest.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTScannerTest.cpp index 9c4ae80..65377fb 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTScannerTest.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTScannerTest.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/html/track/vtt/VTTScanner.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTTokenizer.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTTokenizer.cpp index f56e4162b..7d9fbef 100644 --- a/third_party/WebKit/Source/core/html/track/vtt/VTTTokenizer.cpp +++ b/third_party/WebKit/Source/core/html/track/vtt/VTTTokenizer.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/html/track/vtt/VTTTokenizer.h" #include "core/xml/parser/MarkupTokenizerInlines.h"
diff --git a/third_party/WebKit/Source/core/inspector/AsyncCallChain.cpp b/third_party/WebKit/Source/core/inspector/AsyncCallChain.cpp index eb1d0ea6..48084e8 100644 --- a/third_party/WebKit/Source/core/inspector/AsyncCallChain.cpp +++ b/third_party/WebKit/Source/core/inspector/AsyncCallChain.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/AsyncCallChain.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp b/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp index 5d413192..eab47937 100644 --- a/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp +++ b/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/AsyncCallTracker.h" #include "core/dom/ContextLifecycleObserver.h"
diff --git a/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp b/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp index 5451ac6..8636a48 100644 --- a/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp +++ b/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/ConsoleMessage.h" #include "bindings/core/v8/ScriptCallStackFactory.h" @@ -21,7 +20,7 @@ unsigned value; }; - DEFINE_STATIC_LOCAL_THREAD_SAFE(WTF::ThreadSpecific<MessageId>, messageId, new WTF::ThreadSpecific<MessageId>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(WTF::ThreadSpecific<MessageId>, messageId, new WTF::ThreadSpecific<MessageId>); return ++messageId->value; }
diff --git a/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp b/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp index 98975c91..46cab596 100644 --- a/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp +++ b/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/ConsoleMessageStorage.h" #include "core/frame/FrameHost.h"
diff --git a/third_party/WebKit/Source/core/inspector/ContentSearchUtils.cpp b/third_party/WebKit/Source/core/inspector/ContentSearchUtils.cpp index a568cb22..c155c8ae 100644 --- a/third_party/WebKit/Source/core/inspector/ContentSearchUtils.cpp +++ b/third_party/WebKit/Source/core/inspector/ContentSearchUtils.cpp
@@ -26,8 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/ContentSearchUtils.h" #include "bindings/core/v8/ScriptRegexp.h"
diff --git a/third_party/WebKit/Source/core/inspector/DOMEditor.cpp b/third_party/WebKit/Source/core/inspector/DOMEditor.cpp index b24d5ee..e779ce4 100644 --- a/third_party/WebKit/Source/core/inspector/DOMEditor.cpp +++ b/third_party/WebKit/Source/core/inspector/DOMEditor.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/DOMEditor.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp b/third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp index 9f63c278..e7f9873 100644 --- a/third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp +++ b/third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/DOMPatchSupport.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/DebuggerScript.cpp b/third_party/WebKit/Source/core/inspector/DebuggerScript.cpp index 06e82cb..d7ae5dc 100644 --- a/third_party/WebKit/Source/core/inspector/DebuggerScript.cpp +++ b/third_party/WebKit/Source/core/inspector/DebuggerScript.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/DebuggerScript.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp b/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp index 81d1386b..4a1580a 100644 --- a/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp +++ b/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/DevToolsHost.h" #include "bindings/core/v8/ScriptFunctionCall.h"
diff --git a/third_party/WebKit/Source/core/inspector/EventListenerInfo.cpp b/third_party/WebKit/Source/core/inspector/EventListenerInfo.cpp index cc1d7a4..624d6d1 100644 --- a/third_party/WebKit/Source/core/inspector/EventListenerInfo.cpp +++ b/third_party/WebKit/Source/core/inspector/EventListenerInfo.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/EventListenerInfo.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/inspector/IdentifiersFactory.cpp b/third_party/WebKit/Source/core/inspector/IdentifiersFactory.cpp index 684d401..dc752ebd 100644 --- a/third_party/WebKit/Source/core/inspector/IdentifiersFactory.cpp +++ b/third_party/WebKit/Source/core/inspector/IdentifiersFactory.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/IdentifiersFactory.h" #include "core/dom/WeakIdentifierMap.h"
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScript.cpp b/third_party/WebKit/Source/core/inspector/InjectedScript.cpp index d251329..b88db7d3 100644 --- a/third_party/WebKit/Source/core/inspector/InjectedScript.cpp +++ b/third_party/WebKit/Source/core/inspector/InjectedScript.cpp
@@ -28,9 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - - #include "core/inspector/InjectedScript.h" #include "bindings/core/v8/ScriptFunctionCall.h"
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp index f5a5534..ef29fe6 100644 --- a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp +++ b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
@@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InjectedScriptHost.h" #include "bindings/core/v8/ScriptValue.h"
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp index 56c84e2c..c34abce 100644 --- a/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp +++ b/third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp
@@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InjectedScriptManager.h" #include "bindings/core/v8/ScriptValue.h"
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptNative.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptNative.cpp index 63cb5d9..a4f6c6c 100644 --- a/third_party/WebKit/Source/core/inspector/InjectedScriptNative.cpp +++ b/third_party/WebKit/Source/core/inspector/InjectedScriptNative.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/inspector/InjectedScriptNative.h" #include "bindings/core/v8/ScriptState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectedFrames.cpp b/third_party/WebKit/Source/core/inspector/InspectedFrames.cpp index f6f9f94e..c806629 100644 --- a/third_party/WebKit/Source/core/inspector/InspectedFrames.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectedFrames.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/InspectedFrames.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp index 263d989..13fd35c6 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/inspector/InspectorAnimationAgent.h" #include "core/animation/Animation.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp index 2278185c..eee8a38 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
@@ -23,7 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorApplicationCacheAgent.h" #include "core/frame/LocalFrame.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.cpp index 9165c561..7b312a449 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorBaseAgent.h" #include "core/inspector/InspectorState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp index 3d99435..8aa5fe9 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorCSSAgent.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp index 33d2193..a310ae8 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
@@ -23,7 +23,6 @@ */ -#include "config.h" #include "core/inspector/InspectorConsoleAgent.h" #include "core/inspector/ConsoleMessage.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp index 05030412..df8fde2 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorDOMAgent.h" #include "bindings/core/v8/BindingSecurity.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp index 6cce902..670a2303 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorDOMDebuggerAgent.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp index fae4fff7..d4f5906 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorDebuggerAgent.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorHeapProfilerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorHeapProfilerAgent.cpp index b5536b6..eb3a69b 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorHeapProfilerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorHeapProfilerAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorHeapProfilerAgent.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp b/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp index 8b48c73..cad23c7 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/InspectorHighlight.h" #include "core/dom/ClientRect.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorHistory.cpp b/third_party/WebKit/Source/core/inspector/InspectorHistory.cpp index 9d5fda7c..9847ca3 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorHistory.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorHistory.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorHistory.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp index 3d446a9..69e2f75 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorInputAgent.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp index 6b0a59c..70032f8 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp
@@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorInspectorAgent.h" #include "bindings/core/v8/DOMWrapperWorld.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp index 7e12bb0..dec7526 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorInstrumentation.h" #include "core/events/EventTarget.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp index bdfb3cb0..5b8586a 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
@@ -29,8 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/InspectorLayerTreeAgent.h" #include "core/dom/DOMNodeIds.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorMemoryAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorMemoryAgent.cpp index ce2016e..5289d26 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorMemoryAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorMemoryAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorMemoryAgent.h" #include "core/inspector/InstanceCounters.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorOverlayHost.cpp b/third_party/WebKit/Source/core/inspector/InspectorOverlayHost.cpp index 678195c..cab40b9 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorOverlayHost.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorOverlayHost.cpp
@@ -26,8 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/InspectorOverlayHost.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp index 3417146..75872c3 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorPageAgent.h" #include "bindings/core/v8/DOMWrapperWorld.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp index 3321aef..30537f6 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorProfilerAgent.h" #include "bindings/core/v8/ScriptCallStackFactory.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp index 233d022..efe9f8d6 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorResourceAgent.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp index 0a30818..49fff9b 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/InspectorResourceContentLoader.h" #include "core/css/CSSStyleSheet.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp index 23608eb..7158e35e 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorRuntimeAgent.h" #include "bindings/core/v8/ScriptState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorState.cpp b/third_party/WebKit/Source/core/inspector/InspectorState.cpp index ba6e2b2f..db0fd86 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorState.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorState.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorState.h" #include "core/inspector/InspectorStateClient.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp index 1e19d753..730a4dc 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorStyleSheet.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTaskRunner.cpp b/third_party/WebKit/Source/core/inspector/InspectorTaskRunner.cpp index 807833d..3364ed2 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorTaskRunner.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorTaskRunner.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/InspectorTaskRunner.h" #include "wtf/Deque.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp index 3184489c..7674d777 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InspectorTimelineAgent.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp index 2dd2562..479706bf 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/InspectorTraceEvents.h" #include "bindings/core/v8/ScriptCallStackFactory.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp index cab7508..d1e29d3 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
@@ -4,8 +4,6 @@ // found in the LICENSE file. // -#include "config.h" - #include "core/inspector/InspectorTracingAgent.h" #include "core/frame/LocalFrame.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp index 411dba4e..efaec68 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/InspectorWorkerAgent.h" #include "core/InspectorFrontend.h"
diff --git a/third_party/WebKit/Source/core/inspector/InstanceCounters.cpp b/third_party/WebKit/Source/core/inspector/InstanceCounters.cpp index aeacec4..c564b80c 100644 --- a/third_party/WebKit/Source/core/inspector/InstanceCounters.cpp +++ b/third_party/WebKit/Source/core/inspector/InstanceCounters.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/InstanceCounters.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/inspector/JSONParser.cpp b/third_party/WebKit/Source/core/inspector/JSONParser.cpp index 1523888..ab85f4d 100644 --- a/third_party/WebKit/Source/core/inspector/JSONParser.cpp +++ b/third_party/WebKit/Source/core/inspector/JSONParser.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/JSONParser.h" #include "platform/JSONValues.h"
diff --git a/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp b/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp index e08ab97c3..c8f5eb6 100644 --- a/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp +++ b/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/LayoutEditor.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp index 0303f97..9c203b4 100644 --- a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp +++ b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/MainThreadDebugger.h" #include "bindings/core/v8/DOMWrapperWorld.h" @@ -77,7 +76,7 @@ Mutex& MainThreadDebugger::creationMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, (new Mutex)); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, (new Mutex)); return mutex; }
diff --git a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp index 385807fe..2ed9ef06 100644 --- a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp +++ b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
@@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/NetworkResourcesData.h" #include "core/dom/DOMImplementation.h"
diff --git a/third_party/WebKit/Source/core/inspector/PageConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/PageConsoleAgent.cpp index 12654fa..24707d75 100644 --- a/third_party/WebKit/Source/core/inspector/PageConsoleAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/PageConsoleAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/PageConsoleAgent.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp index 3d29693..84b2b35 100644 --- a/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/PageDebuggerAgent.h" #include "bindings/core/v8/DOMWrapperWorld.h"
diff --git a/third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp b/third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp index 01339c3..c4e2e9fe 100644 --- a/third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/PageRuntimeAgent.h" #include "bindings/core/v8/DOMWrapperWorld.h"
diff --git a/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp b/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp index 6a5532f..0422ae18 100644 --- a/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp +++ b/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/PromiseTracker.h" #include "bindings/core/v8/ScriptCallStackFactory.h"
diff --git a/third_party/WebKit/Source/core/inspector/RemoteObjectId.cpp b/third_party/WebKit/Source/core/inspector/RemoteObjectId.cpp index fcd03d42..6fc6e1c 100644 --- a/third_party/WebKit/Source/core/inspector/RemoteObjectId.cpp +++ b/third_party/WebKit/Source/core/inspector/RemoteObjectId.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/RemoteObjectId.h" #include "core/inspector/JSONParser.h"
diff --git a/third_party/WebKit/Source/core/inspector/ScriptArguments.cpp b/third_party/WebKit/Source/core/inspector/ScriptArguments.cpp index 769693d3..242ac29e 100644 --- a/third_party/WebKit/Source/core/inspector/ScriptArguments.cpp +++ b/third_party/WebKit/Source/core/inspector/ScriptArguments.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/ScriptArguments.h" #include "bindings/core/v8/ScriptValue.h"
diff --git a/third_party/WebKit/Source/core/inspector/ScriptAsyncCallStack.cpp b/third_party/WebKit/Source/core/inspector/ScriptAsyncCallStack.cpp index 1cb09f6d..154b60e9 100644 --- a/third_party/WebKit/Source/core/inspector/ScriptAsyncCallStack.cpp +++ b/third_party/WebKit/Source/core/inspector/ScriptAsyncCallStack.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/ScriptAsyncCallStack.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/inspector/ScriptCallFrame.cpp b/third_party/WebKit/Source/core/inspector/ScriptCallFrame.cpp index 0cc277b..d044abd9 100644 --- a/third_party/WebKit/Source/core/inspector/ScriptCallFrame.cpp +++ b/third_party/WebKit/Source/core/inspector/ScriptCallFrame.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/ScriptCallFrame.h" #include "platform/TracedValue.h"
diff --git a/third_party/WebKit/Source/core/inspector/ScriptCallStack.cpp b/third_party/WebKit/Source/core/inspector/ScriptCallStack.cpp index 48f77ef9..549350b0 100644 --- a/third_party/WebKit/Source/core/inspector/ScriptCallStack.cpp +++ b/third_party/WebKit/Source/core/inspector/ScriptCallStack.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/ScriptCallStack.h" #include "core/inspector/ScriptAsyncCallStack.h"
diff --git a/third_party/WebKit/Source/core/inspector/WorkerConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/WorkerConsoleAgent.cpp index f183548..91bd207 100644 --- a/third_party/WebKit/Source/core/inspector/WorkerConsoleAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/WorkerConsoleAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/WorkerConsoleAgent.h" #include "bindings/core/v8/ScriptController.h"
diff --git a/third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp index 90528b8..7af3311 100644 --- a/third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/WorkerDebuggerAgent.h" #include "core/inspector/InjectedScript.h"
diff --git a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp index 5480497..908c2a1 100644 --- a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp +++ b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/WorkerInspectorController.h" #include "core/InspectorBackendDispatcher.h"
diff --git a/third_party/WebKit/Source/core/inspector/WorkerRuntimeAgent.cpp b/third_party/WebKit/Source/core/inspector/WorkerRuntimeAgent.cpp index d9ea3ae2..dd6505f6 100644 --- a/third_party/WebKit/Source/core/inspector/WorkerRuntimeAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/WorkerRuntimeAgent.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/inspector/WorkerRuntimeAgent.h" #include "bindings/core/v8/ScriptState.h"
diff --git a/third_party/WebKit/Source/core/inspector/WorkerThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/WorkerThreadDebugger.cpp index 09b46bd..f8bce63 100644 --- a/third_party/WebKit/Source/core/inspector/WorkerThreadDebugger.cpp +++ b/third_party/WebKit/Source/core/inspector/WorkerThreadDebugger.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/WorkerThreadDebugger.h" #include "bindings/core/v8/V8ScriptRunner.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/InspectorWrapper.cpp b/third_party/WebKit/Source/core/inspector/v8/InspectorWrapper.cpp index a9588d6..123fd8d 100644 --- a/third_party/WebKit/Source/core/inspector/v8/InspectorWrapper.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/InspectorWrapper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/InspectorWrapper.h" #include "bindings/core/v8/V8ScriptRunner.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/JavaScriptCallFrame.cpp b/third_party/WebKit/Source/core/inspector/v8/JavaScriptCallFrame.cpp index d235585b..ca069d58 100644 --- a/third_party/WebKit/Source/core/inspector/v8/JavaScriptCallFrame.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/JavaScriptCallFrame.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/v8/JavaScriptCallFrame.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8AsyncCallTracker.cpp b/third_party/WebKit/Source/core/inspector/v8/V8AsyncCallTracker.cpp index b812eab..1602fc3 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8AsyncCallTracker.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8AsyncCallTracker.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8AsyncCallTracker.h" #include "bindings/core/v8/V8PerContextData.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp index 480df93..e7a98955 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8DebuggerAgentImpl.h" #include "bindings/core/v8/ScriptCallStackFactory.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerImpl.cpp index 669a522..2e1e1d1 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerImpl.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerImpl.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/v8/V8DebuggerImpl.h" #include "bindings/core/v8/V8Binding.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerScript.cpp b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerScript.cpp index 69c1f04f2..fea3c57f 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8DebuggerScript.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8DebuggerScript.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8DebuggerScript.h" namespace {
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp b/third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp index 80e4b4b..0c191d2 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8InjectedScriptHost.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8JavaScriptCallFrame.cpp b/third_party/WebKit/Source/core/inspector/v8/V8JavaScriptCallFrame.cpp index 79448ce..769cf7d 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8JavaScriptCallFrame.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8JavaScriptCallFrame.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8JavaScriptCallFrame.h" #include "core/inspector/v8/InspectorWrapper.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp index 1fad019ba..ff02170 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/inspector/v8/V8ProfilerAgentImpl.h" #include "bindings/core/v8/ScriptCallStackFactory.h"
diff --git a/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp index 9a6f148..00eac31 100644 --- a/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp +++ b/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/inspector/v8/V8RuntimeAgentImpl.h" #include "bindings/core/v8/ScriptState.h"
diff --git a/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp b/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp index 36abcb0..ecc64105 100644 --- a/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp +++ b/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp
@@ -39,7 +39,7 @@ NetworkStateNotifier& networkStateNotifier() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NetworkStateNotifier, networkStateNotifier, new NetworkStateNotifier); + DEFINE_THREAD_SAFE_STATIC_LOCAL(NetworkStateNotifier, networkStateNotifier, new NetworkStateNotifier); return networkStateNotifier; }
diff --git a/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp b/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp index 4b8b7989..8f37b54 100644 --- a/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp +++ b/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BackgroundImageGeometry.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/paint/BlockFlowPainter.cpp b/third_party/WebKit/Source/core/paint/BlockFlowPainter.cpp index 470caee1..136888c 100644 --- a/third_party/WebKit/Source/core/paint/BlockFlowPainter.cpp +++ b/third_party/WebKit/Source/core/paint/BlockFlowPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BlockFlowPainter.h" #include "core/layout/FloatingObjects.h"
diff --git a/third_party/WebKit/Source/core/paint/BlockPainter.cpp b/third_party/WebKit/Source/core/paint/BlockPainter.cpp index 4b998326..be32974 100644 --- a/third_party/WebKit/Source/core/paint/BlockPainter.cpp +++ b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BlockPainter.h" #include "core/editing/DragCaretController.h"
diff --git a/third_party/WebKit/Source/core/paint/BoxBorderPainter.cpp b/third_party/WebKit/Source/core/paint/BoxBorderPainter.cpp index 952a322..24a4184 100644 --- a/third_party/WebKit/Source/core/paint/BoxBorderPainter.cpp +++ b/third_party/WebKit/Source/core/paint/BoxBorderPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BoxBorderPainter.h" #include "core/paint/BoxPainter.h"
diff --git a/third_party/WebKit/Source/core/paint/BoxClipper.cpp b/third_party/WebKit/Source/core/paint/BoxClipper.cpp index 09f10cf..b3560f8 100644 --- a/third_party/WebKit/Source/core/paint/BoxClipper.cpp +++ b/third_party/WebKit/Source/core/paint/BoxClipper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BoxClipper.h" #include "core/layout/LayoutBox.h"
diff --git a/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp b/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp index abfb4c9..ef35fb1 100644 --- a/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp +++ b/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BoxDecorationData.h" #include "core/layout/LayoutBox.h"
diff --git a/third_party/WebKit/Source/core/paint/BoxPainter.cpp b/third_party/WebKit/Source/core/paint/BoxPainter.cpp index 291369e..faee7a6 100644 --- a/third_party/WebKit/Source/core/paint/BoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/BoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/BoxPainter.h" #include "core/HTMLNames.h"
diff --git a/third_party/WebKit/Source/core/paint/ClipScope.cpp b/third_party/WebKit/Source/core/paint/ClipScope.cpp index 810f574b..2bcd393f4 100644 --- a/third_party/WebKit/Source/core/paint/ClipScope.cpp +++ b/third_party/WebKit/Source/core/paint/ClipScope.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/paint/ClipScope.h" #include "platform/geometry/LayoutRect.h"
diff --git a/third_party/WebKit/Source/core/paint/CompositingRecorder.cpp b/third_party/WebKit/Source/core/paint/CompositingRecorder.cpp index b13e876..e5882c7 100644 --- a/third_party/WebKit/Source/core/paint/CompositingRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/CompositingRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/CompositingRecorder.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/paint/DetailsMarkerPainter.cpp b/third_party/WebKit/Source/core/paint/DetailsMarkerPainter.cpp index 25c758d..3ebc020d 100644 --- a/third_party/WebKit/Source/core/paint/DetailsMarkerPainter.cpp +++ b/third_party/WebKit/Source/core/paint/DetailsMarkerPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/DetailsMarkerPainter.h" #include "core/layout/LayoutDetailsMarker.h"
diff --git a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp index 8d705e5..24a1b3f 100644 --- a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/EllipsisBoxPainter.h" #include "core/layout/TextRunConstructor.h"
diff --git a/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp b/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp index 3b60bca9..bc3ce80 100644 --- a/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp +++ b/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/EmbeddedObjectPainter.h" #include "core/frame/Settings.h"
diff --git a/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp b/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp index fdd7129..811241f8 100644 --- a/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp +++ b/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FieldsetPainter.h" #include "core/layout/LayoutFieldset.h"
diff --git a/third_party/WebKit/Source/core/paint/FileUploadControlPainter.cpp b/third_party/WebKit/Source/core/paint/FileUploadControlPainter.cpp index 9f81da6..f77d581 100644 --- a/third_party/WebKit/Source/core/paint/FileUploadControlPainter.cpp +++ b/third_party/WebKit/Source/core/paint/FileUploadControlPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FileUploadControlPainter.h" #include "core/layout/LayoutButton.h"
diff --git a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp index a706fa1..18b69682 100644 --- a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp +++ b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/paint/FilterEffectBuilder.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/paint/FilterPainter.cpp b/third_party/WebKit/Source/core/paint/FilterPainter.cpp index 1fd278d..bd78e67 100644 --- a/third_party/WebKit/Source/core/paint/FilterPainter.cpp +++ b/third_party/WebKit/Source/core/paint/FilterPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FilterPainter.h" #include "core/paint/FilterEffectBuilder.h"
diff --git a/third_party/WebKit/Source/core/paint/FloatClipRecorder.cpp b/third_party/WebKit/Source/core/paint/FloatClipRecorder.cpp index 735f15e..13648cc 100644 --- a/third_party/WebKit/Source/core/paint/FloatClipRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/FloatClipRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FloatClipRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/core/paint/FramePainter.cpp b/third_party/WebKit/Source/core/paint/FramePainter.cpp index b55fcae..8503937 100644 --- a/third_party/WebKit/Source/core/paint/FramePainter.cpp +++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FramePainter.h" #include "core/editing/markers/DocumentMarkerController.h"
diff --git a/third_party/WebKit/Source/core/paint/FrameSetPainter.cpp b/third_party/WebKit/Source/core/paint/FrameSetPainter.cpp index 9cebd874..3ca3c37 100644 --- a/third_party/WebKit/Source/core/paint/FrameSetPainter.cpp +++ b/third_party/WebKit/Source/core/paint/FrameSetPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/FrameSetPainter.h" #include "core/html/HTMLFrameSetElement.h"
diff --git a/third_party/WebKit/Source/core/paint/GridPainter.cpp b/third_party/WebKit/Source/core/paint/GridPainter.cpp index 0e2a2683..e51317c 100644 --- a/third_party/WebKit/Source/core/paint/GridPainter.cpp +++ b/third_party/WebKit/Source/core/paint/GridPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/GridPainter.h" #include "core/layout/LayoutGrid.h"
diff --git a/third_party/WebKit/Source/core/paint/HTMLCanvasPainter.cpp b/third_party/WebKit/Source/core/paint/HTMLCanvasPainter.cpp index 648fa21..ac827b1 100644 --- a/third_party/WebKit/Source/core/paint/HTMLCanvasPainter.cpp +++ b/third_party/WebKit/Source/core/paint/HTMLCanvasPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/HTMLCanvasPainter.h" #include "core/html/HTMLCanvasElement.h"
diff --git a/third_party/WebKit/Source/core/paint/ImagePainter.cpp b/third_party/WebKit/Source/core/paint/ImagePainter.cpp index e6ac56454..9f9c457 100644 --- a/third_party/WebKit/Source/core/paint/ImagePainter.cpp +++ b/third_party/WebKit/Source/core/paint/ImagePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ImagePainter.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp index bc23c16..61fe7c32 100644 --- a/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/InlineFlowBoxPainter.h" #include "core/layout/LayoutBlock.h"
diff --git a/third_party/WebKit/Source/core/paint/InlinePainter.cpp b/third_party/WebKit/Source/core/paint/InlinePainter.cpp index ba1894f..e2c0574 100644 --- a/third_party/WebKit/Source/core/paint/InlinePainter.cpp +++ b/third_party/WebKit/Source/core/paint/InlinePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/InlinePainter.h" #include "core/layout/LayoutBlock.h"
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp index 83a42eec..d0935da 100644 --- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/InlineTextBoxPainter.h" #include "core/editing/CompositionUnderline.h"
diff --git a/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp b/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp index 85a24a38..02d21e0 100644 --- a/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/LayerClipRecorder.h" #include "core/layout/ClipRect.h"
diff --git a/third_party/WebKit/Source/core/paint/LayerClipRecorderTest.cpp b/third_party/WebKit/Source/core/paint/LayerClipRecorderTest.cpp index 4007b27b..ae97be3 100644 --- a/third_party/WebKit/Source/core/paint/LayerClipRecorderTest.cpp +++ b/third_party/WebKit/Source/core/paint/LayerClipRecorderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/LayerClipRecorder.h" #include "core/layout/LayoutTestHelper.h"
diff --git a/third_party/WebKit/Source/core/paint/LayerFixedPositionRecorder.cpp b/third_party/WebKit/Source/core/paint/LayerFixedPositionRecorder.cpp index a396754..c7fc68a 100644 --- a/third_party/WebKit/Source/core/paint/LayerFixedPositionRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/LayerFixedPositionRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/LayerFixedPositionRecorder.h" #include "core/layout/LayoutBoxModelObject.h"
diff --git a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp index befffc9..52baa79 100644 --- a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp +++ b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/LayoutObjectDrawingRecorder.h" #include "core/layout/LayoutTestHelper.h"
diff --git a/third_party/WebKit/Source/core/paint/LineBoxListPainter.cpp b/third_party/WebKit/Source/core/paint/LineBoxListPainter.cpp index 72ef1303..95217ae 100644 --- a/third_party/WebKit/Source/core/paint/LineBoxListPainter.cpp +++ b/third_party/WebKit/Source/core/paint/LineBoxListPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/LineBoxListPainter.h" #include "core/layout/LayoutBoxModelObject.h"
diff --git a/third_party/WebKit/Source/core/paint/ListItemPainter.cpp b/third_party/WebKit/Source/core/paint/ListItemPainter.cpp index 704698cf..d1939ea 100644 --- a/third_party/WebKit/Source/core/paint/ListItemPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ListItemPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ListItemPainter.h" #include "core/layout/LayoutListItem.h"
diff --git a/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp b/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp index 3a60c96..66e6df35 100644 --- a/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ListMarkerPainter.h" #include "core/layout/LayoutListItem.h"
diff --git a/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp b/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp index 6fccbba..eaaf3dc5 100644 --- a/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp +++ b/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/paint/MediaControlsPainter.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp b/third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp index 6122cc5..0b27f5c2 100644 --- a/third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp +++ b/third_party/WebKit/Source/core/paint/MultiColumnSetPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/MultiColumnSetPainter.h" #include "core/layout/LayoutMultiColumnSet.h"
diff --git a/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp b/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp index b59320dca..5f0cf28 100644 --- a/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp +++ b/third_party/WebKit/Source/core/paint/NinePieceImageGrid.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/NinePieceImageGrid.h" #include "core/style/ComputedStyle.h"
diff --git a/third_party/WebKit/Source/core/paint/NinePieceImageGridTest.cpp b/third_party/WebKit/Source/core/paint/NinePieceImageGridTest.cpp index 4ae8b91..d138edc2 100644 --- a/third_party/WebKit/Source/core/paint/NinePieceImageGridTest.cpp +++ b/third_party/WebKit/Source/core/paint/NinePieceImageGridTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/NinePieceImageGrid.h" #include "core/css/CSSGradientValue.h"
diff --git a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp index 5b8e6b99..e77448e 100644 --- a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp +++ b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/NinePieceImagePainter.h" #include "core/frame/UseCounter.h"
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp index 73743be..a8a566c 100644 --- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp +++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ObjectPaintProperties.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/paint/ObjectPainter.cpp b/third_party/WebKit/Source/core/paint/ObjectPainter.cpp index ed9db1c..420ae626 100644 --- a/third_party/WebKit/Source/core/paint/ObjectPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ObjectPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ObjectPainter.h" #include "core/layout/LayoutBlock.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp index 3e8147c..4d30a5de 100644 --- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintControllerPaintTest.h" #include "core/layout/LayoutText.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintInfo.cpp b/third_party/WebKit/Source/core/paint/PaintInfo.cpp index 41a0008..91de13e 100644 --- a/third_party/WebKit/Source/core/paint/PaintInfo.cpp +++ b/third_party/WebKit/Source/core/paint/PaintInfo.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintInfo.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp b/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp index 3824fd78..31298f46 100644 --- a/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintInfo.h" #include "platform/graphics/paint/PaintController.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp index 0ddc9e6a..0783ce0 100644 --- a/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp +++ b/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintInvalidationCapableScrollableArea.h" #include "core/frame/Settings.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp index d19defb..c08e5cb 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -41,7 +41,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/paint/PaintLayer.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp index 3b11423..4cc750b6 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
@@ -41,7 +41,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/paint/PaintLayerClipper.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerFilterInfo.cpp b/third_party/WebKit/Source/core/paint/PaintLayerFilterInfo.cpp index 5b9ea50a..fa441c9 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerFilterInfo.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerFilterInfo.cpp
@@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "core/paint/PaintLayerFilterInfo.h" #include "core/fetch/DocumentResourceReference.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp index c6afc8d..8a608bb3 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintLayerPainter.h" #include "core/frame/Settings.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp index 401192f..4a76309e 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/layout/compositing/CompositedLayerMapping.h" #include "core/paint/PaintControllerPaintTest.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerReflectionInfo.cpp b/third_party/WebKit/Source/core/paint/PaintLayerReflectionInfo.cpp index 94175b0..db2a9b8 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerReflectionInfo.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerReflectionInfo.cpp
@@ -41,7 +41,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/paint/PaintLayerReflectionInfo.h" #include "core/frame/UseCounter.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp index 129e7d70..214810c 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -41,7 +41,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/paint/PaintLayerScrollableArea.h" #include "core/css/PseudoStyleRequest.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerStackingNode.cpp b/third_party/WebKit/Source/core/paint/PaintLayerStackingNode.cpp index b567eab..03883ee 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerStackingNode.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerStackingNode.cpp
@@ -41,7 +41,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "core/paint/PaintLayerStackingNode.h" #include "core/layout/LayoutView.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerStackingNodeIterator.cpp b/third_party/WebKit/Source/core/paint/PaintLayerStackingNodeIterator.cpp index ebce038..760ce687 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerStackingNodeIterator.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerStackingNodeIterator.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/paint/PaintLayerStackingNodeIterator.h" // FIXME: We should build our primitive on top of
diff --git a/third_party/WebKit/Source/core/paint/PaintPhase.cpp b/third_party/WebKit/Source/core/paint/PaintPhase.cpp index 9c88ad9..29907a3 100644 --- a/third_party/WebKit/Source/core/paint/PaintPhase.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPhase.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintPhase.h" #include "platform/graphics/paint/DisplayItem.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp index dc0d13c..4d63ab9d 100644 --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintPropertyTreeBuilder.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp index d5a6a65..347dcac0 100644 --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/layout/LayoutTestHelper.h" #include "core/layout/LayoutTreeAsText.h" #include "core/layout/LayoutView.h"
diff --git a/third_party/WebKit/Source/core/paint/PaintTiming.cpp b/third_party/WebKit/Source/core/paint/PaintTiming.cpp index 29b9507..0bffed5f 100644 --- a/third_party/WebKit/Source/core/paint/PaintTiming.cpp +++ b/third_party/WebKit/Source/core/paint/PaintTiming.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PaintTiming.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/paint/PartPainter.cpp b/third_party/WebKit/Source/core/paint/PartPainter.cpp index c98cae26..f170f50 100644 --- a/third_party/WebKit/Source/core/paint/PartPainter.cpp +++ b/third_party/WebKit/Source/core/paint/PartPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/PartPainter.h" #include "core/layout/LayoutPart.h"
diff --git a/third_party/WebKit/Source/core/paint/ReplacedPainter.cpp b/third_party/WebKit/Source/core/paint/ReplacedPainter.cpp index 7e187de..c8b5db2 100644 --- a/third_party/WebKit/Source/core/paint/ReplacedPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ReplacedPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ReplacedPainter.h" #include "core/layout/LayoutReplaced.h"
diff --git a/third_party/WebKit/Source/core/paint/ReplicaPainter.cpp b/third_party/WebKit/Source/core/paint/ReplicaPainter.cpp index 3b076028..2711a2c 100644 --- a/third_party/WebKit/Source/core/paint/ReplicaPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ReplicaPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ReplicaPainter.h" #include "core/layout/LayoutReplica.h"
diff --git a/third_party/WebKit/Source/core/paint/RootInlineBoxPainter.cpp b/third_party/WebKit/Source/core/paint/RootInlineBoxPainter.cpp index 9ccbc76..19428f1 100644 --- a/third_party/WebKit/Source/core/paint/RootInlineBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/RootInlineBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/RootInlineBoxPainter.h" #include "core/layout/line/EllipsisBox.h"
diff --git a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp index d843959..fe44f73 100644 --- a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp +++ b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/RoundedInnerRectClipper.h" #include "core/layout/LayoutBox.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp b/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp index 7b4fa00a..8222ac1 100644 --- a/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGClipPainter.h" #include "core/dom/ElementTraversal.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGContainerPainter.cpp b/third_party/WebKit/Source/core/paint/SVGContainerPainter.cpp index 1294970..ba0d6db 100644 --- a/third_party/WebKit/Source/core/paint/SVGContainerPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGContainerPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGContainerPainter.h" #include "core/layout/svg/LayoutSVGContainer.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp b/third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp index 54da701..f5b894db 100644 --- a/third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGFilterPainter.h" #include "core/layout/svg/LayoutSVGResourceFilter.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGForeignObjectPainter.cpp b/third_party/WebKit/Source/core/paint/SVGForeignObjectPainter.cpp index f1db561..aaa8f0f 100644 --- a/third_party/WebKit/Source/core/paint/SVGForeignObjectPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGForeignObjectPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGForeignObjectPainter.h" #include "core/layout/svg/LayoutSVGForeignObject.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGImagePainter.cpp b/third_party/WebKit/Source/core/paint/SVGImagePainter.cpp index dcb8e82..43b0675 100644 --- a/third_party/WebKit/Source/core/paint/SVGImagePainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGImagePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGImagePainter.h" #include "core/layout/ImageQualityController.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineFlowBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineFlowBoxPainter.cpp index ca20400..50b1da1 100644 --- a/third_party/WebKit/Source/core/paint/SVGInlineFlowBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGInlineFlowBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGInlineFlowBoxPainter.h" #include "core/layout/LayoutInline.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp index 7e086cd..17a542d 100644 --- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGInlineTextBoxPainter.h" #include "core/editing/Editor.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp b/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp index 6918418..f726d73 100644 --- a/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGMaskPainter.h" #include "core/layout/svg/LayoutSVGResourceMasker.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp b/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp index 75c8f94..ad3c5ad 100644 --- a/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp +++ b/third_party/WebKit/Source/core/paint/SVGPaintContext.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/paint/SVGPaintContext.h" #include "core/frame/FrameHost.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGRootInlineBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGRootInlineBoxPainter.cpp index b357dbc..72c17d1b 100644 --- a/third_party/WebKit/Source/core/paint/SVGRootInlineBoxPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGRootInlineBoxPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGRootInlineBoxPainter.h" #include "core/layout/api/SelectionState.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGRootPainter.cpp b/third_party/WebKit/Source/core/paint/SVGRootPainter.cpp index abe160f2..478925b 100644 --- a/third_party/WebKit/Source/core/paint/SVGRootPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGRootPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGRootPainter.h" #include "core/layout/svg/LayoutSVGRoot.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp b/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp index bbf9b4c..5f1b076 100644 --- a/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGShapePainter.h" #include "core/layout/svg/LayoutSVGResourceMarker.h"
diff --git a/third_party/WebKit/Source/core/paint/SVGTextPainter.cpp b/third_party/WebKit/Source/core/paint/SVGTextPainter.cpp index e982250..afc1497f9 100644 --- a/third_party/WebKit/Source/core/paint/SVGTextPainter.cpp +++ b/third_party/WebKit/Source/core/paint/SVGTextPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/SVGTextPainter.h" #include "core/layout/svg/LayoutSVGText.h"
diff --git a/third_party/WebKit/Source/core/paint/ScopeRecorder.cpp b/third_party/WebKit/Source/core/paint/ScopeRecorder.cpp index 086a1f7a..c3697d09 100644 --- a/third_party/WebKit/Source/core/paint/ScopeRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/ScopeRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ScopeRecorder.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/paint/ScrollRecorder.cpp b/third_party/WebKit/Source/core/paint/ScrollRecorder.cpp index 290fd2c9..7a31577 100644 --- a/third_party/WebKit/Source/core/paint/ScrollRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/ScrollRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ScrollRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp b/third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp index b6d9682b..590438df 100644 --- a/third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ScrollableAreaPainter.h" #include "core/layout/LayoutView.h"
diff --git a/third_party/WebKit/Source/core/paint/ScrollbarPainter.cpp b/third_party/WebKit/Source/core/paint/ScrollbarPainter.cpp index 74c101d..212349d7 100644 --- a/third_party/WebKit/Source/core/paint/ScrollbarPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ScrollbarPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ScrollbarPainter.h" #include "core/layout/LayoutScrollbar.h"
diff --git a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp index 6b08b26..c6372e5 100644 --- a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp +++ b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TableCellPainter.h" #include "core/layout/LayoutTableCell.h"
diff --git a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp index 93dfbe7..e8a2c19 100644 --- a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp +++ b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "core/paint/PaintControllerPaintTest.h" #include "core/paint/PaintLayerPainter.h"
diff --git a/third_party/WebKit/Source/core/paint/TablePainter.cpp b/third_party/WebKit/Source/core/paint/TablePainter.cpp index 8d5afc3..fe965b8 100644 --- a/third_party/WebKit/Source/core/paint/TablePainter.cpp +++ b/third_party/WebKit/Source/core/paint/TablePainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TablePainter.h" #include "core/layout/LayoutTable.h"
diff --git a/third_party/WebKit/Source/core/paint/TableRowPainter.cpp b/third_party/WebKit/Source/core/paint/TableRowPainter.cpp index 630ae29..b3ee5c1 100644 --- a/third_party/WebKit/Source/core/paint/TableRowPainter.cpp +++ b/third_party/WebKit/Source/core/paint/TableRowPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TableRowPainter.h" #include "core/layout/LayoutTableCell.h"
diff --git a/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp b/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp index d01e308..d4c38f6 100644 --- a/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp +++ b/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TableSectionPainter.h" #include "core/layout/LayoutTable.h"
diff --git a/third_party/WebKit/Source/core/paint/TextPainter.cpp b/third_party/WebKit/Source/core/paint/TextPainter.cpp index 5ab6352..db471e9 100644 --- a/third_party/WebKit/Source/core/paint/TextPainter.cpp +++ b/third_party/WebKit/Source/core/paint/TextPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TextPainter.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/paint/TextPainterTest.cpp b/third_party/WebKit/Source/core/paint/TextPainterTest.cpp index 60ef0a5..9b7b1bc 100644 --- a/third_party/WebKit/Source/core/paint/TextPainterTest.cpp +++ b/third_party/WebKit/Source/core/paint/TextPainterTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TextPainter.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/paint/ThemePainter.cpp b/third_party/WebKit/Source/core/paint/ThemePainter.cpp index 63d9adde7..b965883 100644 --- a/third_party/WebKit/Source/core/paint/ThemePainter.cpp +++ b/third_party/WebKit/Source/core/paint/ThemePainter.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/paint/ThemePainter.h" #include "core/InputTypeNames.h"
diff --git a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp index 1d220e01..46da8aa3 100644 --- a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp +++ b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "core/paint/ThemePainterDefault.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp b/third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp index af546ffc..c188e13 100644 --- a/third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/Transform3DRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/core/paint/TransformRecorder.cpp b/third_party/WebKit/Source/core/paint/TransformRecorder.cpp index d2ba720..b1079f9 100644 --- a/third_party/WebKit/Source/core/paint/TransformRecorder.cpp +++ b/third_party/WebKit/Source/core/paint/TransformRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/TransformRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/core/paint/VideoPainter.cpp b/third_party/WebKit/Source/core/paint/VideoPainter.cpp index 2f9d1c4a..d48b78d 100644 --- a/third_party/WebKit/Source/core/paint/VideoPainter.cpp +++ b/third_party/WebKit/Source/core/paint/VideoPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/VideoPainter.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/paint/ViewPainter.cpp b/third_party/WebKit/Source/core/paint/ViewPainter.cpp index a3fa2e37..5a4f838 100644 --- a/third_party/WebKit/Source/core/paint/ViewPainter.cpp +++ b/third_party/WebKit/Source/core/paint/ViewPainter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/paint/ViewPainter.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/svg/ColorDistance.cpp b/third_party/WebKit/Source/core/svg/ColorDistance.cpp index 5e29f195..0ee1893 100644 --- a/third_party/WebKit/Source/core/svg/ColorDistance.cpp +++ b/third_party/WebKit/Source/core/svg/ColorDistance.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/ColorDistance.h" #include "platform/graphics/Color.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAElement.cpp b/third_party/WebKit/Source/core/svg/SVGAElement.cpp index 2251192..88c9a27 100644 --- a/third_party/WebKit/Source/core/svg/SVGAElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAElement.cpp
@@ -20,8 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGAElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAngle.cpp b/third_party/WebKit/Source/core/svg/SVGAngle.cpp index 930130ce..991acb4 100644 --- a/third_party/WebKit/Source/core/svg/SVGAngle.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAngle.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAngle.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAngleTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGAngleTearOff.cpp index 120733b3..d20417cf 100644 --- a/third_party/WebKit/Source/core/svg/SVGAngleTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAngleTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGAngleTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp index 70ab22b..936cb733 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
@@ -20,8 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGAnimateElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp index b0c476a..595dcceb 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimateMotionElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAnimateMotionElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateTransformElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateTransformElement.cpp index bfd3ff0..34d6d3b0 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimateTransformElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimateTransformElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAnimateTransformElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedAngle.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedAngle.cpp index 3a8e0861..1c5eff4 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedAngle.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedAngle.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGAnimatedAngle.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp index b05eebe..1b6b3cb 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAnimatedColor.h" #include "core/css/parser/CSSParser.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedEnumerationBase.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedEnumerationBase.cpp index 7e4b90a1..bb5b9117 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedEnumerationBase.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedEnumerationBase.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGAnimatedEnumerationBase.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedInteger.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedInteger.cpp index eaa4e71..601f785 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedInteger.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedInteger.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGAnimatedInteger.h" #include "core/svg/SVGAnimatedIntegerOptionalInteger.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedIntegerOptionalInteger.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedIntegerOptionalInteger.cpp index 695f996..fa4acc0 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedIntegerOptionalInteger.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedIntegerOptionalInteger.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGAnimatedIntegerOptionalInteger.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedLength.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedLength.cpp index 4ed90e3..2bd0f16 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedLength.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedLength.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGAnimatedLength.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedNumber.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedNumber.cpp index 0258283..57324c6 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedNumber.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedNumber.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGAnimatedNumber.h" #include "core/svg/SVGAnimatedNumberOptionalNumber.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedNumberOptionalNumber.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedNumberOptionalNumber.cpp index e67cefc..daa8b1a 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedNumberOptionalNumber.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedNumberOptionalNumber.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGAnimatedNumberOptionalNumber.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp index ec29b224..1d2fb83f 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGAnimatedPath.h" #include "core/svg/SVGPathElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedString.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedString.cpp index 9dc3009..b3c2053e 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedString.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedString.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/svg/SVGAnimatedString.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.cpp index ec826804..18b00eda 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAnimatedTypeAnimator.h" #include "core/svg/SVGAnimateTransformElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp index 4525dec..e16b94c 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGAnimationElement.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGBoolean.cpp b/third_party/WebKit/Source/core/svg/SVGBoolean.cpp index e3f300cb..a323744 100644 --- a/third_party/WebKit/Source/core/svg/SVGBoolean.cpp +++ b/third_party/WebKit/Source/core/svg/SVGBoolean.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGBoolean.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp b/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp index 39127905..31d7a3b 100644 --- a/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGCircleElement.h" #include "core/layout/svg/LayoutSVGEllipse.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp index df5ba38..734ba654 100644 --- a/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGClipPathElement.h" #include "core/layout/svg/LayoutSVGResourceClipper.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGComponentTransferFunctionElement.cpp b/third_party/WebKit/Source/core/svg/SVGComponentTransferFunctionElement.cpp index 1e5a2f62..a5c3bca 100644 --- a/third_party/WebKit/Source/core/svg/SVGComponentTransferFunctionElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGComponentTransferFunctionElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGComponentTransferFunctionElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGCursorElement.cpp b/third_party/WebKit/Source/core/svg/SVGCursorElement.cpp index ad95a239..a656e0f 100644 --- a/third_party/WebKit/Source/core/svg/SVGCursorElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGCursorElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGCursorElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGDefsElement.cpp b/third_party/WebKit/Source/core/svg/SVGDefsElement.cpp index 3813ce9..31e6c02 100644 --- a/third_party/WebKit/Source/core/svg/SVGDefsElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGDefsElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGDefsElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGDescElement.cpp b/third_party/WebKit/Source/core/svg/SVGDescElement.cpp index f0b223d..806e55ef 100644 --- a/third_party/WebKit/Source/core/svg/SVGDescElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGDescElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGDescElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGDiscardElement.cpp b/third_party/WebKit/Source/core/svg/SVGDiscardElement.cpp index 9272f70..dd21f0d 100644 --- a/third_party/WebKit/Source/core/svg/SVGDiscardElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGDiscardElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGDiscardElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp index 8632b2d..f9cbe72 100644 --- a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp +++ b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGDocumentExtensions.h" #include "core/dom/Document.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGElement.cpp index e4bc03fe..03072b00 100644 --- a/third_party/WebKit/Source/core/svg/SVGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGElement.cpp
@@ -21,8 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGElement.h" #include "bindings/core/v8/ScriptEventListener.h" @@ -1070,7 +1068,7 @@ { // This static is atomically initialized to dodge a warning about // a race when dumping debug data for a layer. - DEFINE_STATIC_LOCAL_THREAD_SAFE(HashSet<QualifiedName>, animatableAttributes, new HashSet<QualifiedName>()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(HashSet<QualifiedName>, animatableAttributes, new HashSet<QualifiedName>()); if (animatableAttributes.isEmpty()) { const QualifiedName* const animatableAttrs[] = {
diff --git a/third_party/WebKit/Source/core/svg/SVGElementRareData.cpp b/third_party/WebKit/Source/core/svg/SVGElementRareData.cpp index e3119af..35b9b7c 100644 --- a/third_party/WebKit/Source/core/svg/SVGElementRareData.cpp +++ b/third_party/WebKit/Source/core/svg/SVGElementRareData.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/svg/SVGElementRareData.h" #include "core/css/CSSCursorImageValue.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp b/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp index 88f56d4..679208e 100644 --- a/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGEllipseElement.h" #include "core/layout/svg/LayoutSVGEllipse.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGEnumeration.cpp b/third_party/WebKit/Source/core/svg/SVGEnumeration.cpp index c4c4a85..e6ad2d6 100644 --- a/third_party/WebKit/Source/core/svg/SVGEnumeration.cpp +++ b/third_party/WebKit/Source/core/svg/SVGEnumeration.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGEnumeration.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp index 86bfacf..95328b8 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEBlendElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp index 0a9c90c..6bbaef75 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEColorMatrixElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.cpp index e5925bee..2e067fc 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEComponentTransferElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFECompositeElement.cpp b/third_party/WebKit/Source/core/svg/SVGFECompositeElement.cpp index bbc344a..ff8d38af 100644 --- a/third_party/WebKit/Source/core/svg/SVGFECompositeElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFECompositeElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFECompositeElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp index b1806d3..9f75d78 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEConvolveMatrixElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEDiffuseLightingElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEDiffuseLightingElement.cpp index 44764b2..dbf42f3 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEDiffuseLightingElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEDiffuseLightingElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEDiffuseLightingElement.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEDisplacementMapElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEDisplacementMapElement.cpp index 0137f91..a2487bf 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEDisplacementMapElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEDisplacementMapElement.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEDisplacementMapElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEDistantLightElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEDistantLightElement.cpp index 9687798a..8f03a9f 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEDistantLightElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEDistantLightElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEDistantLightElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.cpp index 7f70d4c..15ad658 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEDropShadowElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEFloodElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEFloodElement.cpp index 663a980..dc55bcb 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEFloodElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEFloodElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEFloodElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEFuncAElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEFuncAElement.cpp index dc3814d..ff25979 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEFuncAElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEFuncAElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEFuncAElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGFEFuncBElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEFuncBElement.cpp index 14a5510..4b17179 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEFuncBElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEFuncBElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEFuncBElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGFEFuncGElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEFuncGElement.cpp index 7461ad6..66433bff 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEFuncGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEFuncGElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEFuncGElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGFEFuncRElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEFuncRElement.cpp index fd3f2924..c0b6682 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEFuncRElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEFuncRElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEFuncRElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp index f57acbb..e32a34ef 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEGaussianBlurElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp index ec9b5cc5..3f8b349 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEImageElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFELightElement.cpp b/third_party/WebKit/Source/core/svg/SVGFELightElement.cpp index c5c2ea21..81b6c7f 100644 --- a/third_party/WebKit/Source/core/svg/SVGFELightElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFELightElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFELightElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEMergeElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEMergeElement.cpp index 7b1cc60..92a516ca 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEMergeElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEMergeElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEMergeElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp index 2ab77097..957cae18 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEMergeNodeElement.h" #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEMorphologyElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEMorphologyElement.cpp index 9c36d646..db323c8 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEMorphologyElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEMorphologyElement.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEMorphologyElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEOffsetElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEOffsetElement.cpp index 14c0919..c48cf95 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEOffsetElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEOffsetElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFEOffsetElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFEPointLightElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEPointLightElement.cpp index b124d9a..529485a 100644 --- a/third_party/WebKit/Source/core/svg/SVGFEPointLightElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFEPointLightElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFEPointLightElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.cpp b/third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.cpp index ae6cca45..f9fe68e 100644 --- a/third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFESpecularLightingElement.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFESpotLightElement.cpp b/third_party/WebKit/Source/core/svg/SVGFESpotLightElement.cpp index a62ef2f..687f83df 100644 --- a/third_party/WebKit/Source/core/svg/SVGFESpotLightElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFESpotLightElement.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFESpotLightElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFETileElement.cpp b/third_party/WebKit/Source/core/svg/SVGFETileElement.cpp index fc5c2ee..2c213bf 100644 --- a/third_party/WebKit/Source/core/svg/SVGFETileElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFETileElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFETileElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFETurbulenceElement.cpp b/third_party/WebKit/Source/core/svg/SVGFETurbulenceElement.cpp index 87427f0..ea855ee4 100644 --- a/third_party/WebKit/Source/core/svg/SVGFETurbulenceElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFETurbulenceElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFETurbulenceElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFilterElement.cpp b/third_party/WebKit/Source/core/svg/SVGFilterElement.cpp index a35ffb5..b354b55 100644 --- a/third_party/WebKit/Source/core/svg/SVGFilterElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFilterElement.cpp
@@ -21,8 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFilterElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFilterPrimitiveStandardAttributes.cpp b/third_party/WebKit/Source/core/svg/SVGFilterPrimitiveStandardAttributes.cpp index bc1bcd69..428af34b 100644 --- a/third_party/WebKit/Source/core/svg/SVGFilterPrimitiveStandardAttributes.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGFilterPrimitiveStandardAttributes.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGFitToViewBox.cpp b/third_party/WebKit/Source/core/svg/SVGFitToViewBox.cpp index 481777b..0de541a 100644 --- a/third_party/WebKit/Source/core/svg/SVGFitToViewBox.cpp +++ b/third_party/WebKit/Source/core/svg/SVGFitToViewBox.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGFitToViewBox.h" #include "core/dom/Attribute.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp b/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp index 84fb3af..710e3d6 100644 --- a/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGForeignObjectElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGGElement.cpp b/third_party/WebKit/Source/core/svg/SVGGElement.cpp index 9138fcc..16fcb7a 100644 --- a/third_party/WebKit/Source/core/svg/SVGGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGGElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGGElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGGeometryElement.cpp b/third_party/WebKit/Source/core/svg/SVGGeometryElement.cpp index 29a0722..a060164 100644 --- a/third_party/WebKit/Source/core/svg/SVGGeometryElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGGeometryElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGGeometryElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp b/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp index 91daf1e..2c70847f 100644 --- a/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGGradientElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp b/third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp index 79da429..93cc068a2 100644 --- a/third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGGraphicsElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGImageElement.cpp b/third_party/WebKit/Source/core/svg/SVGImageElement.cpp index a4286f1..b3a604a 100644 --- a/third_party/WebKit/Source/core/svg/SVGImageElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGImageElement.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGImageElement.h" #include "core/CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp b/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp index 888d674..d62cd6c 100644 --- a/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp +++ b/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGImageLoader.h" #include "core/events/Event.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGInteger.cpp b/third_party/WebKit/Source/core/svg/SVGInteger.cpp index f6642e76..6c822b9 100644 --- a/third_party/WebKit/Source/core/svg/SVGInteger.cpp +++ b/third_party/WebKit/Source/core/svg/SVGInteger.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGInteger.h" #include "core/html/parser/HTMLParserIdioms.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGIntegerOptionalInteger.cpp b/third_party/WebKit/Source/core/svg/SVGIntegerOptionalInteger.cpp index 85b9dff..16c02de 100644 --- a/third_party/WebKit/Source/core/svg/SVGIntegerOptionalInteger.cpp +++ b/third_party/WebKit/Source/core/svg/SVGIntegerOptionalInteger.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGIntegerOptionalInteger.h" #include "core/svg/SVGAnimationElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLength.cpp b/third_party/WebKit/Source/core/svg/SVGLength.cpp index 92400874..51f0d2a 100644 --- a/third_party/WebKit/Source/core/svg/SVGLength.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLength.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGLength.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp index f553158..5d6e0586 100644 --- a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGLengthContext.h" #include "core/css/CSSHelper.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLengthList.cpp b/third_party/WebKit/Source/core/svg/SVGLengthList.cpp index 60620ec7..7399fc6 100644 --- a/third_party/WebKit/Source/core/svg/SVGLengthList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLengthList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGLengthList.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLengthTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGLengthTearOff.cpp index 7863e5c..2fdbb899 100644 --- a/third_party/WebKit/Source/core/svg/SVGLengthTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLengthTearOff.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGLengthTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLineElement.cpp b/third_party/WebKit/Source/core/svg/SVGLineElement.cpp index 17b6b04..d611e520 100644 --- a/third_party/WebKit/Source/core/svg/SVGLineElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLineElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGLineElement.h" #include "core/layout/svg/LayoutSVGShape.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGLinearGradientElement.cpp b/third_party/WebKit/Source/core/svg/SVGLinearGradientElement.cpp index 11cddc2..7c6605a8 100644 --- a/third_party/WebKit/Source/core/svg/SVGLinearGradientElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGLinearGradientElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGLinearGradientElement.h" #include "core/layout/svg/LayoutSVGResourceLinearGradient.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp index cd071bcb..4186c13e 100644 --- a/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGMPathElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMarkerElement.cpp b/third_party/WebKit/Source/core/svg/SVGMarkerElement.cpp index 41477cd..fe0e9a4 100644 --- a/third_party/WebKit/Source/core/svg/SVGMarkerElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGMarkerElement.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGMarkerElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp index daaaf6c3..05289938 100644 --- a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
@@ -21,8 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGMaskElement.h" #include "core/layout/svg/LayoutSVGResourceMasker.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMatrixTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGMatrixTearOff.cpp index 9f2430e5..0385b03 100644 --- a/third_party/WebKit/Source/core/svg/SVGMatrixTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGMatrixTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGMatrixTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMetadataElement.cpp b/third_party/WebKit/Source/core/svg/SVGMetadataElement.cpp index 41cc3bc..59b3d2d 100644 --- a/third_party/WebKit/Source/core/svg/SVGMetadataElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGMetadataElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGMetadataElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGNumber.cpp b/third_party/WebKit/Source/core/svg/SVGNumber.cpp index 14bd88c..3393b60c 100644 --- a/third_party/WebKit/Source/core/svg/SVGNumber.cpp +++ b/third_party/WebKit/Source/core/svg/SVGNumber.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGNumber.h" #include "core/svg/SVGAnimationElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGNumberList.cpp b/third_party/WebKit/Source/core/svg/SVGNumberList.cpp index 78ad01c..c3a5867 100644 --- a/third_party/WebKit/Source/core/svg/SVGNumberList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGNumberList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGNumberList.h" #include "core/svg/SVGAnimationElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGNumberOptionalNumber.cpp b/third_party/WebKit/Source/core/svg/SVGNumberOptionalNumber.cpp index 655a847..e7dad4a 100644 --- a/third_party/WebKit/Source/core/svg/SVGNumberOptionalNumber.cpp +++ b/third_party/WebKit/Source/core/svg/SVGNumberOptionalNumber.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGNumberOptionalNumber.h" #include "core/svg/SVGAnimationElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGNumberTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGNumberTearOff.cpp index 609079c..f0648418 100644 --- a/third_party/WebKit/Source/core/svg/SVGNumberTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGNumberTearOff.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGNumberTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp b/third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp index 6cc5291..f1af2cb 100644 --- a/third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp +++ b/third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGParserUtilities.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPath.cpp b/third_party/WebKit/Source/core/svg/SVGPath.cpp index 0bcde6a..d8db81a 100644 --- a/third_party/WebKit/Source/core/svg/SVGPath.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPath.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPath.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathBlender.cpp b/third_party/WebKit/Source/core/svg/SVGPathBlender.cpp index 921988f2..c74c0455 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathBlender.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathBlender.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathBlender.h" #include "core/svg/SVGPathConsumer.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathBuilder.cpp b/third_party/WebKit/Source/core/svg/SVGPathBuilder.cpp index 4dc812cc..ceacd0f 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathBuilder.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathBuilder.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathBuilder.h" #include "core/svg/SVGPathData.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathByteStreamBuilder.cpp b/third_party/WebKit/Source/core/svg/SVGPathByteStreamBuilder.cpp index 52a2dbe..ee5bcbfd 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathByteStreamBuilder.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathByteStreamBuilder.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathByteStreamBuilder.h" #include "core/svg/SVGPathByteStream.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathByteStreamSource.cpp b/third_party/WebKit/Source/core/svg/SVGPathByteStreamSource.cpp index ae38a65..a57a45c 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathByteStreamSource.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathByteStreamSource.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathByteStreamSource.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGPathElement.cpp index 5a53beae..bf9e7b6c 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathElement.h" #include "core/layout/svg/LayoutSVGPath.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathParser.cpp b/third_party/WebKit/Source/core/svg/SVGPathParser.cpp index 989ba01..ec91d20 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathParser.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathParser.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathParser.h" #include "core/svg/SVGPathConsumer.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathParserTest.cpp b/third_party/WebKit/Source/core/svg/SVGPathParserTest.cpp index 1b5762b..f50c8c8 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathParserTest.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathParserTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "core/svg/SVGPathParser.h" #include "core/svg/SVGPathStringBuilder.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathQuery.cpp b/third_party/WebKit/Source/core/svg/SVGPathQuery.cpp index f7a596a5..e7478b80 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathQuery.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathQuery.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathQuery.h" #include "core/svg/SVGPathByteStreamSource.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathStringBuilder.cpp b/third_party/WebKit/Source/core/svg/SVGPathStringBuilder.cpp index e5eaba6..a8db8960 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathStringBuilder.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathStringBuilder.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathStringBuilder.h" #include "core/svg/SVGPathData.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp b/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp index 5d352333..83d46db 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathStringSource.h" #include "core/svg/SVGParserUtilities.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPathUtilities.cpp b/third_party/WebKit/Source/core/svg/SVGPathUtilities.cpp index 96e70e18..f96e2b6 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathUtilities.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathUtilities.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPathUtilities.h" #include "core/svg/SVGPathBuilder.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPatternElement.cpp b/third_party/WebKit/Source/core/svg/SVGPatternElement.cpp index 1ebe3a6..be2a563 100644 --- a/third_party/WebKit/Source/core/svg/SVGPatternElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPatternElement.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPatternElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPoint.cpp b/third_party/WebKit/Source/core/svg/SVGPoint.cpp index 761de266..f50d2fb 100644 --- a/third_party/WebKit/Source/core/svg/SVGPoint.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPoint.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGPoint.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPointList.cpp b/third_party/WebKit/Source/core/svg/SVGPointList.cpp index b8ab686c..d1b2ac7b 100644 --- a/third_party/WebKit/Source/core/svg/SVGPointList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPointList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPointList.h" #include "core/svg/SVGAnimationElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPointTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGPointTearOff.cpp index 706d26d..409f49e8 100644 --- a/third_party/WebKit/Source/core/svg/SVGPointTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPointTearOff.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGPointTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPolyElement.cpp b/third_party/WebKit/Source/core/svg/SVGPolyElement.cpp index f1a01095..03f4a78d 100644 --- a/third_party/WebKit/Source/core/svg/SVGPolyElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPolyElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPolyElement.h" #include "core/layout/svg/LayoutSVGShape.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPolygonElement.cpp b/third_party/WebKit/Source/core/svg/SVGPolygonElement.cpp index c34e059..8632c86 100644 --- a/third_party/WebKit/Source/core/svg/SVGPolygonElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPolygonElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPolygonElement.h" #include "platform/graphics/Path.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPolylineElement.cpp b/third_party/WebKit/Source/core/svg/SVGPolylineElement.cpp index 95767d01..2feef43 100644 --- a/third_party/WebKit/Source/core/svg/SVGPolylineElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPolylineElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPolylineElement.h" #include "platform/graphics/Path.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatio.cpp b/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatio.cpp index 3f609de..04c5d5a 100644 --- a/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatio.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatio.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGPreserveAspectRatio.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatioTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatioTearOff.cpp index b78e60a..8053de9 100644 --- a/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatioTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPreserveAspectRatioTearOff.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGPreserveAspectRatioTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGRadialGradientElement.cpp b/third_party/WebKit/Source/core/svg/SVGRadialGradientElement.cpp index 87ea3f01..39d82f2 100644 --- a/third_party/WebKit/Source/core/svg/SVGRadialGradientElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGRadialGradientElement.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGRadialGradientElement.h" #include "core/layout/svg/LayoutSVGResourceRadialGradient.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGRect.cpp b/third_party/WebKit/Source/core/svg/SVGRect.cpp index b713933..1574a96 100644 --- a/third_party/WebKit/Source/core/svg/SVGRect.cpp +++ b/third_party/WebKit/Source/core/svg/SVGRect.cpp
@@ -19,8 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGRect.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp index 6c8461f..18a98d4 100644 --- a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGRectElement.h" #include "core/layout/svg/LayoutSVGRect.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGRectTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGRectTearOff.cpp index 13e410e..21abd522 100644 --- a/third_party/WebKit/Source/core/svg/SVGRectTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGRectTearOff.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/SVGRectTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp index 8c4803a..089c8b4 100644 --- a/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp
@@ -20,8 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGSVGElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGScriptElement.cpp b/third_party/WebKit/Source/core/svg/SVGScriptElement.cpp index 001b5ed..91e2408 100644 --- a/third_party/WebKit/Source/core/svg/SVGScriptElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGScriptElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGScriptElement.h" #include "bindings/core/v8/ScriptEventListener.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGSetElement.cpp b/third_party/WebKit/Source/core/svg/SVGSetElement.cpp index bb95192..cdbad6a 100644 --- a/third_party/WebKit/Source/core/svg/SVGSetElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGSetElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGSetElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGStaticStringList.cpp b/third_party/WebKit/Source/core/svg/SVGStaticStringList.cpp index 429320b..5853162 100644 --- a/third_party/WebKit/Source/core/svg/SVGStaticStringList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGStaticStringList.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGStaticStringList.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGStopElement.cpp b/third_party/WebKit/Source/core/svg/SVGStopElement.cpp index 5c13184..3d16e4a 100644 --- a/third_party/WebKit/Source/core/svg/SVGStopElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGStopElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGStopElement.h" #include "core/layout/svg/LayoutSVGGradientStop.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGString.cpp b/third_party/WebKit/Source/core/svg/SVGString.cpp index 5aa40d9e..f4de31f 100644 --- a/third_party/WebKit/Source/core/svg/SVGString.cpp +++ b/third_party/WebKit/Source/core/svg/SVGString.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGString.h" #include "core/svg/SVGAnimateElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGStringList.cpp b/third_party/WebKit/Source/core/svg/SVGStringList.cpp index d44f653..565070c 100644 --- a/third_party/WebKit/Source/core/svg/SVGStringList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGStringList.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGStringList.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGStringListTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGStringListTearOff.cpp index 8d5cb1e7..80adbf22 100644 --- a/third_party/WebKit/Source/core/svg/SVGStringListTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGStringListTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGStringListTearOff.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGStyleElement.cpp b/third_party/WebKit/Source/core/svg/SVGStyleElement.cpp index 492f9f5..d53822eb 100644 --- a/third_party/WebKit/Source/core/svg/SVGStyleElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGStyleElement.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGStyleElement.h" #include "core/MediaTypeNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGSwitchElement.cpp b/third_party/WebKit/Source/core/svg/SVGSwitchElement.cpp index 85dd756..2bb0a40 100644 --- a/third_party/WebKit/Source/core/svg/SVGSwitchElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGSwitchElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGSwitchElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGSymbolElement.cpp b/third_party/WebKit/Source/core/svg/SVGSymbolElement.cpp index 8edf21e..05b5acf3 100644 --- a/third_party/WebKit/Source/core/svg/SVGSymbolElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGSymbolElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGSymbolElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTSpanElement.cpp b/third_party/WebKit/Source/core/svg/SVGTSpanElement.cpp index 14cf21d..996b4b4 100644 --- a/third_party/WebKit/Source/core/svg/SVGTSpanElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTSpanElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGTSpanElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTests.cpp b/third_party/WebKit/Source/core/svg/SVGTests.cpp index dd4cc342..262a71a0 100644 --- a/third_party/WebKit/Source/core/svg/SVGTests.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTests.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTests.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp b/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp index b23b1ffa..efcbd806 100644 --- a/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTextContentElement.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTextElement.cpp b/third_party/WebKit/Source/core/svg/SVGTextElement.cpp index 97a7351..f992bd64 100644 --- a/third_party/WebKit/Source/core/svg/SVGTextElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTextElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTextElement.h" #include "core/layout/svg/LayoutSVGText.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTextPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGTextPathElement.cpp index 343cb34..e73d1236 100644 --- a/third_party/WebKit/Source/core/svg/SVGTextPathElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTextPathElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTextPathElement.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp b/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp index c475a75..b9699b2a 100644 --- a/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGTextPositioningElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTitleElement.cpp b/third_party/WebKit/Source/core/svg/SVGTitleElement.cpp index a905ac6..b022cf69 100644 --- a/third_party/WebKit/Source/core/svg/SVGTitleElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTitleElement.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTitleElement.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTransform.cpp b/third_party/WebKit/Source/core/svg/SVGTransform.cpp index 04f0a34..d049c9b 100644 --- a/third_party/WebKit/Source/core/svg/SVGTransform.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTransform.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTransform.h" #include "platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp b/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp index 306d6796..9cd8ad7 100644 --- a/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp
@@ -17,8 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGTransformDistance.h" #include "platform/geometry/FloatPoint.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTransformList.cpp b/third_party/WebKit/Source/core/svg/SVGTransformList.cpp index 9158c3d..6076f5f4 100644 --- a/third_party/WebKit/Source/core/svg/SVGTransformList.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTransformList.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGTransformList.h" #include "core/SVGNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTransformListTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGTransformListTearOff.cpp index bc70b94..4bac7b97 100644 --- a/third_party/WebKit/Source/core/svg/SVGTransformListTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTransformListTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGTransformListTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGTransformTearOff.cpp b/third_party/WebKit/Source/core/svg/SVGTransformTearOff.cpp index 3fe9dcc..7c8e6d2 100644 --- a/third_party/WebKit/Source/core/svg/SVGTransformTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/SVGTransformTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGTransformTearOff.h" #include "bindings/core/v8/ExceptionState.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGURIReference.cpp b/third_party/WebKit/Source/core/svg/SVGURIReference.cpp index bc5d6cd26..ebc2a2c3 100644 --- a/third_party/WebKit/Source/core/svg/SVGURIReference.cpp +++ b/third_party/WebKit/Source/core/svg/SVGURIReference.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGURIReference.h" #include "core/XLinkNames.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGUnitTypes.cpp b/third_party/WebKit/Source/core/svg/SVGUnitTypes.cpp index a1c17e0..dcf0b15 100644 --- a/third_party/WebKit/Source/core/svg/SVGUnitTypes.cpp +++ b/third_party/WebKit/Source/core/svg/SVGUnitTypes.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGUnitTypes.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGUnknownElement.cpp b/third_party/WebKit/Source/core/svg/SVGUnknownElement.cpp index 00c182a..9faf964 100644 --- a/third_party/WebKit/Source/core/svg/SVGUnknownElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGUnknownElement.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/SVGUnknownElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp index d4e17161..a33b01c 100644 --- a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
@@ -22,8 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGUseElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGViewElement.cpp b/third_party/WebKit/Source/core/svg/SVGViewElement.cpp index 2e1a097..7d0ed4f9 100644 --- a/third_party/WebKit/Source/core/svg/SVGViewElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGViewElement.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/SVGViewElement.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/svg/SVGViewSpec.cpp b/third_party/WebKit/Source/core/svg/SVGViewSpec.cpp index 20078dbd..c09dc232 100644 --- a/third_party/WebKit/Source/core/svg/SVGViewSpec.cpp +++ b/third_party/WebKit/Source/core/svg/SVGViewSpec.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGViewSpec.h" #include "bindings/core/v8/ExceptionMessages.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGZoomAndPan.cpp b/third_party/WebKit/Source/core/svg/SVGZoomAndPan.cpp index b6e22bf5..9468c21 100644 --- a/third_party/WebKit/Source/core/svg/SVGZoomAndPan.cpp +++ b/third_party/WebKit/Source/core/svg/SVGZoomAndPan.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGZoomAndPan.h" #include "platform/text/ParserUtilities.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGZoomEvent.cpp b/third_party/WebKit/Source/core/svg/SVGZoomEvent.cpp index 050bf32..4ad663b 100644 --- a/third_party/WebKit/Source/core/svg/SVGZoomEvent.cpp +++ b/third_party/WebKit/Source/core/svg/SVGZoomEvent.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/SVGZoomEvent.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp b/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp index 46916e3a..2aabde5f 100644 --- a/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp +++ b/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" // FIXME(dominicc): Poor confused check-webkit-style demands Attribute.h here. #include "core/dom/Attribute.h"
diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTime.cpp b/third_party/WebKit/Source/core/svg/animation/SMILTime.cpp index 674c18d..4cc6be8 100644 --- a/third_party/WebKit/Source/core/svg/animation/SMILTime.cpp +++ b/third_party/WebKit/Source/core/svg/animation/SMILTime.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/animation/SMILTime.h" #include <float.h>
diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp index 81a0b9f..3939549 100644 --- a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp +++ b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/animation/SMILTimeContainer.h" #include "core/animation/AnimationClock.h"
diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp index ff36605..f66c9cc3 100644 --- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp +++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/animation/SVGSMILElement.h" #include "bindings/core/v8/ExceptionStatePlaceholder.h"
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp index 7d3eae6..f4a5c08 100644 --- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp +++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
@@ -25,8 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "core/svg/graphics/SVGImage.h" #include "core/animation/AnimationTimeline.h"
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImageChromeClient.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImageChromeClient.cpp index 056c92f..fdca443 100644 --- a/third_party/WebKit/Source/core/svg/graphics/SVGImageChromeClient.cpp +++ b/third_party/WebKit/Source/core/svg/graphics/SVGImageChromeClient.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/graphics/SVGImageChromeClient.h" #include "core/frame/FrameView.h"
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.cpp index 956e1da0..c654111 100644 --- a/third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.cpp +++ b/third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/graphics/SVGImageForContainer.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp index 41b15ff..d551f17 100644 --- a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp +++ b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp
@@ -21,8 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "core/svg/graphics/filters/SVGFEImage.h" #include "core/layout/LayoutObject.h"
diff --git a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp index 8b981e9..7df918e 100644 --- a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp +++ b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "core/svg/graphics/filters/SVGFilterBuilder.h" #include "core/css/CSSPrimitiveValue.h"
diff --git a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp index 802d8a76..aa01ebb 100644 --- a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp +++ b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/properties/SVGAnimatedProperty.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/svg/properties/SVGPropertyTearOff.cpp b/third_party/WebKit/Source/core/svg/properties/SVGPropertyTearOff.cpp index d03a3b2..de0a6cb4 100644 --- a/third_party/WebKit/Source/core/svg/properties/SVGPropertyTearOff.cpp +++ b/third_party/WebKit/Source/core/svg/properties/SVGPropertyTearOff.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "core/svg/properties/SVGPropertyTearOff.h" #include "core/svg/SVGElement.h"
diff --git a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp index 45f1abb..56a7b40 100644 --- a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp +++ b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp
@@ -70,7 +70,7 @@ static HeapSizeCache& forCurrentThread() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<HeapSizeCache>, heapSizeCache, new ThreadSpecific<HeapSizeCache>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<HeapSizeCache>, heapSizeCache, new ThreadSpecific<HeapSizeCache>); return *heapSizeCache; }
diff --git a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp index b6bf842..68cfe8a 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp
@@ -70,7 +70,7 @@ const RestrictedKeyMap& restrictedKeyMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RestrictedKeyMap, map, createRestrictedKeyMap()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RestrictedKeyMap, map, createRestrictedKeyMap()); return map; }
diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp index bb6fde4..0ce13b4 100644 --- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp +++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
@@ -89,7 +89,7 @@ static Mutex& threadSetMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; }
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/ResourceScriptMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/ResourceScriptMapping.js index 3c9451c8..8312ddb4 100644 --- a/third_party/WebKit/Source/devtools/front_end/bindings/ResourceScriptMapping.js +++ b/third_party/WebKit/Source/devtools/front_end/bindings/ResourceScriptMapping.js
@@ -186,7 +186,19 @@ /** * @param {!WebInspector.UISourceCode} uiSourceCode */ - _updateLocations: function(uiSourceCode) + _hasMergedToVM: function(uiSourceCode) + { + var scripts = this._scriptsForUISourceCode(uiSourceCode); + if (!scripts.length) + return; + for (var i = 0; i < scripts.length; ++i) + this._debuggerWorkspaceBinding.updateLocations(scripts[i]); + }, + + /** + * @param {!WebInspector.UISourceCode} uiSourceCode + */ + _hasDivergedFromVM: function(uiSourceCode) { var scripts = this._scriptsForUISourceCode(uiSourceCode); if (!scripts.length) @@ -383,7 +395,7 @@ _divergeFromVM: function() { this._isDivergingFromVM = true; - this._resourceScriptMapping._updateLocations(this._uiSourceCode); + this._resourceScriptMapping._hasDivergedFromVM(this._uiSourceCode); delete this._isDivergingFromVM; this._hasDivergedFromVM = true; this.dispatchEventToListeners(WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._uiSourceCode); @@ -393,7 +405,7 @@ { delete this._hasDivergedFromVM; this._isMergingToVM = true; - this._resourceScriptMapping._updateLocations(this._uiSourceCode); + this._resourceScriptMapping._hasMergedToVM(this._uiSourceCode); delete this._isMergingToVM; this.dispatchEventToListeners(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._uiSourceCode); },
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js index 8b739340..c53cd03 100644 --- a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js +++ b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
@@ -251,8 +251,9 @@ onTextChanged: function(oldRange, newRange) { - this._scriptsPanel.updateLastModificationTime(); + this._scriptsPanel.setIgnoreExecutionLineEvents(true); WebInspector.UISourceCodeFrame.prototype.onTextChanged.call(this, oldRange, newRange); + this._scriptsPanel.setIgnoreExecutionLineEvents(false); if (this._compiler) this._compiler.scheduleCompile(); }, @@ -355,16 +356,20 @@ _workingCopyCommitted: function(event) { - this._scriptsPanel.updateLastModificationTime(); if (this._supportsEnabledBreakpointsWhileEditing()) return; - if (!this._scriptFileForTarget.size) + if (!this._scriptFileForTarget.size) { this._restoreBreakpointsAfterEditing(); + return; + } + + this._scriptsPanel.setIgnoreExecutionLineEvents(true); }, _didMergeToVM: function() { + this._scriptsPanel.setIgnoreExecutionLineEvents(false); if (this._supportsEnabledBreakpointsWhileEditing()) return; this._updateDivergedInfobar(); @@ -373,6 +378,7 @@ _didDivergeFromVM: function() { + this._scriptsPanel.setIgnoreExecutionLineEvents(false); if (this._supportsEnabledBreakpointsWhileEditing()) return; this._updateDivergedInfobar();
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js b/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js index 78f69ff..ff75130c 100644 --- a/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js +++ b/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js
@@ -117,8 +117,6 @@ WebInspector.DataSaverInfobar.maybeShowInPanel(this); } -WebInspector.SourcesPanel._lastModificationTimeout = 200; - WebInspector.SourcesPanel.minToolbarWidth = 215; WebInspector.SourcesPanel.prototype = { @@ -382,11 +380,6 @@ this._ignoreExecutionLineEvents = ignoreExecutionLineEvents; }, - updateLastModificationTime: function() - { - this._lastModificationTime = window.performance.now(); - }, - /** * @param {!WebInspector.UILocation} uiLocation */ @@ -394,16 +387,11 @@ { this._sourcesView.clearCurrentExecutionLine(); this._sourcesView.setExecutionLocation(uiLocation); - if (window.performance.now() - this._lastModificationTime < WebInspector.SourcesPanel._lastModificationTimeout) + if (this._ignoreExecutionLineEvents) return; this._sourcesView.showSourceLocation(uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber, undefined, true); }, - _lastModificationTimeoutPassedForTest: function() - { - this._lastModificationTime = 0; - }, - /** * @param {!WebInspector.Event} event */
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp index 95924e7f5..9949e742 100644 --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp
@@ -28,7 +28,7 @@ NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, servicesMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, servicesMap, []() { // https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx NameToAssignedNumberMap* services = new NameToAssignedNumberMap(); services->add("alert_notification", 0x1811); @@ -71,7 +71,7 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, characteristicsMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, characteristicsMap, []() { // https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicsHome.aspx NameToAssignedNumberMap* characteristics = new NameToAssignedNumberMap(); characteristics->add("aerobic_heart_rate_lower_limit", 0x2A7E); @@ -243,7 +243,7 @@ NameToAssignedNumberMap* getAssignedNumberForDescriptorNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, descriptorsMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, descriptorsMap, []() { // https://developer.bluetooth.org/gatt/descriptors/Pages/DescriptorsHomePage.aspx NameToAssignedNumberMap* descriptors = new NameToAssignedNumberMap(); descriptors->add("gatt.characteristic_extended_properties", 0x2900);
diff --git a/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp b/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp index e5a4230..0935f858 100644 --- a/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp +++ b/third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp
@@ -416,8 +416,7 @@ RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin); // Cache Storage API is restricted to trustworthy origins. - String ignoredMessage; - if (!secOrigin->isPotentiallyTrustworthy(ignoredMessage)) { + if (!secOrigin->isPotentiallyTrustworthy()) { // Don't treat this as an error, just don't attempt to open and enumerate the caches. callback->sendSuccess(Array<TypeBuilder::CacheStorage::Cache>::create()); return;
diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp index 13c8852e..89cd73cc 100644 --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
@@ -30,7 +30,7 @@ public: static CompositorWorkerSharedState& instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(CompositorWorkerSharedState, compositorWorkerSharedState, (new CompositorWorkerSharedState())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(CompositorWorkerSharedState, compositorWorkerSharedState, (new CompositorWorkerSharedState())); return compositorWorkerSharedState; }
diff --git a/third_party/WebKit/Source/modules/webdatabase/Database.cpp b/third_party/WebKit/Source/modules/webdatabase/Database.cpp index ac3f475..e2139e5f 100644 --- a/third_party/WebKit/Source/modules/webdatabase/Database.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
@@ -149,7 +149,7 @@ // FIXME: move all guid-related functions to a DatabaseVersionTracker class. static RecursiveMutex& guidMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, mutex, new RecursiveMutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, mutex, new RecursiveMutex); return mutex; }
diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp index 53304ea..856fea4 100644 --- a/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp
@@ -60,7 +60,7 @@ DatabaseTracker& DatabaseTracker::tracker() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(DatabaseTracker, tracker, new DatabaseTracker); + DEFINE_THREAD_SAFE_STATIC_LOCAL(DatabaseTracker, tracker, new DatabaseTracker); return tracker; }
diff --git a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp index 490484e..548dbe4 100644 --- a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp
@@ -39,7 +39,7 @@ QuotaTracker& QuotaTracker::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(QuotaTracker, tracker, new QuotaTracker); + DEFINE_THREAD_SAFE_STATIC_LOCAL(QuotaTracker, tracker, new QuotaTracker); return tracker; }
diff --git a/third_party/WebKit/Source/platform/Clock.cpp b/third_party/WebKit/Source/platform/Clock.cpp index 20cc25ac..b3aa47a 100644 --- a/third_party/WebKit/Source/platform/Clock.cpp +++ b/third_party/WebKit/Source/platform/Clock.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Clock.h" #include "wtf/CurrentTime.h"
diff --git a/third_party/WebKit/Source/platform/ClockTest.cpp b/third_party/WebKit/Source/platform/ClockTest.cpp index 5ce8597..66e7d363 100644 --- a/third_party/WebKit/Source/platform/ClockTest.cpp +++ b/third_party/WebKit/Source/platform/ClockTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Clock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp b/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp index 4cab115..4f0a8b4e 100644 --- a/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp +++ b/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/ContentSettingCallbacks.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/ContentType.cpp b/third_party/WebKit/Source/platform/ContentType.cpp index e21536d..bba5911 100644 --- a/third_party/WebKit/Source/platform/ContentType.cpp +++ b/third_party/WebKit/Source/platform/ContentType.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/ContentType.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/ContextMenu.cpp b/third_party/WebKit/Source/platform/ContextMenu.cpp index 175d7ab..a9c3876 100644 --- a/third_party/WebKit/Source/platform/ContextMenu.cpp +++ b/third_party/WebKit/Source/platform/ContextMenu.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/ContextMenu.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/ContextMenuItem.cpp b/third_party/WebKit/Source/platform/ContextMenuItem.cpp index 8d3a1b1..a76c7fa 100644 --- a/third_party/WebKit/Source/platform/ContextMenuItem.cpp +++ b/third_party/WebKit/Source/platform/ContextMenuItem.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/ContextMenuItem.h" #include "platform/ContextMenu.h"
diff --git a/third_party/WebKit/Source/platform/CrossThreadCopier.cpp b/third_party/WebKit/Source/platform/CrossThreadCopier.cpp index da8d871c..367c124 100644 --- a/third_party/WebKit/Source/platform/CrossThreadCopier.cpp +++ b/third_party/WebKit/Source/platform/CrossThreadCopier.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/CrossThreadCopier.h" #include "platform/network/ResourceError.h"
diff --git a/third_party/WebKit/Source/platform/Crypto.cpp b/third_party/WebKit/Source/platform/Crypto.cpp index ef49ad8..00cdd51 100644 --- a/third_party/WebKit/Source/platform/Crypto.cpp +++ b/third_party/WebKit/Source/platform/Crypto.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/Crypto.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/Cursor.cpp b/third_party/WebKit/Source/platform/Cursor.cpp index 58d48bd..f1ed926 100644 --- a/third_party/WebKit/Source/platform/Cursor.cpp +++ b/third_party/WebKit/Source/platform/Cursor.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Cursor.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/DateComponents.cpp b/third_party/WebKit/Source/platform/DateComponents.cpp index 6b67e1d..9fdf1e3 100644 --- a/third_party/WebKit/Source/platform/DateComponents.cpp +++ b/third_party/WebKit/Source/platform/DateComponents.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/DateComponents.h" #include <limits.h>
diff --git a/third_party/WebKit/Source/platform/Decimal.cpp b/third_party/WebKit/Source/platform/Decimal.cpp index c50bd1b2..283f087 100644 --- a/third_party/WebKit/Source/platform/Decimal.cpp +++ b/third_party/WebKit/Source/platform/Decimal.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Decimal.h" #include "wtf/Allocator.h"
diff --git a/third_party/WebKit/Source/platform/DecimalTest.cpp b/third_party/WebKit/Source/platform/DecimalTest.cpp index aa06a36..4bc4c8b 100644 --- a/third_party/WebKit/Source/platform/DecimalTest.cpp +++ b/third_party/WebKit/Source/platform/DecimalTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Decimal.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/DragImage.cpp b/third_party/WebKit/Source/platform/DragImage.cpp index f628c2d..bb2049e 100644 --- a/third_party/WebKit/Source/platform/DragImage.cpp +++ b/third_party/WebKit/Source/platform/DragImage.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/DragImage.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/DragImageTest.cpp b/third_party/WebKit/Source/platform/DragImageTest.cpp index 6833fa2f..3257c25e 100644 --- a/third_party/WebKit/Source/platform/DragImageTest.cpp +++ b/third_party/WebKit/Source/platform/DragImageTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/DragImage.h" #include "platform/fonts/FontDescription.h"
diff --git a/third_party/WebKit/Source/platform/EventDispatchForbiddenScope.cpp b/third_party/WebKit/Source/platform/EventDispatchForbiddenScope.cpp index b899c27..dd60cc5 100644 --- a/third_party/WebKit/Source/platform/EventDispatchForbiddenScope.cpp +++ b/third_party/WebKit/Source/platform/EventDispatchForbiddenScope.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/EventDispatchForbiddenScope.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/EventTracer.cpp b/third_party/WebKit/Source/platform/EventTracer.cpp index e4a7a350..39376f6 100644 --- a/third_party/WebKit/Source/platform/EventTracer.cpp +++ b/third_party/WebKit/Source/platform/EventTracer.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/EventTracer.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/FileChooser.cpp b/third_party/WebKit/Source/platform/FileChooser.cpp index c0078b1..7a9a034 100644 --- a/third_party/WebKit/Source/platform/FileChooser.cpp +++ b/third_party/WebKit/Source/platform/FileChooser.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/FileChooser.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/FileMetadata.cpp b/third_party/WebKit/Source/platform/FileMetadata.cpp index a9674d61..d4e79220 100644 --- a/third_party/WebKit/Source/platform/FileMetadata.cpp +++ b/third_party/WebKit/Source/platform/FileMetadata.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/FileMetadata.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/JSONValues.cpp b/third_party/WebKit/Source/platform/JSONValues.cpp index 72a5af5a..76ec444c 100644 --- a/third_party/WebKit/Source/platform/JSONValues.cpp +++ b/third_party/WebKit/Source/platform/JSONValues.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/JSONValues.h" #include "platform/Decimal.h"
diff --git a/third_party/WebKit/Source/platform/KillRingNone.cpp b/third_party/WebKit/Source/platform/KillRingNone.cpp index 3fdbae3..12d6fe0 100644 --- a/third_party/WebKit/Source/platform/KillRingNone.cpp +++ b/third_party/WebKit/Source/platform/KillRingNone.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/KillRing.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/Language.cpp b/third_party/WebKit/Source/platform/Language.cpp index 96264d05..1c67370 100644 --- a/third_party/WebKit/Source/platform/Language.cpp +++ b/third_party/WebKit/Source/platform/Language.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Language.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/LayoutTestSupport.cpp b/third_party/WebKit/Source/platform/LayoutTestSupport.cpp index 07e14e8..0565811 100644 --- a/third_party/WebKit/Source/platform/LayoutTestSupport.cpp +++ b/third_party/WebKit/Source/platform/LayoutTestSupport.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/LayoutTestSupport.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/LayoutUnitTest.cpp b/third_party/WebKit/Source/platform/LayoutUnitTest.cpp index 4e471bf..61818cb 100644 --- a/third_party/WebKit/Source/platform/LayoutUnitTest.cpp +++ b/third_party/WebKit/Source/platform/LayoutUnitTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/LayoutUnit.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/Length.cpp b/third_party/WebKit/Source/platform/Length.cpp index 10fd377c..b9d8b029 100644 --- a/third_party/WebKit/Source/platform/Length.cpp +++ b/third_party/WebKit/Source/platform/Length.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "platform/Length.h" #include "platform/CalculationValue.h"
diff --git a/third_party/WebKit/Source/platform/LengthBox.cpp b/third_party/WebKit/Source/platform/LengthBox.cpp index 036c2c8..c19fba1 100644 --- a/third_party/WebKit/Source/platform/LengthBox.cpp +++ b/third_party/WebKit/Source/platform/LengthBox.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/LengthBox.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/LengthFunctions.cpp b/third_party/WebKit/Source/platform/LengthFunctions.cpp index 7b19efef..483e322 100644 --- a/third_party/WebKit/Source/platform/LengthFunctions.cpp +++ b/third_party/WebKit/Source/platform/LengthFunctions.cpp
@@ -21,7 +21,6 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/LengthFunctions.h" #include "platform/LayoutUnit.h"
diff --git a/third_party/WebKit/Source/platform/LifecycleContextTest.cpp b/third_party/WebKit/Source/platform/LifecycleContextTest.cpp index 0b0ce39..f89f0f50 100644 --- a/third_party/WebKit/Source/platform/LifecycleContextTest.cpp +++ b/third_party/WebKit/Source/platform/LifecycleContextTest.cpp
@@ -24,8 +24,6 @@ * */ -#include "config.h" - #include "platform/LifecycleNotifier.h" #include "platform/LifecycleObserver.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/platform/LinkHash.cpp b/third_party/WebKit/Source/platform/LinkHash.cpp index 7ea8058..ab677d42 100644 --- a/third_party/WebKit/Source/platform/LinkHash.cpp +++ b/third_party/WebKit/Source/platform/LinkHash.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/LinkHash.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/Logging.cpp b/third_party/WebKit/Source/platform/Logging.cpp index ac945fd4..899efd2 100644 --- a/third_party/WebKit/Source/platform/Logging.cpp +++ b/third_party/WebKit/Source/platform/Logging.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Logging.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/platform/MIMETypeFromURL.cpp b/third_party/WebKit/Source/platform/MIMETypeFromURL.cpp index bcd8265..d1376d9e 100644 --- a/third_party/WebKit/Source/platform/MIMETypeFromURL.cpp +++ b/third_party/WebKit/Source/platform/MIMETypeFromURL.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/MIMETypeFromURL.h" #include "platform/MIMETypeRegistry.h"
diff --git a/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp b/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp index 8887aed..e1d002ef 100644 --- a/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp +++ b/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/MIMETypeRegistry.h" #include "platform/plugins/PluginData.h"
diff --git a/third_party/WebKit/Source/platform/MemoryPurgeController.cpp b/third_party/WebKit/Source/platform/MemoryPurgeController.cpp index 3860e7e7..b75255b5 100644 --- a/third_party/WebKit/Source/platform/MemoryPurgeController.cpp +++ b/third_party/WebKit/Source/platform/MemoryPurgeController.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/MemoryPurgeController.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/NotImplemented.cpp b/third_party/WebKit/Source/platform/NotImplemented.cpp index 3a8f4fd..1d1da7e1 100644 --- a/third_party/WebKit/Source/platform/NotImplemented.cpp +++ b/third_party/WebKit/Source/platform/NotImplemented.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/NotImplemented.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/PODArenaTest.cpp b/third_party/WebKit/Source/platform/PODArenaTest.cpp index 101b4ae..562ae755 100644 --- a/third_party/WebKit/Source/platform/PODArenaTest.cpp +++ b/third_party/WebKit/Source/platform/PODArenaTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PODArena.h" #include "platform/testing/ArenaTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/PODFreeListArenaTest.cpp b/third_party/WebKit/Source/platform/PODFreeListArenaTest.cpp index b37808b..5624d045 100644 --- a/third_party/WebKit/Source/platform/PODFreeListArenaTest.cpp +++ b/third_party/WebKit/Source/platform/PODFreeListArenaTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PODFreeListArena.h" #include "platform/testing/ArenaTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp b/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp index 1efd6152..cc9b662 100644 --- a/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp +++ b/third_party/WebKit/Source/platform/PODIntervalTreeTest.cpp
@@ -25,7 +25,6 @@ // Tests for the interval tree class. -#include "config.h" #include "platform/PODIntervalTree.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/PODRedBlackTreeTest.cpp b/third_party/WebKit/Source/platform/PODRedBlackTreeTest.cpp index a812c2f..18abaf5 100644 --- a/third_party/WebKit/Source/platform/PODRedBlackTreeTest.cpp +++ b/third_party/WebKit/Source/platform/PODRedBlackTreeTest.cpp
@@ -25,7 +25,6 @@ // Tests for the red-black tree class. -#include "config.h" #include "platform/PODRedBlackTree.h" #include "platform/testing/ArenaTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/PartitionAllocMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/PartitionAllocMemoryDumpProvider.cpp index 33f0ec71..fec85c0 100644 --- a/third_party/WebKit/Source/platform/PartitionAllocMemoryDumpProvider.cpp +++ b/third_party/WebKit/Source/platform/PartitionAllocMemoryDumpProvider.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/PartitionAllocMemoryDumpProvider.h" #include "public/platform/WebMemoryAllocatorDump.h"
diff --git a/third_party/WebKit/Source/platform/PlatformInstrumentation.cpp b/third_party/WebKit/Source/platform/PlatformInstrumentation.cpp index 7a3062b..2936fc891 100644 --- a/third_party/WebKit/Source/platform/PlatformInstrumentation.cpp +++ b/third_party/WebKit/Source/platform/PlatformInstrumentation.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/PlatformInstrumentation.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp b/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp index 3a1fb22..a895fb7 100644 --- a/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp +++ b/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PlatformKeyboardEvent.h" #if OS(WIN)
diff --git a/third_party/WebKit/Source/platform/PlatformResourceLoader.cpp b/third_party/WebKit/Source/platform/PlatformResourceLoader.cpp index 13b21aa6..987bd152 100644 --- a/third_party/WebKit/Source/platform/PlatformResourceLoader.cpp +++ b/third_party/WebKit/Source/platform/PlatformResourceLoader.cpp
@@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" -#include "PlatformResourceLoader.h" +#include "platform/PlatformResourceLoader.h" #include "public/platform/Platform.h" #include "public/platform/WebData.h"
diff --git a/third_party/WebKit/Source/platform/PluginScriptForbiddenScope.cpp b/third_party/WebKit/Source/platform/PluginScriptForbiddenScope.cpp index 64c1271c..dcb01cad 100644 --- a/third_party/WebKit/Source/platform/PluginScriptForbiddenScope.cpp +++ b/third_party/WebKit/Source/platform/PluginScriptForbiddenScope.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/PluginScriptForbiddenScope.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/Prerender.cpp b/third_party/WebKit/Source/platform/Prerender.cpp index 76e56ab..203d6203 100644 --- a/third_party/WebKit/Source/platform/Prerender.cpp +++ b/third_party/WebKit/Source/platform/Prerender.cpp
@@ -29,7 +29,6 @@ * */ -#include "config.h" #include "platform/Prerender.h" #include "platform/PrerenderClient.h"
diff --git a/third_party/WebKit/Source/platform/PurgeableVector.cpp b/third_party/WebKit/Source/platform/PurgeableVector.cpp index 3e791fd..346706d0 100644 --- a/third_party/WebKit/Source/platform/PurgeableVector.cpp +++ b/third_party/WebKit/Source/platform/PurgeableVector.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PurgeableVector.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/PurgeableVectorTest.cpp b/third_party/WebKit/Source/platform/PurgeableVectorTest.cpp index 474cb70..f2fbcd8 100644 --- a/third_party/WebKit/Source/platform/PurgeableVectorTest.cpp +++ b/third_party/WebKit/Source/platform/PurgeableVectorTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PurgeableVector.h" #include "platform/testing/TestingPlatformSupport.h"
diff --git a/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp b/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp index c365918..7c51038 100644 --- a/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp +++ b/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/ScriptForbiddenScope.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/SecureTextInput.cpp b/third_party/WebKit/Source/platform/SecureTextInput.cpp index bf97c348..5452815 100644 --- a/third_party/WebKit/Source/platform/SecureTextInput.cpp +++ b/third_party/WebKit/Source/platform/SecureTextInput.cpp
@@ -23,11 +23,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if OS(MACOSX) #include "platform/SecureTextInput.h" +#if OS(MACOSX) #import <Carbon/Carbon.h> namespace blink {
diff --git a/third_party/WebKit/Source/platform/SecureTextInput.h b/third_party/WebKit/Source/platform/SecureTextInput.h index e5c564c..f5d5127a 100644 --- a/third_party/WebKit/Source/platform/SecureTextInput.h +++ b/third_party/WebKit/Source/platform/SecureTextInput.h
@@ -32,6 +32,7 @@ #define SecureTextInput_h #include "platform/PlatformExport.h" +#include "wtf/build_config.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/SharedBuffer.cpp b/third_party/WebKit/Source/platform/SharedBuffer.cpp index 7fadd57..c043163 100644 --- a/third_party/WebKit/Source/platform/SharedBuffer.cpp +++ b/third_party/WebKit/Source/platform/SharedBuffer.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/SharedBuffer.h" #include "public/platform/WebProcessMemoryDump.h"
diff --git a/third_party/WebKit/Source/platform/SharedBufferChunkReader.cpp b/third_party/WebKit/Source/platform/SharedBufferChunkReader.cpp index bf480ee..6b22722 100644 --- a/third_party/WebKit/Source/platform/SharedBufferChunkReader.cpp +++ b/third_party/WebKit/Source/platform/SharedBufferChunkReader.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/SharedBufferChunkReader.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/SharedBufferTest.cpp b/third_party/WebKit/Source/platform/SharedBufferTest.cpp index fe3d239f..0f2218a 100644 --- a/third_party/WebKit/Source/platform/SharedBufferTest.cpp +++ b/third_party/WebKit/Source/platform/SharedBufferTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/SharedBuffer.h" #include "platform/testing/TestingPlatformSupport.h"
diff --git a/third_party/WebKit/Source/platform/Supplementable.cpp b/third_party/WebKit/Source/platform/Supplementable.cpp index 19b371a9a..f4d1e74 100644 --- a/third_party/WebKit/Source/platform/Supplementable.cpp +++ b/third_party/WebKit/Source/platform/Supplementable.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/Supplementable.h" -// This Supplementable.cpp, which includes only config.h and +// This Supplementable.cpp, which includes only // Supplementable.h, should be in Source/platform, // because Supplementable is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/TaskSynchronizer.cpp b/third_party/WebKit/Source/platform/TaskSynchronizer.cpp index 075d3b1..3e019dc8 100644 --- a/third_party/WebKit/Source/platform/TaskSynchronizer.cpp +++ b/third_party/WebKit/Source/platform/TaskSynchronizer.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/TaskSynchronizer.h" #include "platform/heap/SafePoint.h"
diff --git a/third_party/WebKit/Source/platform/Theme.cpp b/third_party/WebKit/Source/platform/Theme.cpp index ecbc673..2c37fb0 100644 --- a/third_party/WebKit/Source/platform/Theme.cpp +++ b/third_party/WebKit/Source/platform/Theme.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Theme.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/Timer.cpp b/third_party/WebKit/Source/platform/Timer.cpp index e27520d..481cc31 100644 --- a/third_party/WebKit/Source/platform/Timer.cpp +++ b/third_party/WebKit/Source/platform/Timer.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Timer.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/TimerTest.cpp b/third_party/WebKit/Source/platform/TimerTest.cpp index 9f7bd52..68096b0 100644 --- a/third_party/WebKit/Source/platform/TimerTest.cpp +++ b/third_party/WebKit/Source/platform/TimerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/Timer.h" #include "platform/testing/TestingPlatformSupport.h"
diff --git a/third_party/WebKit/Source/platform/TracedValue.cpp b/third_party/WebKit/Source/platform/TracedValue.cpp index 96e4010..e29a662 100644 --- a/third_party/WebKit/Source/platform/TracedValue.cpp +++ b/third_party/WebKit/Source/platform/TracedValue.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "platform/TracedValue.h" #include "platform/Decimal.h"
diff --git a/third_party/WebKit/Source/platform/TracedValueTest.cpp b/third_party/WebKit/Source/platform/TracedValueTest.cpp index 7341833..502aa552 100644 --- a/third_party/WebKit/Source/platform/TracedValueTest.cpp +++ b/third_party/WebKit/Source/platform/TracedValueTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/TracedValue.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/UUID.cpp b/third_party/WebKit/Source/platform/UUID.cpp index e61be956..13780b56 100644 --- a/third_party/WebKit/Source/platform/UUID.cpp +++ b/third_party/WebKit/Source/platform/UUID.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/UUID.h" #include "wtf/CryptographicallyRandomNumber.h"
diff --git a/third_party/WebKit/Source/platform/UUIDTest.cpp b/third_party/WebKit/Source/platform/UUIDTest.cpp index 6d1870e..ac0f2b4 100644 --- a/third_party/WebKit/Source/platform/UUIDTest.cpp +++ b/third_party/WebKit/Source/platform/UUIDTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/UUID.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/UserGestureIndicator.cpp b/third_party/WebKit/Source/platform/UserGestureIndicator.cpp index fdae6686..aad6fab 100644 --- a/third_party/WebKit/Source/platform/UserGestureIndicator.cpp +++ b/third_party/WebKit/Source/platform/UserGestureIndicator.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/UserGestureIndicator.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/WebScheduler.cpp b/third_party/WebKit/Source/platform/WebScheduler.cpp index 7f610db..d5bbb464 100644 --- a/third_party/WebKit/Source/platform/WebScheduler.cpp +++ b/third_party/WebKit/Source/platform/WebScheduler.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebScheduler.h" #include "platform/Task.h"
diff --git a/third_party/WebKit/Source/platform/WebScreenInfoTest.cpp b/third_party/WebKit/Source/platform/WebScreenInfoTest.cpp index e3869fb..5f3606aa 100644 --- a/third_party/WebKit/Source/platform/WebScreenInfoTest.cpp +++ b/third_party/WebKit/Source/platform/WebScreenInfoTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebScreenInfo.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/WebTaskRunner.cpp b/third_party/WebKit/Source/platform/WebTaskRunner.cpp index ebdd79b..e44dc1c 100644 --- a/third_party/WebKit/Source/platform/WebTaskRunner.cpp +++ b/third_party/WebKit/Source/platform/WebTaskRunner.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebTaskRunner.h" #include "platform/Task.h"
diff --git a/third_party/WebKit/Source/platform/WebThread.cpp b/third_party/WebKit/Source/platform/WebThread.cpp index 4185f53f..a098f31 100644 --- a/third_party/WebKit/Source/platform/WebThread.cpp +++ b/third_party/WebKit/Source/platform/WebThread.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebThread.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp b/third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp index d622a6e..070b2cf 100644 --- a/third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp +++ b/third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/WebThreadSupportingGC.h" #include "platform/heap/SafePoint.h"
diff --git a/third_party/WebKit/Source/platform/WebVectorTest.cpp b/third_party/WebKit/Source/platform/WebVectorTest.cpp index 0282159f..b3e4a54 100644 --- a/third_party/WebKit/Source/platform/WebVectorTest.cpp +++ b/third_party/WebKit/Source/platform/WebVectorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebVector.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/Widget.cpp b/third_party/WebKit/Source/platform/Widget.cpp index b2f9160f..ecbe933d 100644 --- a/third_party/WebKit/Source/platform/Widget.cpp +++ b/third_party/WebKit/Source/platform/Widget.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/Widget.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/animation/CubicBezierControlPoints.cpp b/third_party/WebKit/Source/platform/animation/CubicBezierControlPoints.cpp index af0012ed..05cdeb0 100644 --- a/third_party/WebKit/Source/platform/animation/CubicBezierControlPoints.cpp +++ b/third_party/WebKit/Source/platform/animation/CubicBezierControlPoints.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/animation/CubicBezierControlPoints.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/animation/TimingFunction.cpp b/third_party/WebKit/Source/platform/animation/TimingFunction.cpp index 6a47560..470569ec 100644 --- a/third_party/WebKit/Source/platform/animation/TimingFunction.cpp +++ b/third_party/WebKit/Source/platform/animation/TimingFunction.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/animation/TimingFunction.h" #include "platform/animation/CubicBezierControlPoints.h"
diff --git a/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp b/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp index 41e0b4d7..b2ad85c 100644 --- a/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp +++ b/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/animation/TimingFunction.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/WebKit/Source/platform/animation/UnitBezierTest.cpp b/third_party/WebKit/Source/platform/animation/UnitBezierTest.cpp index 88185d4f..87c7899 100644 --- a/third_party/WebKit/Source/platform/animation/UnitBezierTest.cpp +++ b/third_party/WebKit/Source/platform/animation/UnitBezierTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/animation/UnitBezier.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/audio/AudioBus.cpp b/third_party/WebKit/Source/platform/audio/AudioBus.cpp index e57367f5..ef3c266 100644 --- a/third_party/WebKit/Source/platform/audio/AudioBus.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioBus.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioBus.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioFileReader.h" #include "platform/audio/DenormalDisabler.h" #include "platform/audio/SincResampler.h" @@ -39,7 +38,6 @@ #include "public/platform/Platform.h" #include "public/platform/WebAudioBus.h" #include "wtf/OwnPtr.h" - #include <assert.h> #include <math.h> #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/audio/AudioChannel.cpp b/third_party/WebKit/Source/platform/audio/AudioChannel.cpp index 2dd225e..e95c6d58 100644 --- a/third_party/WebKit/Source/platform/audio/AudioChannel.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioChannel.cpp
@@ -26,16 +26,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioChannel.h" -#include <math.h> -#include <algorithm> +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/VectorMath.h" #include "wtf/OwnPtr.h" +#include <algorithm> +#include <math.h> namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp index 719c44b..32e25e56 100644 --- a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/audio/AudioDSPKernel.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp index dfc3297a..d77c397 100644 --- a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp
@@ -28,12 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioDSPKernelProcessor.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioDSPKernel.h" #include "wtf/MainThread.h"
diff --git a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp index 861ac9b..64a42a35 100644 --- a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioDelayDSPKernel.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioUtilities.h" #include "wtf/MathExtras.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/audio/AudioDestination.cpp b/third_party/WebKit/Source/platform/audio/AudioDestination.cpp index 0575c76..61c45add4 100644 --- a/third_party/WebKit/Source/platform/audio/AudioDestination.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioDestination.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioDestination.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioFIFO.h" #include "platform/audio/AudioPullFIFO.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp b/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp index b7bf754..5ed7e93 100644 --- a/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp
@@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/AudioFIFO.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) -#include "platform/audio/AudioFIFO.h" - namespace blink { AudioFIFO::AudioFIFO(unsigned numberOfChannels, size_t fifoLength)
diff --git a/third_party/WebKit/Source/platform/audio/AudioProcessor.cpp b/third_party/WebKit/Source/platform/audio/AudioProcessor.cpp index a8fb1b5..30b46c3 100644 --- a/third_party/WebKit/Source/platform/audio/AudioProcessor.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioProcessor.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/audio/AudioProcessor.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp index c7a8887..a3570dc 100644 --- a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp
@@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/AudioPullFIFO.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) -#include "platform/audio/AudioPullFIFO.h" - namespace blink { AudioPullFIFO::AudioPullFIFO(AudioSourceProvider& audioProvider, unsigned numberOfChannels, size_t fifoLength, size_t providerSize)
diff --git a/third_party/WebKit/Source/platform/audio/AudioResampler.cpp b/third_party/WebKit/Source/platform/audio/AudioResampler.cpp index 78a9bbfb..f02a7097 100644 --- a/third_party/WebKit/Source/platform/audio/AudioResampler.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioResampler.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioResampler.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <algorithm> #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp index 45d9b26..740179d 100644 --- a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioResamplerKernel.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <algorithm> #include "platform/audio/AudioResampler.h"
diff --git a/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp b/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp index 18eee8d..091dfa5 100644 --- a/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp +++ b/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/AudioUtilities.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "wtf/Assertions.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/Biquad.cpp b/third_party/WebKit/Source/platform/audio/Biquad.cpp index ae19ebc..c9a9a712 100644 --- a/third_party/WebKit/Source/platform/audio/Biquad.cpp +++ b/third_party/WebKit/Source/platform/audio/Biquad.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/Biquad.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <stdio.h> #include <algorithm> #include "platform/audio/DenormalDisabler.h"
diff --git a/third_party/WebKit/Source/platform/audio/Cone.cpp b/third_party/WebKit/Source/platform/audio/Cone.cpp index 1d8bd5c..3288f75 100644 --- a/third_party/WebKit/Source/platform/audio/Cone.cpp +++ b/third_party/WebKit/Source/platform/audio/Cone.cpp
@@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/Cone.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) - -#include "platform/audio/Cone.h" #include "wtf/MathExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp b/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp index f50e68f..492f838 100644 --- a/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp +++ b/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/DirectConvolver.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #if OS(MACOSX) #include <Accelerate/Accelerate.h> #endif
diff --git a/third_party/WebKit/Source/platform/audio/Distance.cpp b/third_party/WebKit/Source/platform/audio/Distance.cpp index 919371d..2b393d9 100644 --- a/third_party/WebKit/Source/platform/audio/Distance.cpp +++ b/third_party/WebKit/Source/platform/audio/Distance.cpp
@@ -26,13 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/Distance.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) - -#include "platform/audio/Distance.h" #include "wtf/Assertions.h" - #include <math.h> #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/audio/DownSampler.cpp b/third_party/WebKit/Source/platform/audio/DownSampler.cpp index 6c20074..aa5d2232 100644 --- a/third_party/WebKit/Source/platform/audio/DownSampler.cpp +++ b/third_party/WebKit/Source/platform/audio/DownSampler.cpp
@@ -28,12 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/DownSampler.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "wtf/MathExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp index f7c34ac..bc50e94 100644 --- a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp +++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/DynamicsCompressor.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" #include "platform/audio/AudioUtilities.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp index 1b03ca5..9ead9b5e 100644 --- a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp +++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/DynamicsCompressorKernel.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <algorithm> #include "platform/audio/AudioUtilities.h" #include "platform/audio/DenormalDisabler.h"
diff --git a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp index 707fe28..dc19257 100644 --- a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp +++ b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/EqualPowerPanner.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <algorithm> #include "platform/audio/AudioBus.h" #include "platform/audio/AudioUtilities.h"
diff --git a/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp b/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp index bdd3c3fe..0f1742d78 100644 --- a/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp +++ b/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/FFTConvolver.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/VectorMath.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/FFTFrame.cpp b/third_party/WebKit/Source/platform/audio/FFTFrame.cpp index e3890aa..438e7c7 100644 --- a/third_party/WebKit/Source/platform/audio/FFTFrame.cpp +++ b/third_party/WebKit/Source/platform/audio/FFTFrame.cpp
@@ -26,17 +26,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/FFTFrame.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/VectorMath.h" #include "platform/Logging.h" #include "wtf/MathExtras.h" #include "wtf/OwnPtr.h" - #include <complex> #ifndef NDEBUG
diff --git a/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp b/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp index 8738a905..352a564 100644 --- a/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp +++ b/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp
@@ -25,7 +25,7 @@ // FFTFrame stub implementation to avoid link errors during bringup -#include "config.h" +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp b/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp index 1815742..fcd5684 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp
@@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/HRTFDatabase.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) -#include "platform/audio/HRTFDatabase.h" - namespace blink { const int HRTFDatabase::MinElevation = -45;
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp index c172ac3..097f974 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/HRTFDatabaseLoader.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/Task.h" #include "platform/TaskSynchronizer.h" #include "platform/ThreadSafeFunctional.h"
diff --git a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp index 3e07bc2..13b1d31e 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/HRTFElevation.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <math.h> #include <algorithm> #include "platform/audio/AudioBus.h" @@ -71,8 +70,8 @@ static PassRefPtr<AudioBus> getConcatenatedImpulseResponsesForSubject(const String& subjectName) { typedef HashMap<String, RefPtr<AudioBus>> AudioBusMap; - DEFINE_STATIC_LOCAL_THREAD_SAFE(AudioBusMap, audioBusMap, new AudioBusMap()); - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AudioBusMap, audioBusMap, new AudioBusMap()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex()); MutexLocker locker(mutex); RefPtr<AudioBus> bus;
diff --git a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp index 23d1754..0f7ae04 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/HRTFKernel.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioChannel.h" #include "platform/FloatConversion.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp b/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp index 062235ff..068346a7 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp
@@ -22,12 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/HRTFPanner.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <algorithm> #include "platform/audio/AudioBus.h" #include "platform/audio/AudioUtilities.h"
diff --git a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp index b87ac12..ddfedb6 100644 --- a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp +++ b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/MultiChannelResampler.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/Panner.cpp b/third_party/WebKit/Source/platform/audio/Panner.cpp index 6db3f45d..c7ac32b 100644 --- a/third_party/WebKit/Source/platform/audio/Panner.cpp +++ b/third_party/WebKit/Source/platform/audio/Panner.cpp
@@ -26,10 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(WEB_AUDIO) #include "platform/audio/Panner.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/EqualPowerPanner.h" #include "platform/audio/HRTFPanner.h"
diff --git a/third_party/WebKit/Source/platform/audio/Reverb.cpp b/third_party/WebKit/Source/platform/audio/Reverb.cpp index 8f1709f8..215ed2e 100644 --- a/third_party/WebKit/Source/platform/audio/Reverb.cpp +++ b/third_party/WebKit/Source/platform/audio/Reverb.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/Reverb.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include <math.h> #include "platform/audio/AudioBus.h" #include "platform/audio/VectorMath.h"
diff --git a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp index 38ec7e2..1259193 100644 --- a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp +++ b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/ReverbAccumulationBuffer.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/VectorMath.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp b/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp index fbaf09bc..4dc2ccc 100644 --- a/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp +++ b/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/ReverbConvolver.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/Task.h" #include "platform/audio/AudioBus.h" #include "platform/audio/VectorMath.h"
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp index ce3065ec..6d4d9db5 100644 --- a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp +++ b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/ReverbConvolverStage.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/ReverbAccumulationBuffer.h" #include "platform/audio/ReverbConvolver.h" #include "platform/audio/ReverbInputBuffer.h"
diff --git a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp index 095cee3..280f204 100644 --- a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp +++ b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp
@@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/ReverbInputBuffer.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) -#include "platform/audio/ReverbInputBuffer.h" - namespace blink { ReverbInputBuffer::ReverbInputBuffer(size_t length)
diff --git a/third_party/WebKit/Source/platform/audio/SincResampler.cpp b/third_party/WebKit/Source/platform/audio/SincResampler.cpp index 9a1cb63..448102a 100644 --- a/third_party/WebKit/Source/platform/audio/SincResampler.cpp +++ b/third_party/WebKit/Source/platform/audio/SincResampler.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/SincResampler.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" #include "wtf/CPU.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/Spatializer.cpp b/third_party/WebKit/Source/platform/audio/Spatializer.cpp index 025fc72..bce91dc 100644 --- a/third_party/WebKit/Source/platform/audio/Spatializer.cpp +++ b/third_party/WebKit/Source/platform/audio/Spatializer.cpp
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" -#if ENABLE(WEB_AUDIO) #include "platform/audio/Spatializer.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/StereoPanner.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/StereoPanner.cpp b/third_party/WebKit/Source/platform/audio/StereoPanner.cpp index 6fe0c72..a6e8a7eb 100644 --- a/third_party/WebKit/Source/platform/audio/StereoPanner.cpp +++ b/third_party/WebKit/Source/platform/audio/StereoPanner.cpp
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/StereoPanner.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" #include "platform/audio/AudioUtilities.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/audio/UpSampler.cpp b/third_party/WebKit/Source/platform/audio/UpSampler.cpp index 328acd3..9f952168 100644 --- a/third_party/WebKit/Source/platform/audio/UpSampler.cpp +++ b/third_party/WebKit/Source/platform/audio/UpSampler.cpp
@@ -28,12 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/UpSampler.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "wtf/MathExtras.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/VectorMath.cpp b/third_party/WebKit/Source/platform/audio/VectorMath.cpp index 219ed546..035254e 100644 --- a/third_party/WebKit/Source/platform/audio/VectorMath.cpp +++ b/third_party/WebKit/Source/platform/audio/VectorMath.cpp
@@ -22,11 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "platform/audio/VectorMath.h" + +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO) - -#include "platform/audio/VectorMath.h" #include "wtf/Assertions.h" #include "wtf/CPU.h" #include <stdint.h>
diff --git a/third_party/WebKit/Source/platform/audio/ZeroPole.cpp b/third_party/WebKit/Source/platform/audio/ZeroPole.cpp index 0d569fd3..65f4d198 100644 --- a/third_party/WebKit/Source/platform/audio/ZeroPole.cpp +++ b/third_party/WebKit/Source/platform/audio/ZeroPole.cpp
@@ -26,12 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if ENABLE(WEB_AUDIO) - #include "platform/audio/ZeroPole.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/DenormalDisabler.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp b/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp index 0f321de1..6749e04d 100644 --- a/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp +++ b/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp
@@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp b/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp index 8085ec8..9fbf6a7 100644 --- a/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp +++ b/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp
@@ -26,7 +26,7 @@ // FFTFrame implementation using FFmpeg's RDFT algorithm, // suitable for use on Windows and Linux. -#include "config.h" +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp b/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp index 15046d72..fd3191d 100644 --- a/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp +++ b/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp
@@ -27,7 +27,7 @@ // FFTFrame implementation using Intel IPP's DFT algorithm, // suitable for use on Linux. -#include "config.h" +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp b/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp index 6f7c789..744d4b7 100644 --- a/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp +++ b/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp
@@ -28,7 +28,7 @@ // Mac OS X - specific FFTFrame implementation -#include "config.h" +#include "wtf/build_config.h" #if ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/blob/BlobData.cpp b/third_party/WebKit/Source/platform/blob/BlobData.cpp index 97c5f86..d1299db 100644 --- a/third_party/WebKit/Source/platform/blob/BlobData.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/blob/BlobData.h" #include "platform/UUID.h"
diff --git a/third_party/WebKit/Source/platform/blob/BlobDataTest.cpp b/third_party/WebKit/Source/platform/blob/BlobDataTest.cpp index a4a1f48..e7bef25 100644 --- a/third_party/WebKit/Source/platform/blob/BlobDataTest.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobDataTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/blob/BlobData.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp index ea287662..bbce70bb7 100644 --- a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/blob/BlobRegistry.h" #include "platform/ThreadSafeFunctional.h" @@ -68,10 +67,10 @@ static ThreadSpecific<BlobURLOriginMap>& originMap() { // We want to create the BlobOriginCache exactly once because it is shared by all the threads. - DEFINE_STATIC_LOCAL_THREAD_SAFE(BlobOriginCache, cache, new BlobOriginCache); + DEFINE_THREAD_SAFE_STATIC_LOCAL(BlobOriginCache, cache, new BlobOriginCache); (void)cache; // BlobOriginCache's constructor does the interesting work. - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<BlobURLOriginMap>, map, new ThreadSpecific<BlobURLOriginMap>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<BlobURLOriginMap>, map, new ThreadSpecific<BlobURLOriginMap>); return map; }
diff --git a/third_party/WebKit/Source/platform/blob/BlobURL.cpp b/third_party/WebKit/Source/platform/blob/BlobURL.cpp index bd95bc6..b2477de 100644 --- a/third_party/WebKit/Source/platform/blob/BlobURL.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobURL.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/blob/BlobURL.h" #include "platform/UUID.h"
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardMimeTypes.cpp b/third_party/WebKit/Source/platform/clipboard/ClipboardMimeTypes.cpp index 42d3c62f..55a3ed63 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardMimeTypes.cpp +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardMimeTypes.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/clipboard/ClipboardMimeTypes.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.cpp b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.cpp index 67aaba02..db67f96 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.cpp +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/clipboard/ClipboardUtilities.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.h b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.h index 5c6c94e..a05cdcd 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.h +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilities.h
@@ -33,6 +33,7 @@ #include "platform/PlatformExport.h" #include "wtf/Forward.h" +#include "wtf/build_config.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesPosix.cpp b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesPosix.cpp index 07bbabb6..5e1f8c61 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesPosix.cpp +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesPosix.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/clipboard/ClipboardUtilities.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesTest.cpp b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesTest.cpp index 1afa369f0..37700dfb 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesTest.cpp +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/clipboard/ClipboardUtilities.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesWin.cpp b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesWin.cpp index 79ea8b1..6212ab8 100644 --- a/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesWin.cpp +++ b/third_party/WebKit/Source/platform/clipboard/ClipboardUtilitiesWin.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/clipboard/ClipboardUtilities.h" #include "wtf/text/StringBuilder.h"
diff --git a/third_party/WebKit/Source/platform/credentialmanager/PlatformCredential.cpp b/third_party/WebKit/Source/platform/credentialmanager/PlatformCredential.cpp index 3e7bfcb..f7522e5 100644 --- a/third_party/WebKit/Source/platform/credentialmanager/PlatformCredential.cpp +++ b/third_party/WebKit/Source/platform/credentialmanager/PlatformCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/credentialmanager/PlatformCredential.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/credentialmanager/PlatformFederatedCredential.cpp b/third_party/WebKit/Source/platform/credentialmanager/PlatformFederatedCredential.cpp index 16e0fe8..c8930d1 100644 --- a/third_party/WebKit/Source/platform/credentialmanager/PlatformFederatedCredential.cpp +++ b/third_party/WebKit/Source/platform/credentialmanager/PlatformFederatedCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/credentialmanager/PlatformFederatedCredential.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/credentialmanager/PlatformPasswordCredential.cpp b/third_party/WebKit/Source/platform/credentialmanager/PlatformPasswordCredential.cpp index 522d666..aafe12b 100644 --- a/third_party/WebKit/Source/platform/credentialmanager/PlatformPasswordCredential.cpp +++ b/third_party/WebKit/Source/platform/credentialmanager/PlatformPasswordCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/credentialmanager/PlatformPasswordCredential.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/Platform.cpp b/third_party/WebKit/Source/platform/exported/Platform.cpp index eb31fb4..11e17449 100644 --- a/third_party/WebKit/Source/platform/exported/Platform.cpp +++ b/third_party/WebKit/Source/platform/exported/Platform.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/PartitionAllocMemoryDumpProvider.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp index feaf778..50453e7 100644 --- a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp +++ b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/exported/WebActiveGestureAnimation.h" #include "public/platform/WebGestureCurve.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp index 4e55a87..7ba8c471 100644 --- a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp +++ b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp
@@ -22,9 +22,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebAudioBus.h" +#include "wtf/build_config.h" + #if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" #else
diff --git a/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp b/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp index 1556633..f01ab43 100644 --- a/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp +++ b/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebAudioDevice.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebBlobData.cpp b/third_party/WebKit/Source/platform/exported/WebBlobData.cpp index 15acf3e6..e68dee06 100644 --- a/third_party/WebKit/Source/platform/exported/WebBlobData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebBlobData.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebBlobData.h" #include "platform/blob/BlobData.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCString.cpp b/third_party/WebKit/Source/platform/exported/WebCString.cpp index 1d22b03..e136277 100644 --- a/third_party/WebKit/Source/platform/exported/WebCString.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCString.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCString.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCanvasCaptureHandler.cpp b/third_party/WebKit/Source/platform/exported/WebCanvasCaptureHandler.cpp index 936b4777..18da791d 100644 --- a/third_party/WebKit/Source/platform/exported/WebCanvasCaptureHandler.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCanvasCaptureHandler.cpp
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebCanvasCaptureHandler.h" -// This file just includes config.h and WebCanvasCaptureHandler.h, to make sure +// This file just includes WebCanvasCaptureHandler.h, to make sure // MSVC compiler does not fail linking with LNK2019 due to unresolved // constructor/destructor and should be in Source/platform/exported.
diff --git a/third_party/WebKit/Source/platform/exported/WebCommon.cpp b/third_party/WebKit/Source/platform/exported/WebCommon.cpp index b6d4096c..fc5612ae 100644 --- a/third_party/WebKit/Source/platform/exported/WebCommon.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCommon.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCommon.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCompositorAnimationPlayerClient.cpp b/third_party/WebKit/Source/platform/exported/WebCompositorAnimationPlayerClient.cpp index 063e66f0..b7ce0f1 100644 --- a/third_party/WebKit/Source/platform/exported/WebCompositorAnimationPlayerClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCompositorAnimationPlayerClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebCompositorAnimationPlayerClient.h" -// This WebCompositorAnimationPlayerClient.cpp, which includes only config.h +// This WebCompositorAnimationPlayerClient.cpp, which includes only // and WebCompositorAnimationPlayerClient.h, should be in // Source/platform/exported, because WebCompositorAnimationPlayerClient is not // compiled without this cpp.
diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp index 557abf9..f7a5170 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebContentDecryptionModule.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleAccess.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleAccess.cpp index 6140e8f..b054f3b 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleAccess.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleAccess.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebContentDecryptionModuleAccess.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp index 718fb96..9d9704e 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebContentDecryptionModuleResult.h" #include "platform/ContentDecryptionModuleResult.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp index 580c1149..62bad282 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp
@@ -22,8 +22,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebContentDecryptionModuleSession.h" + #include "public/platform/WebString.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp index db051d08..5f2ac67 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "public/platform/WebContentSettingCallbacks.h" #include "platform/ContentSettingCallbacks.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebConvertableToTraceFormat.cpp b/third_party/WebKit/Source/platform/exported/WebConvertableToTraceFormat.cpp index 75818f1..dca9367 100644 --- a/third_party/WebKit/Source/platform/exported/WebConvertableToTraceFormat.cpp +++ b/third_party/WebKit/Source/platform/exported/WebConvertableToTraceFormat.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebConvertableToTraceFormat.h" #include "platform/EventTracer.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCredential.cpp b/third_party/WebKit/Source/platform/exported/WebCredential.cpp index 192e8af..11125ec 100644 --- a/third_party/WebKit/Source/platform/exported/WebCredential.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebCredential.h" #include "platform/credentialmanager/PlatformCredential.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp index bfd61b6..eb1793b6 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCryptoAlgorithm.h" #include "public/platform/WebCryptoAlgorithmParams.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp index 248ff6d..97660f7 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCryptoKey.h" #include "public/platform/WebCryptoAlgorithm.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoKeyAlgorithm.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoKeyAlgorithm.cpp index 66058ead..45e406a 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoKeyAlgorithm.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoKeyAlgorithm.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCryptoKeyAlgorithm.h" #include "wtf/OwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoResult.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoResult.cpp index aca8b7c..ec37924 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoResult.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoResult.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCrypto.h" #include "platform/CryptoResult.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoUtil.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoUtil.cpp index 3db9a11..c92f3d5b 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoUtil.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoUtil.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebCryptoUtil.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebCursorInfo.cpp b/third_party/WebKit/Source/platform/exported/WebCursorInfo.cpp index c2f962bb..e021572 100644 --- a/third_party/WebKit/Source/platform/exported/WebCursorInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCursorInfo.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebCursorInfo.h" #include "platform/Cursor.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebData.cpp b/third_party/WebKit/Source/platform/exported/WebData.cpp index 4b4468ed..b29b83e6 100644 --- a/third_party/WebKit/Source/platform/exported/WebData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebData.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebDataConsumerHandle.cpp b/third_party/WebKit/Source/platform/exported/WebDataConsumerHandle.cpp index 011e4da..df5f5a4 100644 --- a/third_party/WebKit/Source/platform/exported/WebDataConsumerHandle.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDataConsumerHandle.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebDataConsumerHandle.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp b/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp index 738f708..6fdbd54 100644 --- a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/modules/device_orientation/WebDeviceMotionData.h" #include <string.h>
diff --git a/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp b/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp index faf2543..691be20 100644 --- a/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/modules/device_orientation/WebDeviceOrientationData.h" #include <string.h>
diff --git a/third_party/WebKit/Source/platform/exported/WebDragData.cpp b/third_party/WebKit/Source/platform/exported/WebDragData.cpp index dc44c7a7..d0d7cf4 100644 --- a/third_party/WebKit/Source/platform/exported/WebDragData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDragData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebDragData.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaClient.cpp b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaClient.cpp index 951ec06e..89f6d709 100644 --- a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaClient.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebEncryptedMediaClient.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaKeyInformation.cpp b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaKeyInformation.cpp index 77e19fc9..bf0a5df2 100644 --- a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaKeyInformation.cpp +++ b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaKeyInformation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebEncryptedMediaKeyInformation.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaRequest.cpp b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaRequest.cpp index 072b6cd..4409af0 100644 --- a/third_party/WebKit/Source/platform/exported/WebEncryptedMediaRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebEncryptedMediaRequest.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "public/platform/WebEncryptedMediaRequest.h" #include "platform/EncryptedMediaRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebFederatedCredential.cpp b/third_party/WebKit/Source/platform/exported/WebFederatedCredential.cpp index 7437d13..48c2a08d 100644 --- a/third_party/WebKit/Source/platform/exported/WebFederatedCredential.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFederatedCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebFederatedCredential.h" #include "platform/credentialmanager/PlatformFederatedCredential.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp index 56b3a37c..d9cdbfa9 100644 --- a/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebFileSystemCallbacks.h" #include "platform/AsyncFileSystemCallbacks.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp b/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp index be6774e4..32052f91 100644 --- a/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebFilterKeyframe.h" #include "wtf/PassOwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp b/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp index a76a101..655de7c 100644 --- a/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp +++ b/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebHTTPBody.h" #include "platform/FileMetadata.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp b/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp index 9c522e5..8a64ca3 100644 --- a/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebHTTPLoadInfo.h" #include "platform/network/ResourceLoadInfo.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebImage.cpp b/third_party/WebKit/Source/platform/exported/WebImage.cpp index 0eb648aa..bb14044 100644 --- a/third_party/WebKit/Source/platform/exported/WebImage.cpp +++ b/third_party/WebKit/Source/platform/exported/WebImage.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebImage.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebImageGenerator.cpp b/third_party/WebKit/Source/platform/exported/WebImageGenerator.cpp index 0ea63414..158e7fb 100644 --- a/third_party/WebKit/Source/platform/exported/WebImageGenerator.cpp +++ b/third_party/WebKit/Source/platform/exported/WebImageGenerator.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebImageGenerator.h" #include "platform/graphics/DecodingImageGenerator.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaConstraints.cpp b/third_party/WebKit/Source/platform/exported/WebMediaConstraints.cpp index 477312f..826dda0c 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaConstraints.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaConstraints.cpp
@@ -28,14 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#include <math.h> - #include "public/platform/WebMediaConstraints.h" #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" +#include <math.h> namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaDeviceInfo.cpp b/third_party/WebKit/Source/platform/exported/WebMediaDeviceInfo.cpp index c91a61c..ba76b97 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaDeviceInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaDeviceInfo.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebMediaDeviceInfo.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaPlayerClient.cpp b/third_party/WebKit/Source/platform/exported/WebMediaPlayerClient.cpp index bd78907fa..9e233c9c 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaPlayerClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaPlayerClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMediaPlayerClient.h" -// This WebMediaPlayerClient.cpp, which includes only config.h +// This WebMediaPlayerClient.cpp, which includes only // and WebMediaPlayerClient.h, should be in // Source/platform/exported, because WebMediaPlayerClient is not // compiled without this cpp.
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaPlayerEncryptedMediaClient.cpp b/third_party/WebKit/Source/platform/exported/WebMediaPlayerEncryptedMediaClient.cpp index 22f149de..d8d8e54 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaPlayerEncryptedMediaClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaPlayerEncryptedMediaClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMediaPlayerEncryptedMediaClient.h" -// This WebMediaPlayerEncryptedMediaClient.cpp, which includes only config.h +// This WebMediaPlayerEncryptedMediaClient.cpp, which includes only // and WebMediaPlayerEncryptedMediaClient.h, should be in // Source/platform/exported, because WebMediaPlayerEncryptedMediaClient is not // compiled without this cpp.
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaRecorderHandler.cpp b/third_party/WebKit/Source/platform/exported/WebMediaRecorderHandler.cpp index 30d2c8e6..c978c2c 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaRecorderHandler.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaRecorderHandler.cpp
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMediaRecorderHandler.h" -// This file just includes config.h and WebMediaPlayerClient.h, to make sure +// This file just includes WebMediaPlayerClient.h, to make sure // MSVC compiler does not fail linking with LNK2019 due to unresolved // constructor/destructor and should be in Source/platform/exported.
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp index 5fd7fbb7..076ae23 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebMediaStream.h" #include "platform/UUID.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp index 5659e6c..d3a04218 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebMediaStreamSource.h" #include "platform/audio/AudioBus.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp index bc4460c..5156f5dc 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebMediaStreamTrack.h" #include "platform/mediastream/MediaStreamComponent.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp index 5966b6a4..1b4ecdb0 100644 --- a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebMediaStreamTrackSourcesRequest.h" #include "platform/mediastream/MediaStreamTrackSourcesRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebMemoryAllocatorDump.cpp b/third_party/WebKit/Source/platform/exported/WebMemoryAllocatorDump.cpp index b28f540..fc60adcc 100644 --- a/third_party/WebKit/Source/platform/exported/WebMemoryAllocatorDump.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMemoryAllocatorDump.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMemoryAllocatorDump.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/exported/WebMemoryDumpProvider.cpp index 32a7a6c..9bdf38d4 100644 --- a/third_party/WebKit/Source/platform/exported/WebMemoryDumpProvider.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMemoryDumpProvider.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMemoryDumpProvider.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebMessagePortChannelClient.cpp b/third_party/WebKit/Source/platform/exported/WebMessagePortChannelClient.cpp index 1f853ed..8b777b0 100644 --- a/third_party/WebKit/Source/platform/exported/WebMessagePortChannelClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebMessagePortChannelClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebMessagePortChannelClient.h" -// This WebMessagePortChannelClient.cpp, which includes only config.h and +// This WebMessagePortChannelClient.cpp, which includes only // WebMessagePortChannelClient.h, should be in Source/platform/exported, // because WebMessagePortChannelClient is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebPasswordCredential.cpp b/third_party/WebKit/Source/platform/exported/WebPasswordCredential.cpp index 10309154..7376c2b 100644 --- a/third_party/WebKit/Source/platform/exported/WebPasswordCredential.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPasswordCredential.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebPasswordCredential.h" #include "platform/credentialmanager/PlatformPasswordCredential.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp index 0bb18a5..9de9756 100644 --- a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebPrerender.h" #include "platform/Prerender.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp b/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp index c699173..01ff382 100644 --- a/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebPrerenderingSupport.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebPresentationAvailabilityObserver.cpp b/third_party/WebKit/Source/platform/exported/WebPresentationAvailabilityObserver.cpp index eb98ae9..6838c6af 100644 --- a/third_party/WebKit/Source/platform/exported/WebPresentationAvailabilityObserver.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPresentationAvailabilityObserver.cpp
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/presentation/WebPresentationAvailabilityObserver.h" -// This WebPresentationAvailabilityObserver.cpp, which includes only config.h -// and WebPresentationAvailabilityObserver.h, should be in +// This WebPresentationAvailabilityObserver.cpp, which includes only +// WebPresentationAvailabilityObserver.h, should be in // Source/platform/exported, because WebPresentationAvailabilityObserver is not // compiled without this cpp. So if we don't have this cpp, we will see // unresolved symbol error when constructor/destructor's address is required.
diff --git a/third_party/WebKit/Source/platform/exported/WebPresentationController.cpp b/third_party/WebKit/Source/platform/exported/WebPresentationController.cpp index 50ce3d7..e71aecf 100644 --- a/third_party/WebKit/Source/platform/exported/WebPresentationController.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPresentationController.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/presentation/WebPresentationController.h" -// This WebPresentationController.cpp, which includes only config.h and +// This WebPresentationController.cpp, which includes only // WebPresentationController.h, should be in Source/platform/exported, // because WebPresentationController is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebProcessMemoryDump.cpp b/third_party/WebKit/Source/platform/exported/WebProcessMemoryDump.cpp index f50221d..b410d2ab3 100644 --- a/third_party/WebKit/Source/platform/exported/WebProcessMemoryDump.cpp +++ b/third_party/WebKit/Source/platform/exported/WebProcessMemoryDump.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebProcessMemoryDump.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp index e02a315..e7cf7d0 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebRTCConfiguration.h" #include "platform/mediastream/RTCConfiguration.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp b/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp index 9b4bd52..d4acca4d 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebRTCICECandidate.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCOfferOptions.cpp b/third_party/WebKit/Source/platform/exported/WebRTCOfferOptions.cpp index 16f55eb..6402ddd 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCOfferOptions.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCOfferOptions.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebRTCOfferOptions.h" #include "platform/mediastream/RTCOfferOptions.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCSessionDescription.cpp b/third_party/WebKit/Source/platform/exported/WebRTCSessionDescription.cpp index cff10654..a6d5688 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCSessionDescription.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCSessionDescription.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebRTCSessionDescription.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCSessionDescriptionRequest.cpp b/third_party/WebKit/Source/platform/exported/WebRTCSessionDescriptionRequest.cpp index 6c3629d..119fff05 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCSessionDescriptionRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCSessionDescriptionRequest.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebRTCSessionDescriptionRequest.h" #include "platform/mediastream/RTCSessionDescriptionRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCStatsRequest.cpp b/third_party/WebKit/Source/platform/exported/WebRTCStatsRequest.cpp index b0805605..10452de7 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCStatsRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCStatsRequest.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebRTCStatsRequest.h" #include "platform/mediastream/RTCStatsRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCStatsResponse.cpp b/third_party/WebKit/Source/platform/exported/WebRTCStatsResponse.cpp index 5ed39cf9..e3ad7e38 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCStatsResponse.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCStatsResponse.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebRTCStatsResponse.h" #include "platform/mediastream/RTCStatsResponseBase.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCVoidRequest.cpp b/third_party/WebKit/Source/platform/exported/WebRTCVoidRequest.cpp index 0bcf8bd..1fdc7b4f 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCVoidRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCVoidRequest.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebRTCVoidRequest.h" #include "platform/mediastream/RTCVoidRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebScrollbarImpl.cpp b/third_party/WebKit/Source/platform/exported/WebScrollbarImpl.cpp index ab0e6f1..e100702 100644 --- a/third_party/WebKit/Source/platform/exported/WebScrollbarImpl.cpp +++ b/third_party/WebKit/Source/platform/exported/WebScrollbarImpl.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/exported/WebScrollbarImpl.h" #include "platform/geometry/IntRect.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebScrollbarThemeClientImpl.cpp b/third_party/WebKit/Source/platform/exported/WebScrollbarThemeClientImpl.cpp index e3d8be8..55e4ac29 100644 --- a/third_party/WebKit/Source/platform/exported/WebScrollbarThemeClientImpl.cpp +++ b/third_party/WebKit/Source/platform/exported/WebScrollbarThemeClientImpl.cpp
@@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/exported/WebScrollbarThemeClientImpl.h" #include "platform/scroll/ScrollbarTheme.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebScrollbarThemeGeometryNative.cpp b/third_party/WebKit/Source/platform/exported/WebScrollbarThemeGeometryNative.cpp index dd1615e..d6a43624 100644 --- a/third_party/WebKit/Source/platform/exported/WebScrollbarThemeGeometryNative.cpp +++ b/third_party/WebKit/Source/platform/exported/WebScrollbarThemeGeometryNative.cpp
@@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/exported/WebScrollbarThemeGeometryNative.h" #include "platform/exported/WebScrollbarThemeClientImpl.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebScrollbarThemePainter.cpp b/third_party/WebKit/Source/platform/exported/WebScrollbarThemePainter.cpp index 1327ca1..1f1c76b 100644 --- a/third_party/WebKit/Source/platform/exported/WebScrollbarThemePainter.cpp +++ b/third_party/WebKit/Source/platform/exported/WebScrollbarThemePainter.cpp
@@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebScrollbarThemePainter.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSecurityOrigin.cpp b/third_party/WebKit/Source/platform/exported/WebSecurityOrigin.cpp index 2b7b91a..fce9c8ae 100644 --- a/third_party/WebKit/Source/platform/exported/WebSecurityOrigin.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSecurityOrigin.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebSecurityOrigin.h" #include "platform/weborigin/DatabaseIdentifier.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebServicePortProviderClient.cpp b/third_party/WebKit/Source/platform/exported/WebServicePortProviderClient.cpp index 1be42a0..e49c4b57 100644 --- a/third_party/WebKit/Source/platform/exported/WebServicePortProviderClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebServicePortProviderClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/navigator_services/WebServicePortProviderClient.h" -// This WebServicePortProviderClient.cpp, which includes only config.h and +// This WebServicePortProviderClient.cpp, which includes only // WebServicePortProvierClient.h, should be in Source/platform/exported, // because WebServicePortProviderClient is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebServiceWorkerProviderClient.cpp b/third_party/WebKit/Source/platform/exported/WebServiceWorkerProviderClient.cpp index 6d7fcbd..52b7ed0 100644 --- a/third_party/WebKit/Source/platform/exported/WebServiceWorkerProviderClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebServiceWorkerProviderClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h" -// This WebServiceWorkerProviderClient.cpp, which includes only config.h and +// This WebServiceWorkerProviderClient.cpp, which includes only // WebServiceWorkerProviderClient.h, should be in Source/platform/exported, // because WebServiceWorkerProviderClient is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebServiceWorkerProxy.cpp b/third_party/WebKit/Source/platform/exported/WebServiceWorkerProxy.cpp index c050304e..8f7eb245 100644 --- a/third_party/WebKit/Source/platform/exported/WebServiceWorkerProxy.cpp +++ b/third_party/WebKit/Source/platform/exported/WebServiceWorkerProxy.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/serviceworker/WebServiceWorkerProxy.h" -// This WebServiceWorkerProxy.cpp, which includes only config.h and +// This WebServiceWorkerProxy.cpp, which includes only // WebServiceWorkerProxy.h, should be in Source/platform/exported, // because WebServiceWorkerProxy is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp b/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp index 15fce46..bc9c6ed9 100644 --- a/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h" #include "platform/blob/BlobData.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebServiceWorkerResponse.cpp b/third_party/WebKit/Source/platform/exported/WebServiceWorkerResponse.cpp index e47d6c7..49dd39e 100644 --- a/third_party/WebKit/Source/platform/exported/WebServiceWorkerResponse.cpp +++ b/third_party/WebKit/Source/platform/exported/WebServiceWorkerResponse.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h" #include "platform/blob/BlobData.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSkImage.cpp b/third_party/WebKit/Source/platform/exported/WebSkImage.cpp index ad6bc6b0..d5b752f 100644 --- a/third_party/WebKit/Source/platform/exported/WebSkImage.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSkImage.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebSkImage.h" #include "wtf/PassRefPtr.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp b/third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp index 0d638a2e..46d94f4f 100644 --- a/third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebSocketHandshakeRequestInfo.h" #include "platform/network/WebSocketHandshakeRequest.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSocketHandshakeResponseInfo.cpp b/third_party/WebKit/Source/platform/exported/WebSocketHandshakeResponseInfo.cpp index 8db0d4e..e823b91b 100644 --- a/third_party/WebKit/Source/platform/exported/WebSocketHandshakeResponseInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSocketHandshakeResponseInfo.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebSocketHandshakeResponseInfo.h" #include "platform/network/WebSocketHandshakeResponse.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp b/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp index 04eef20..9e635e6 100644 --- a/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebSourceInfo.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisUtterance.cpp b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisUtterance.cpp index 0d75dcb..2f8c256 100644 --- a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisUtterance.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisUtterance.cpp
@@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "public/platform/WebSpeechSynthesisUtterance.h" #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisVoice.cpp b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisVoice.cpp index eb6684ca..a4a12fc 100644 --- a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisVoice.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesisVoice.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebSpeechSynthesisVoice.h" #include "platform/speech/PlatformSpeechSynthesisVoice.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesizerClientImpl.cpp b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesizerClientImpl.cpp index 1f098aa..fb4fe52 100644 --- a/third_party/WebKit/Source/platform/exported/WebSpeechSynthesizerClientImpl.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSpeechSynthesizerClientImpl.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/exported/WebSpeechSynthesizerClientImpl.h" #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebStorageQuotaCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebStorageQuotaCallbacks.cpp index 93c5a7b..41cfe4d 100644 --- a/third_party/WebKit/Source/platform/exported/WebStorageQuotaCallbacks.cpp +++ b/third_party/WebKit/Source/platform/exported/WebStorageQuotaCallbacks.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebStorageQuotaCallbacks.h" #include "platform/StorageQuotaCallbacks.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebString.cpp b/third_party/WebKit/Source/platform/exported/WebString.cpp index 703406bf..6371178 100644 --- a/third_party/WebKit/Source/platform/exported/WebString.cpp +++ b/third_party/WebKit/Source/platform/exported/WebString.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebString.h" #include "public/platform/WebCString.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp b/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp index ac968a4..0dfe22d 100644 --- a/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebThreadSafeData.h" #include "platform/blob/BlobData.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebThreadedDataReceiver.cpp b/third_party/WebKit/Source/platform/exported/WebThreadedDataReceiver.cpp index 1f8f1d2..aeb6b1c 100644 --- a/third_party/WebKit/Source/platform/exported/WebThreadedDataReceiver.cpp +++ b/third_party/WebKit/Source/platform/exported/WebThreadedDataReceiver.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebThreadedDataReceiver.h" #include "platform/ThreadedDataReceiver.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebTraceLocation.cpp b/third_party/WebKit/Source/platform/exported/WebTraceLocation.cpp index c61fef4a..33517b3 100644 --- a/third_party/WebKit/Source/platform/exported/WebTraceLocation.cpp +++ b/third_party/WebKit/Source/platform/exported/WebTraceLocation.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebTraceLocation.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp b/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp index 0c28e77..1c0d728 100644 --- a/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp +++ b/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebTransformKeyframe.h" #include "wtf/PassOwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURL.cpp b/third_party/WebKit/Source/platform/exported/WebURL.cpp index 755d026..72eccf0 100644 --- a/third_party/WebKit/Source/platform/exported/WebURL.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURL.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebURL.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURLError.cpp b/third_party/WebKit/Source/platform/exported/WebURLError.cpp index bf08472..ca26cfb2 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLError.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLError.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebURLError.h" #include "platform/network/ResourceError.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp b/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp index 0f44cdc..ac2345e 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebURLLoadTiming.h" #include "platform/network/ResourceLoadTiming.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURLLoaderClient.cpp b/third_party/WebKit/Source/platform/exported/WebURLLoaderClient.cpp index b48721263..9e987d1 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLLoaderClient.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLLoaderClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebURLLoaderClient.h" -// This WebURLLoaderClient.cpp, which includes only config.h and +// This WebURLLoaderClient.cpp, which includes only // WebURLLoaderClient.h, should be in Source/platform/exported, // because WebURLLoaderClient is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/exported/WebURLLoaderTestDelegate.cpp b/third_party/WebKit/Source/platform/exported/WebURLLoaderTestDelegate.cpp index c67eb28d..1f875cb 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLLoaderTestDelegate.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLLoaderTestDelegate.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "public/platform/WebURLLoaderTestDelegate.h" #include "public/platform/WebURLError.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp index 1b5f8a3..fc29fd6e 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebURLRequest.h" #include "platform/exported/WebURLRequestPrivate.h"
diff --git a/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp b/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp index 6998d9a..c856dd7 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/WebURLResponse.h" #include "platform/exported/WebURLResponsePrivate.h"
diff --git a/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp b/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp index f3fc8a8..c186dbc 100644 --- a/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/linux/WebFontInfo.h" #include "public/platform/linux/WebFallbackFont.h"
diff --git a/third_party/WebKit/Source/platform/exported/linux/WebFontRenderStyle.cpp b/third_party/WebKit/Source/platform/exported/linux/WebFontRenderStyle.cpp index 051319e..60a41b3 100644 --- a/third_party/WebKit/Source/platform/exported/linux/WebFontRenderStyle.cpp +++ b/third_party/WebKit/Source/platform/exported/linux/WebFontRenderStyle.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/linux/WebFontRenderStyle.h" #include "platform/fonts/FontRenderStyle.h"
diff --git a/third_party/WebKit/Source/platform/fonts/Character.cpp b/third_party/WebKit/Source/platform/fonts/Character.cpp index 5ea155b..a361f66 100644 --- a/third_party/WebKit/Source/platform/fonts/Character.cpp +++ b/third_party/WebKit/Source/platform/fonts/Character.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/Character.h" #include "wtf/StdLibExtras.h"
diff --git a/third_party/WebKit/Source/platform/fonts/Font.cpp b/third_party/WebKit/Source/platform/fonts/Font.cpp index 4bcd940..77701d0 100644 --- a/third_party/WebKit/Source/platform/fonts/Font.cpp +++ b/third_party/WebKit/Source/platform/fonts/Font.cpp
@@ -22,7 +22,6 @@ * */ -#include "config.h" #include "platform/fonts/Font.h" #include "platform/LayoutTestSupport.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp index 37ee7a2..462f0d0 100644 --- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontCache.h" #include "platform/FontFamilyNames.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontCacheMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/fonts/FontCacheMemoryDumpProvider.cpp index 6cef384..9b43991 100644 --- a/third_party/WebKit/Source/platform/fonts/FontCacheMemoryDumpProvider.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontCacheMemoryDumpProvider.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/FontCacheMemoryDumpProvider.h" #include "platform/fonts/FontCache.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontCacheTest.cpp b/third_party/WebKit/Source/platform/fonts/FontCacheTest.cpp index 706f1694..c97c745 100644 --- a/third_party/WebKit/Source/platform/fonts/FontCacheTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontCacheTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/FontDescription.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp index ba6396c..6f984ad7 100644 --- a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp
@@ -30,7 +30,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontCustomPlatformData.h" #include "platform/LayoutTestSupport.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontData.cpp b/third_party/WebKit/Source/platform/fonts/FontData.cpp index 6c9c9a2..8c362e8 100644 --- a/third_party/WebKit/Source/platform/fonts/FontData.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontData.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontData.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp b/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp index 1bcb7abe3..c874db1 100644 --- a/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontDataCache.h" #include "platform/fonts/SimpleFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontDescription.cpp b/third_party/WebKit/Source/platform/fonts/FontDescription.cpp index e510cdb..2008681 100644 --- a/third_party/WebKit/Source/platform/fonts/FontDescription.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontDescription.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontDescription.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontDescriptionTest.cpp b/third_party/WebKit/Source/platform/fonts/FontDescriptionTest.cpp index feb59d7..a54d3f5ea 100644 --- a/third_party/WebKit/Source/platform/fonts/FontDescriptionTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontDescriptionTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontDescription.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp index 3d308fe..f13d587b3 100644 --- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/FontFallbackIterator.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp index 184c6f2..c287971 100644 --- a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontFallbackList.h" #include "platform/FontFamilyNames.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontFamily.cpp b/third_party/WebKit/Source/platform/fonts/FontFamily.cpp index 2955982..2081ee2 100644 --- a/third_party/WebKit/Source/platform/fonts/FontFamily.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontFamily.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontFamily.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/fonts/FontFeatureSettings.cpp b/third_party/WebKit/Source/platform/fonts/FontFeatureSettings.cpp index 9e9a502f..78caa10 100644 --- a/third_party/WebKit/Source/platform/fonts/FontFeatureSettings.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontFeatureSettings.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontFeatureSettings.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp index bac9dc7..05f279ad 100644 --- a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "platform/fonts/FontPlatformData.h" #include "SkTypeface.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp b/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp index e773a09..7fe1929 100644 --- a/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/Font.h" #include "platform/fonts/TestFontSelector.h"
diff --git a/third_party/WebKit/Source/platform/fonts/FontTest.cpp b/third_party/WebKit/Source/platform/fonts/FontTest.cpp index 1a19045..c38c10db 100644 --- a/third_party/WebKit/Source/platform/fonts/FontTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontTest.cpp
@@ -25,7 +25,6 @@ // Tests for the Font class. -#include "config.h" #include "platform/fonts/Font.h" #include "platform/fonts/Character.h"
diff --git a/third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp b/third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp index caf8294e..ea191a7c 100644 --- a/third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp +++ b/third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/GenericFontFamilySettings.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/fonts/GlyphBufferTest.cpp b/third_party/WebKit/Source/platform/fonts/GlyphBufferTest.cpp index 14a57b0..5851d32 100644 --- a/third_party/WebKit/Source/platform/fonts/GlyphBufferTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/GlyphBufferTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/GlyphBuffer.h" #include "platform/fonts/SimpleFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp index 73931bd..cf11844 100644 --- a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp +++ b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/GlyphPageTreeNode.h" #include "platform/fonts/SegmentedFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNodeTest.cpp b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNodeTest.cpp index 95b24cd..8f148c0 100644 --- a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNodeTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNodeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/GlyphPageTreeNode.h" #include "platform/fonts/SegmentedFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/OrientationIterator.cpp b/third_party/WebKit/Source/platform/fonts/OrientationIterator.cpp index 1177b181..1755afa 100644 --- a/third_party/WebKit/Source/platform/fonts/OrientationIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/OrientationIterator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "OrientationIterator.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/fonts/OrientationIteratorTest.cpp b/third_party/WebKit/Source/platform/fonts/OrientationIteratorTest.cpp index a5e063c..6dd30e5 100644 --- a/third_party/WebKit/Source/platform/fonts/OrientationIteratorTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/OrientationIteratorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/OrientationIterator.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp index 5230bce..2680fb9 100644 --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "ScriptRunIterator.h" #include "platform/Logging.h" @@ -113,7 +112,7 @@ const ICUScriptData* ICUScriptData::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const ICUScriptData, icuScriptDataInstance, (new ICUScriptData())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const ICUScriptData, icuScriptDataInstance, (new ICUScriptData())); return &icuScriptDataInstance; }
diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp index 432d923..8dee5fe 100644 --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/ScriptRunIterator.h" #include "platform/Logging.h" @@ -36,7 +35,7 @@ static const MockScriptData* instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const MockScriptData, mockScriptData, (new MockScriptData())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const MockScriptData, mockScriptData, (new MockScriptData())); return &mockScriptData; }
diff --git a/third_party/WebKit/Source/platform/fonts/SegmentedFontData.cpp b/third_party/WebKit/Source/platform/fonts/SegmentedFontData.cpp index 098741a..7bf55392 100644 --- a/third_party/WebKit/Source/platform/fonts/SegmentedFontData.cpp +++ b/third_party/WebKit/Source/platform/fonts/SegmentedFontData.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/SegmentedFontData.h" #include "platform/fonts/SimpleFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp index 77984387..0a2ebbb 100644 --- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp +++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/SimpleFontData.h" #include "SkPaint.h"
diff --git a/third_party/WebKit/Source/platform/fonts/SmallCapsIterator.cpp b/third_party/WebKit/Source/platform/fonts/SmallCapsIterator.cpp index 9819490..1793f3ae 100644 --- a/third_party/WebKit/Source/platform/fonts/SmallCapsIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/SmallCapsIterator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "SmallCapsIterator.h" #include <unicode/utypes.h>
diff --git a/third_party/WebKit/Source/platform/fonts/SmallCapsIteratorTest.cpp b/third_party/WebKit/Source/platform/fonts/SmallCapsIteratorTest.cpp index 6b98f65..fff9f250 100644 --- a/third_party/WebKit/Source/platform/fonts/SmallCapsIteratorTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/SmallCapsIteratorTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/SmallCapsIterator.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp b/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp index d087cc5..1b5435a6 100644 --- a/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "platform/fonts/UTF16TextIterator.h" #include <unicode/unorm.h>
diff --git a/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp b/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp index 65ac8ef4..8246ec3 100644 --- a/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp +++ b/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp
@@ -28,8 +28,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#include "VDMXParser.h" +#include "platform/fonts/VDMXParser.h" #include "wtf/Allocator.h" #include "wtf/ByteOrder.h"
diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp index 419e593..a26149c3 100644 --- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp +++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontCache.h" #include "platform/Language.h"
diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp index be05c2a0..dd8e4a8 100644 --- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/FontCache.h" #include "platform/fonts/SimpleFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp b/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp index 252f980b1..70493006 100644 --- a/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp +++ b/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/fonts/FontCache.h" #include "public/platform/linux/WebFallbackFont.h"
diff --git a/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp b/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp index e1ea27d..9b3e479 100644 --- a/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp +++ b/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "public/platform/Platform.h" #include "SkTypeface.h"
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm index 24ab50fc..0ea3734 100644 --- a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm +++ b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/fonts/FontCache.h" #import <AppKit/AppKit.h>
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm index 8a0bb29..20c9dca 100644 --- a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm +++ b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm
@@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/fonts/mac/FontFamilyMatcherMac.h" #import <AppKit/AppKit.h>
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm index d96be8b1..661ff77 100644 --- a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm +++ b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "config.h" #import "platform/fonts/mac/FontFamilyMatcherMac.h" #include <AppKit/AppKit.h>
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm index 10f99e94..bfb4147 100644 --- a/third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm +++ b/third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm
@@ -21,7 +21,6 @@ * */ -#import "config.h" #import "platform/fonts/FontPlatformData.h" #import "platform/LayoutTestSupport.h"
diff --git a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeSanitizer.cpp b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeSanitizer.cpp index 39418e35..11d1753 100644 --- a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeSanitizer.cpp +++ b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeSanitizer.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/opentype/OpenTypeSanitizer.h" #include "hb.h"
diff --git a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp index a75d872..556e52f 100644 --- a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp +++ b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/opentype/OpenTypeVerticalData.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalDataTest.cpp b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalDataTest.cpp index 899b97a..7af0edc 100644 --- a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalDataTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalDataTest.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/SharedBuffer.h" #include "platform/fonts/opentype/OpenTypeTypes.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.cpp index c237836c..5493f85 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/shaping/CachingWordShaper.h" #include "platform/fonts/SimpleFontData.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp index 198e599f..11fccab 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/shaping/CachingWordShaper.h" #include "platform/fonts/FontCache.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp index 5ccd25e0..7ad8d417d 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/shaping/HarfBuzzFace.h" #include "hb-ot.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp index 60e3534f..0074064 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/shaping/HarfBuzzShaper.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp index e035327..dacb97c5 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/shaping/HarfBuzzShaper.h" #include "platform/fonts/Font.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.cpp b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.cpp index 8cf7098..f2d89e6f 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/shaping/RunSegmenter.h" #include "platform/fonts/Character.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenterTest.cpp b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenterTest.cpp index 788df52..a249b65 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenterTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenterTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/shaping/RunSegmenter.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.cpp b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.cpp index 17b001f6..b0cc8b9f 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/shaping/ShapeResult.h" #include "platform/fonts/Font.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultTestInfo.cpp b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultTestInfo.cpp index e9fedda..7cbd59c 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultTestInfo.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultTestInfo.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/shaping/ShapeResultTestInfo.h" #include "platform/fonts/Font.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/Shaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/Shaper.cpp index 3a63f49..38b922bf 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/Shaper.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/Shaper.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/shaping/Shaper.h" #include "platform/fonts/Font.h"
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp index babd006d..414455e 100644 --- a/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp +++ b/third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp
@@ -20,7 +20,6 @@ * */ -#include "config.h" #include "platform/fonts/shaping/SimpleShaper.h" #include "platform/fonts/Character.h"
diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp index 56aeb52..591ba4f2 100644 --- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp +++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
@@ -28,11 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - -#if !OS(WIN) && !OS(ANDROID) -#include "SkFontConfigInterface.h" -#endif #include "SkFontMgr.h" #include "SkStream.h" #include "SkTypeface.h" @@ -49,6 +44,8 @@ #include <unicode/locid.h> #if !OS(WIN) && !OS(ANDROID) +#include "SkFontConfigInterface.h" + static PassRefPtr<SkTypeface> typefaceForFontconfigInterfaceIdAndTtcIndex(int fontconfigInterfaceId, int ttcIndex) { SkAutoTUnref<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp index fe83077..0564687 100644 --- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp +++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontCache.h" #include "SkFontMgr.h"
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp index ead47f9c..0af93924 100644 --- a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp +++ b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/win/FontFallbackWin.h" #include "platform/fonts/FontCache.h"
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWinTest.cpp b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWinTest.cpp index 8108e0e..7076d9c 100644 --- a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWinTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWinTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/fonts/win/FontFallbackWin.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp index 76c2c03..96dcd17 100644 --- a/third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp +++ b/third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/fonts/FontPlatformData.h" #include "SkTypeface.h"
diff --git a/third_party/WebKit/Source/platform/geometry/DoublePoint.cpp b/third_party/WebKit/Source/platform/geometry/DoublePoint.cpp index 173e98d..adc1d5e 100644 --- a/third_party/WebKit/Source/platform/geometry/DoublePoint.cpp +++ b/third_party/WebKit/Source/platform/geometry/DoublePoint.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/DoublePoint.h" #include "platform/geometry/FloatSize.h" #include "platform/geometry/LayoutPoint.h"
diff --git a/third_party/WebKit/Source/platform/geometry/DoubleRect.cpp b/third_party/WebKit/Source/platform/geometry/DoubleRect.cpp index ddbd098..cc51a33d 100644 --- a/third_party/WebKit/Source/platform/geometry/DoubleRect.cpp +++ b/third_party/WebKit/Source/platform/geometry/DoubleRect.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/DoubleRect.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/geometry/DoubleSize.cpp b/third_party/WebKit/Source/platform/geometry/DoubleSize.cpp index 3a6ad340..1e02789 100644 --- a/third_party/WebKit/Source/platform/geometry/DoubleSize.cpp +++ b/third_party/WebKit/Source/platform/geometry/DoubleSize.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/DoubleSize.h" #include "platform/geometry/LayoutSize.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatBoxTest.cpp b/third_party/WebKit/Source/platform/geometry/FloatBoxTest.cpp index 36d5c6a..655c43b 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatBoxTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatBoxTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatBox.h" #include "platform/geometry/FloatBoxTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp b/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp index a40d97ee..6406120 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatBoxTestHelpers.cpp
@@ -22,11 +22,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatBoxTestHelpers.h" -#include "platform/geometry/GeometryTestHelpers.h" #include "platform/geometry/FloatBox.h" +#include "platform/geometry/GeometryTestHelpers.h" + const static float kTestEpsilon = 1e-6; namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp b/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp index 0abcd52..0b55f04 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatPoint.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatPoint.h" #include "SkPoint.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPoint3D.cpp b/third_party/WebKit/Source/platform/geometry/FloatPoint3D.cpp index 48b9bd30..19dd85be 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatPoint3D.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatPoint3D.cpp
@@ -19,11 +19,9 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "platform/geometry/FloatPoint3D.h" -#include "wtf/MathExtras.h" +#include "wtf/MathExtras.h" #include <math.h> namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPointTest.cpp b/third_party/WebKit/Source/platform/geometry/FloatPointTest.cpp index a23dcdd..3e030898 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatPointTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatPointTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/FloatPoint.h" #include "platform/geometry/GeometryTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPolygon.cpp b/third_party/WebKit/Source/platform/geometry/FloatPolygon.cpp index 7b214ee..74cb1bf2 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatPolygon.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatPolygon.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatPolygon.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatPolygonTest.cpp b/third_party/WebKit/Source/platform/geometry/FloatPolygonTest.cpp index fa0a4537..e1cb108 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatPolygonTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatPolygonTest.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatPolygon.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatQuad.cpp b/third_party/WebKit/Source/platform/geometry/FloatQuad.cpp index 39b7b0e..7823baf 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatQuad.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatQuad.cpp
@@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatQuad.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/geometry/FloatRect.cpp b/third_party/WebKit/Source/platform/geometry/FloatRect.cpp index cbe2b42..13c4b81 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatRect.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatRect.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatRect.h" #include "platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatRoundedRect.cpp b/third_party/WebKit/Source/platform/geometry/FloatRoundedRect.cpp index fa8af1c..0b2ce34 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatRoundedRect.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatRoundedRect.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatRoundedRect.h" #include "platform/geometry/FloatQuad.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatRoundedRectTest.cpp b/third_party/WebKit/Source/platform/geometry/FloatRoundedRectTest.cpp index 2a61512..35a457f8 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatRoundedRectTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatRoundedRectTest.cpp
@@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatRoundedRect.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatSize.cpp b/third_party/WebKit/Source/platform/geometry/FloatSize.cpp index 268b7fe49..b2764c5 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatSize.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatSize.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatSize.h" #include "platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/platform/geometry/FloatSizeTest.cpp b/third_party/WebKit/Source/platform/geometry/FloatSizeTest.cpp index 003d5ee..c1c1e17 100644 --- a/third_party/WebKit/Source/platform/geometry/FloatSizeTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/FloatSizeTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/FloatSize.h" #include "platform/geometry/GeometryTestHelpers.h"
diff --git a/third_party/WebKit/Source/platform/geometry/GeometryTestHelpers.cpp b/third_party/WebKit/Source/platform/geometry/GeometryTestHelpers.cpp index 743ee1f..a10de18 100644 --- a/third_party/WebKit/Source/platform/geometry/GeometryTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/geometry/GeometryTestHelpers.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/GeometryTestHelpers.h" #include <limits>
diff --git a/third_party/WebKit/Source/platform/geometry/IntRect.cpp b/third_party/WebKit/Source/platform/geometry/IntRect.cpp index 557a4f0..79461dc 100644 --- a/third_party/WebKit/Source/platform/geometry/IntRect.cpp +++ b/third_party/WebKit/Source/platform/geometry/IntRect.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntRect.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/geometry/LayoutRect.cpp b/third_party/WebKit/Source/platform/geometry/LayoutRect.cpp index 55fe5b3..f0714d7 100644 --- a/third_party/WebKit/Source/platform/geometry/LayoutRect.cpp +++ b/third_party/WebKit/Source/platform/geometry/LayoutRect.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/LayoutRect.h" #include "platform/LayoutUnit.h"
diff --git a/third_party/WebKit/Source/platform/geometry/LayoutRectOutsets.cpp b/third_party/WebKit/Source/platform/geometry/LayoutRectOutsets.cpp index 7c1cc34..beaf0fe 100644 --- a/third_party/WebKit/Source/platform/geometry/LayoutRectOutsets.cpp +++ b/third_party/WebKit/Source/platform/geometry/LayoutRectOutsets.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/LayoutRectOutsets.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/geometry/LayoutRectOutsetsTest.cpp b/third_party/WebKit/Source/platform/geometry/LayoutRectOutsetsTest.cpp index a00a791..7f45b02 100644 --- a/third_party/WebKit/Source/platform/geometry/LayoutRectOutsetsTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/LayoutRectOutsetsTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/geometry/LayoutRectOutsets.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/geometry/Region.cpp b/third_party/WebKit/Source/platform/geometry/Region.cpp index 08941d6..bb9f7f84 100644 --- a/third_party/WebKit/Source/platform/geometry/Region.cpp +++ b/third_party/WebKit/Source/platform/geometry/Region.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/Region.h" #include <stdio.h>
diff --git a/third_party/WebKit/Source/platform/geometry/RegionTest.cpp b/third_party/WebKit/Source/platform/geometry/RegionTest.cpp index 04d19ff..b6a63df 100644 --- a/third_party/WebKit/Source/platform/geometry/RegionTest.cpp +++ b/third_party/WebKit/Source/platform/geometry/RegionTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/Region.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/geometry/TransformState.cpp b/third_party/WebKit/Source/platform/geometry/TransformState.cpp index 57f29e6..b839a17 100644 --- a/third_party/WebKit/Source/platform/geometry/TransformState.cpp +++ b/third_party/WebKit/Source/platform/geometry/TransformState.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/TransformState.h" #include "wtf/PassOwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/geometry/cg/FloatPointCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/FloatPointCG.cpp index 2517304..260bc42 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/FloatPointCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/FloatPointCG.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatPoint.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/cg/FloatRectCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/FloatRectCG.cpp index 437e49d..4238953 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/FloatRectCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/FloatRectCG.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatRect.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/cg/FloatSizeCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/FloatSizeCG.cpp index d5cf264..ded79af 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/FloatSizeCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/FloatSizeCG.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatSize.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/cg/IntPointCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/IntPointCG.cpp index d93cf11..0721f3f 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/IntPointCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/IntPointCG.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntPoint.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/cg/IntRectCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/IntRectCG.cpp index 5edc2e2..18f7fe3 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/IntRectCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/IntRectCG.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntRect.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/cg/IntSizeCG.cpp b/third_party/WebKit/Source/platform/geometry/cg/IntSizeCG.cpp index 50af632..23599bb 100644 --- a/third_party/WebKit/Source/platform/geometry/cg/IntSizeCG.cpp +++ b/third_party/WebKit/Source/platform/geometry/cg/IntSizeCG.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntSize.h" #include <ApplicationServices/ApplicationServices.h>
diff --git a/third_party/WebKit/Source/platform/geometry/mac/FloatPointMac.mm b/third_party/WebKit/Source/platform/geometry/mac/FloatPointMac.mm index 3de977a..f46d570 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/FloatPointMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/FloatPointMac.mm
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatPoint.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/mac/FloatRectMac.mm b/third_party/WebKit/Source/platform/geometry/mac/FloatRectMac.mm index 49c7004..6057eb8 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/FloatRectMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/FloatRectMac.mm
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatRect.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/mac/FloatSizeMac.mm b/third_party/WebKit/Source/platform/geometry/mac/FloatSizeMac.mm index 8681a4b0..03c8d16 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/FloatSizeMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/FloatSizeMac.mm
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/FloatSize.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/mac/IntPointMac.mm b/third_party/WebKit/Source/platform/geometry/mac/IntPointMac.mm index b36eed72..36dab3b 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/IntPointMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/IntPointMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntPoint.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/mac/IntRectMac.mm b/third_party/WebKit/Source/platform/geometry/mac/IntRectMac.mm index 1833c63..53cb1a7 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/IntRectMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/IntRectMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntRect.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/geometry/mac/IntSizeMac.mm b/third_party/WebKit/Source/platform/geometry/mac/IntSizeMac.mm index eb89cba04..f93647f 100644 --- a/third_party/WebKit/Source/platform/geometry/mac/IntSizeMac.mm +++ b/third_party/WebKit/Source/platform/geometry/mac/IntSizeMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/geometry/IntSize.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp index 272e408..71f1aab 100644 --- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp +++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/BitmapImage.h" #include "platform/PlatformInstrumentation.h"
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp index c8a9715..be56acb 100644 --- a/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp +++ b/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/BitmapImageMetrics.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp index 8f6a2118..fbd1cf81 100644 --- a/third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/BitmapImage.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp index 249ab19..17afeb1 100644 --- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp +++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/Canvas2DLayerBridge.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp index 859b612f74..8b55c2e 100644 --- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Canvas2DLayerBridge.h" #include "SkSurface.h"
diff --git a/third_party/WebKit/Source/platform/graphics/CanvasMetrics.cpp b/third_party/WebKit/Source/platform/graphics/CanvasMetrics.cpp index 29ff842..69fad9e 100644 --- a/third_party/WebKit/Source/platform/graphics/CanvasMetrics.cpp +++ b/third_party/WebKit/Source/platform/graphics/CanvasMetrics.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/CanvasMetrics.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Color.cpp b/third_party/WebKit/Source/platform/graphics/Color.cpp index 3bce2cc..5f2f51ab 100644 --- a/third_party/WebKit/Source/platform/graphics/Color.cpp +++ b/third_party/WebKit/Source/platform/graphics/Color.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Color.h" #include "platform/Decimal.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ColorSpace.cpp b/third_party/WebKit/Source/platform/graphics/ColorSpace.cpp index 092a37154..6ee8895 100644 --- a/third_party/WebKit/Source/platform/graphics/ColorSpace.cpp +++ b/third_party/WebKit/Source/platform/graphics/ColorSpace.cpp
@@ -30,7 +30,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ColorSpace.h" #include "third_party/skia/include/effects/SkTableColorFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/CompositingReasons.cpp b/third_party/WebKit/Source/platform/graphics/CompositingReasons.cpp index dc167ef..dd816ec0 100644 --- a/third_party/WebKit/Source/platform/graphics/CompositingReasons.cpp +++ b/third_party/WebKit/Source/platform/graphics/CompositingReasons.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/CompositingReasons.h" #include "wtf/StdLibExtras.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp index 2361898..e900638 100644 --- a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp +++ b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/ContentLayerDelegate.h" #include "platform/EventTracer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp index 3f0096c..6cec287 100644 --- a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp +++ b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/ContiguousContainer.h" #include "wtf/Allocator.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ContiguousContainerTest.cpp b/third_party/WebKit/Source/platform/graphics/ContiguousContainerTest.cpp index d8b33f8..5afe17d7 100644 --- a/third_party/WebKit/Source/platform/graphics/ContiguousContainerTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/ContiguousContainerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/ContiguousContainer.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp index 19a095c..45eff05 100644 --- a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp +++ b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/CrossfadeGeneratedImage.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp index afc8818..64d6223 100644 --- a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp +++ b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/DecodingImageGenerator.h" #include "platform/PlatformInstrumentation.h" @@ -70,7 +69,7 @@ } PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId); - bool decoded = m_frameGenerator->decodeAndScale(getInfo(), m_frameIndex, pixels, rowBytes); + bool decoded = m_frameGenerator->decodeAndScale(m_frameIndex, getInfo(), pixels, rowBytes); PlatformInstrumentation::didDecodeLazyPixelRef(); return decoded; @@ -92,7 +91,7 @@ *colorSpace = kJPEG_SkYUVColorSpace; PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId); - bool decoded = m_frameGenerator->decodeToYUV(sizes, planes, rowBytes); + bool decoded = m_frameGenerator->decodeToYUV(m_frameIndex, sizes, planes, rowBytes); PlatformInstrumentation::didDecodeLazyPixelRef(); return decoded;
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp index 0005bb59..1411c49 100644 --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/DeferredImageDecoder.h" #include "platform/RuntimeEnabledFeatures.h" @@ -84,18 +83,22 @@ PassRefPtr<SkImage> DeferredImageDecoder::createFrameAtIndex(size_t index) { + if (m_frameGenerator && m_frameGenerator->decodeFailed()) + return nullptr; + prepareLazyDecodedFrames(); if (index < m_frameData.size()) { + FrameData* frameData = &m_frameData[index]; // ImageFrameGenerator has the latest known alpha state. There will be a // performance boost if this frame is opaque. - FrameData* frameData = &m_frameData[index]; + ASSERT(m_frameGenerator); frameData->m_hasAlpha = m_frameGenerator->hasAlpha(index); frameData->m_frameBytes = m_size.area() * sizeof(ImageFrame::PixelData); return createFrameImageAtIndex(index, !frameData->m_hasAlpha); } - if (!m_actualDecoder) + if (!m_actualDecoder || m_actualDecoder->failed()) return nullptr; ImageFrame* frame = m_actualDecoder->frameBufferAtIndex(index);
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp index 18b87b3..417b2c8 100644 --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/DeferredImageDecoder.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/DrawLooperBuilder.cpp b/third_party/WebKit/Source/platform/graphics/DrawLooperBuilder.cpp index 7c16dc9a..3da4428 100644 --- a/third_party/WebKit/Source/platform/graphics/DrawLooperBuilder.cpp +++ b/third_party/WebKit/Source/platform/graphics/DrawLooperBuilder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/DrawLooperBuilder.h" #include "platform/geometry/FloatSize.h"
diff --git a/third_party/WebKit/Source/platform/graphics/FirstPaintInvalidationTracking.cpp b/third_party/WebKit/Source/platform/graphics/FirstPaintInvalidationTracking.cpp index 1646d432..4f532ec2 100644 --- a/third_party/WebKit/Source/platform/graphics/FirstPaintInvalidationTracking.cpp +++ b/third_party/WebKit/Source/platform/graphics/FirstPaintInvalidationTracking.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/FirstPaintInvalidationTracking.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/graphics/FrameData.cpp b/third_party/WebKit/Source/platform/graphics/FrameData.cpp index 43f5943..b510aa9 100644 --- a/third_party/WebKit/Source/platform/graphics/FrameData.cpp +++ b/third_party/WebKit/Source/platform/graphics/FrameData.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/FrameData.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp index 66dc392..dd40c62 100644 --- a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp +++ b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GeneratedImage.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Gradient.cpp b/third_party/WebKit/Source/platform/graphics/Gradient.cpp index 6ac3649..9736e023 100644 --- a/third_party/WebKit/Source/platform/graphics/Gradient.cpp +++ b/third_party/WebKit/Source/platform/graphics/Gradient.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Gradient.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp index 724405a9..a263f82 100644 --- a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp +++ b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GradientGeneratedImage.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp index de15642..b55f9a8 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
@@ -24,7 +24,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GraphicsContext.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp index 0bff604..4db36e06 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/GraphicsContextState.h" #include "platform/graphics/skia/SkiaUtils.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContextTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContextTest.cpp index 9e3f7b3a..d4471a7 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsContextTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsContextTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GraphicsContext.h" #include "platform/graphics/BitmapImage.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp index 09036074..3c57538 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GraphicsLayer.h" #include "SkImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp index 6e60f15..3820b8a 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/GraphicsLayerDebugInfo.h" #include "base/trace_event/trace_event_argument.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp index f05d080b..79ba3f0 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GraphicsLayer.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsTypes.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsTypes.cpp index 8f9c69b..ccdccb2 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsTypes.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsTypes.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/GraphicsTypes.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsTypes.h b/third_party/WebKit/Source/platform/graphics/GraphicsTypes.h index fa3461f8..4f73466 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsTypes.h +++ b/third_party/WebKit/Source/platform/graphics/GraphicsTypes.h
@@ -31,6 +31,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "wtf/Forward.h" +#include "wtf/build_config.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/Image.cpp b/third_party/WebKit/Source/platform/graphics/Image.cpp index 413d1a4..4b2a66f 100644 --- a/third_party/WebKit/Source/platform/graphics/Image.cpp +++ b/third_party/WebKit/Source/platform/graphics/Image.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Image.h" #include "platform/Length.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp index 53c7d44..a8385663 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
@@ -30,7 +30,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageBuffer.h" #include "GrContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp index de6f39f5..9bf6079 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/ImageBufferSurface.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp index a488419..57db466 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageDecodingStore.h" #include "platform/TraceEvent.h" @@ -55,7 +54,7 @@ ImageDecodingStore& ImageDecodingStore::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ImageDecodingStore, store, ImageDecodingStore::create().leakPtr()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ImageDecodingStore, store, ImageDecodingStore::create().leakPtr()); return store; }
diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp index dcf5163..bfea0da 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageDecodingStore.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp index 39a11f9..09f931bb 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/ImageFrameGenerator.h" #include "SkData.h" @@ -104,8 +102,7 @@ : m_fullSize(fullSize) , m_data(adoptRef(new ThreadSafeDataTransport())) , m_isMultiFrame(isMultiFrame) - , m_decodeFailedAndEmpty(false) - , m_decodeCount(0) + , m_decodeFailed(false) , m_frameCount(0) , m_encodedData(nullptr) { @@ -175,25 +172,23 @@ return m_encodedData; } -bool ImageFrameGenerator::decodeAndScale(const SkImageInfo& info, size_t index, void* pixels, size_t rowBytes) +bool ImageFrameGenerator::decodeAndScale(size_t index, const SkImageInfo& info, void* pixels, size_t rowBytes) { - // This method is called to populate a discardable memory owned by Skia. - - // Prevents concurrent decode or scale operations on the same image data. + // Prevent concurrent decode or scale operations on the same image data. MutexLocker lock(m_decodeMutex); + if (m_decodeFailed) + return false; + + TRACE_EVENT1("blink", "ImageFrameGenerator::decodeAndScale", "frame index", static_cast<int>(index)); + + m_externalAllocator = adoptPtr(new ExternalMemoryAllocator(info, pixels, rowBytes)); + // This implementation does not support scaling so check the requested size. SkISize scaledSize = SkISize::Make(info.width(), info.height()); ASSERT(m_fullSize == scaledSize); - if (m_decodeFailedAndEmpty) - return false; - - TRACE_EVENT2("blink", "ImageFrameGenerator::decodeAndScale", "generator", this, "decodeCount", m_decodeCount); - - m_externalAllocator = adoptPtr(new ExternalMemoryAllocator(info, pixels, rowBytes)); - - SkBitmap bitmap = tryToResumeDecode(scaledSize, index); + SkBitmap bitmap = tryToResumeDecode(index, scaledSize); if (bitmap.isNull()) return false; @@ -201,29 +196,25 @@ // that we do not own. m_externalAllocator.clear(); + // Check to see if the decoder has written directly to the pixel memory + // provided. If not, make a copy. ASSERT(bitmap.width() == scaledSize.width()); ASSERT(bitmap.height() == scaledSize.height()); - - bool result = true; SkAutoLockPixels bitmapLock(bitmap); - // Check to see if decoder has written directly to the memory provided - // by Skia. If not make a copy. if (bitmap.getPixels() != pixels) - result = bitmap.copyPixelsTo(pixels, rowBytes * info.height(), rowBytes); - return result; + return bitmap.copyPixelsTo(pixels, rowBytes * info.height(), rowBytes); + return true; } -bool ImageFrameGenerator::decodeToYUV(SkISize componentSizes[3], void* planes[3], size_t rowBytes[3]) +bool ImageFrameGenerator::decodeToYUV(size_t index, SkISize componentSizes[3], void* planes[3], size_t rowBytes[3]) { - // This method is called to populate a discardable memory owned by Skia. - - // Prevents concurrent decode or scale operations on the same image data. + // Prevent concurrent decode or scale operations on the same image data. MutexLocker lock(m_decodeMutex); - if (m_decodeFailedAndEmpty) + if (m_decodeFailed) return false; - TRACE_EVENT2("blink", "ImageFrameGenerator::decodeToYUV", "generator", this, "decodeCount", static_cast<int>(m_decodeCount)); + TRACE_EVENT1("blink", "ImageFrameGenerator::decodeToYUV", "frame index", static_cast<int>(index)); if (!planes || !planes[0] || !planes[1] || !planes[2] || !rowBytes || !rowBytes[0] || !rowBytes[1] || !rowBytes[2]) { @@ -249,15 +240,19 @@ bool sizeUpdated = updateYUVComponentSizes(decoder.get(), componentSizes, ImageDecoder::ActualSize); RELEASE_ASSERT(sizeUpdated); - bool yuvDecoded = decoder->decodeToYUV(); - if (yuvDecoded) + if (decoder->decodeToYUV()) { setHasAlpha(0, false); // YUV is always opaque - return yuvDecoded; + return true; + } + + ASSERT(decoder->failed()); + m_decodeFailed = true; + return false; } -SkBitmap ImageFrameGenerator::tryToResumeDecode(const SkISize& scaledSize, size_t index) +SkBitmap ImageFrameGenerator::tryToResumeDecode(size_t index, const SkISize& scaledSize) { - TRACE_EVENT1("blink", "ImageFrameGenerator::tryToResumeDecodeAndScale", "index", static_cast<int>(index)); + TRACE_EVENT1("blink", "ImageFrameGenerator::tryToResumeDecode", "frame index", static_cast<int>(index)); ImageDecoder* decoder = 0; const bool resumeDecoding = ImageDecodingStore::instance().lockDecoder(this, m_fullSize, &decoder); @@ -280,10 +275,9 @@ decoderContainer = adoptPtr(decoder); if (fullSizeImage.isNull()) { - // If decode has failed and resulted an empty image we can save work - // in the future by returning early. - m_decodeFailedAndEmpty = !m_isMultiFrame && decoder->failed(); - + // If decoding has failed, we can save work in the future by + // ignoring further requests to decode the image. + m_decodeFailed = decoder->failed(); if (resumeDecoding) ImageDecodingStore::instance().unlockDecoder(this, decoder); return SkBitmap(); @@ -334,13 +328,13 @@ { TRACE_EVENT2("blink", "ImageFrameGenerator::decode", "width", m_fullSize.width(), "height", m_fullSize.height()); - ASSERT(decoder); SharedBuffer* data = 0; bool allDataReceived = false; - bool newDecoder = false; m_data->data(&data, &allDataReceived); // Try to create an ImageDecoder if we are not given one. + ASSERT(decoder); + bool newDecoder = false; if (!*decoder) { newDecoder = true; if (m_imageDecoderFactory) @@ -359,9 +353,10 @@ ASSERT(m_externalAllocator.get()); (*decoder)->setMemoryAllocator(m_externalAllocator.get()); } - (*decoder)->setData(data, allDataReceived); + (*decoder)->setData(data, allDataReceived); ImageFrame* frame = (*decoder)->frameBufferAtIndex(index); + // For multi-frame image decoders, we need to know how many frames are // in that image in order to release the decoder when all frames are // decoded. frameCount() is reliable only if all data is received and set in @@ -380,12 +375,13 @@ // Or we have received all data. The image might not be fully decoded in // the latter case. const bool isDecodeComplete = frame->status() == ImageFrame::FrameComplete || allDataReceived; + SkBitmap fullSizeBitmap = frame->getSkBitmap(); - if (!fullSizeBitmap.isNull()) - { + if (!fullSizeBitmap.isNull()) { ASSERT(fullSizeBitmap.width() == m_fullSize.width() && fullSizeBitmap.height() == m_fullSize.height()); setHasAlpha(index, !fullSizeBitmap.isOpaque()); } + *bitmap = fullSizeBitmap; return isDecodeComplete; } @@ -400,8 +396,6 @@ bool ImageFrameGenerator::getYUVComponentSizes(SkISize componentSizes[3]) { - ASSERT(componentSizes); - TRACE_EVENT2("blink", "ImageFrameGenerator::getYUVComponentSizes", "width", m_fullSize.width(), "height", m_fullSize.height()); SharedBuffer* data = 0; @@ -421,6 +415,7 @@ OwnPtr<ImagePlanes> dummyImagePlanes = adoptPtr(new ImagePlanes); decoder->setImagePlanes(dummyImagePlanes.release()); + ASSERT(componentSizes); return updateYUVComponentSizes(decoder.get(), componentSizes, ImageDecoder::SizeForMemoryAllocation); }
diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h index 2924cad..a177341 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
@@ -67,25 +67,25 @@ ~ImageFrameGenerator(); - // Decodes and scales the specified frame at |index|. The dimensions and output - // format are given in SkImageInfo. Decoded pixels are written into |pixels| with - // a stride of |rowBytes|. Returns true if decoding was successful. - bool decodeAndScale(const SkImageInfo&, size_t index, void* pixels, size_t rowBytes); - - // Decodes YUV components directly into the provided memory planes. - bool decodeToYUV(SkISize componentSizes[3], void* planes[3], size_t rowBytes[3]); - void setData(PassRefPtr<SharedBuffer>, bool allDataReceived); // Return our encoded image data. Caller takes ownership and must unref the data - // according to the contract SkImageGenerator::refEncodedData. - // - // Returns null if image is not fully received. + // according to the contract SkImageGenerator::refEncodedData. Returns null if + // the data is has not been fully received. SkData* refEncodedData(); + // Decodes and scales the specified frame at |index|. The dimensions and output + // format are given in SkImageInfo. Decoded pixels are written into |pixels| with + // a stride of |rowBytes|. Returns true if decoding was successful. + bool decodeAndScale(size_t index, const SkImageInfo&, void* pixels, size_t rowBytes); + + // Decodes YUV components directly into the provided memory planes. + bool decodeToYUV(size_t index, SkISize componentSizes[3], void* planes[3], size_t rowBytes[3]); + const SkISize& getFullSize() const { return m_fullSize; } bool isMultiFrame() const { return m_isMultiFrame; } + bool decodeFailed() const { return m_decodeFailed; } bool hasAlpha(size_t index); @@ -102,10 +102,7 @@ void setHasAlpha(size_t index, bool hasAlpha); // These methods are called while m_decodeMutex is locked. - SkBitmap tryToResumeDecode(const SkISize& scaledSize, size_t index); - - // Use the given decoder to decode. If a decoder is not given then try to create one. - // Returns true if decoding was complete. + SkBitmap tryToResumeDecode(size_t index, const SkISize& scaledSize); bool decode(size_t index, ImageDecoder**, SkBitmap*); SkISize m_fullSize; @@ -114,12 +111,12 @@ // In case that ImageFrameGenerator get's deleted before m_encodedData, // m_encodedData would hold the reference to it (and underlying data). RefPtr<ThreadSafeDataTransport> m_data; + bool m_isMultiFrame; - bool m_decodeFailedAndEmpty; - Vector<bool> m_hasAlpha; - int m_decodeCount; - Vector<bool> m_frameComplete; + bool m_decodeFailed; size_t m_frameCount; + Vector<bool> m_hasAlpha; + Vector<bool> m_frameComplete; class ExternalMemoryAllocator; OwnPtr<ExternalMemoryAllocator> m_externalAllocator;
diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp index 94c88b42..9edaf38 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageFrameGenerator.h" #include "platform/SharedBuffer.h" @@ -128,11 +127,11 @@ setFrameStatus(ImageFrame::FramePartial); char buffer[100 * 100 * 4]; - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(1, m_decodeRequestCount); addNewData(); - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(2, m_decodeRequestCount); EXPECT_EQ(0, m_decodersDestroyed); } @@ -142,26 +141,26 @@ setFrameStatus(ImageFrame::FramePartial); char buffer[100 * 100 * 4]; - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(1, m_decodeRequestCount); EXPECT_EQ(0, m_decodersDestroyed); setFrameStatus(ImageFrame::FrameComplete); addNewData(); - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(2, m_decodeRequestCount); EXPECT_EQ(1, m_decodersDestroyed); // Decoder created again. - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(3, m_decodeRequestCount); } static void decodeThreadMain(ImageFrameGenerator* generator) { char buffer[100 * 100 * 4]; - generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); } static void decodeThreadWithRefEncodedMain(ImageFrameGenerator* generator) @@ -169,7 +168,7 @@ // Image must be complete - refEncodedData otherwise returns null. char buffer[100 * 100 * 4]; SkData* data = generator->refEncodedData(); - generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); data->unref(); } @@ -178,7 +177,7 @@ setFrameStatus(ImageFrame::FramePartial); char buffer[100 * 100 * 4]; - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(1, m_decodeRequestCount); EXPECT_EQ(0, m_decodersDestroyed); SkData* data = m_generator->refEncodedData(); @@ -198,7 +197,7 @@ EXPECT_EQ(1, m_decodersDestroyed); // Decoder created again. - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(3, m_decodeRequestCount); addNewData(true); @@ -231,7 +230,7 @@ setFrameStatus(ImageFrame::FramePartial); char buffer[100 * 100 * 4]; - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_TRUE(m_generator->hasAlpha(0)); EXPECT_EQ(1, m_decodeRequestCount); @@ -243,7 +242,7 @@ EXPECT_EQ(2, m_decodeRequestCount); setFrameStatus(ImageFrame::FrameComplete); - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(3, m_decodeRequestCount); EXPECT_FALSE(m_generator->hasAlpha(0)); } @@ -254,20 +253,20 @@ setFrameStatus(ImageFrame::FrameComplete); char buffer[100 * 100 * 4]; - m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4); + m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4); EXPECT_EQ(1, m_decodeRequestCount); EXPECT_EQ(0, m_decodersDestroyed); setFrameStatus(ImageFrame::FrameComplete); - m_generator->decodeAndScale(imageInfo(), 1, buffer, 100 * 4); + m_generator->decodeAndScale(1, imageInfo(), buffer, 100 * 4); EXPECT_EQ(2, m_decodeRequestCount); EXPECT_EQ(0, m_decodersDestroyed); setFrameStatus(ImageFrame::FrameComplete); // Multi frame decoder should be removed. - m_generator->decodeAndScale(imageInfo(), 2, buffer, 100 * 4); + m_generator->decodeAndScale(2, imageInfo(), buffer, 100 * 4); EXPECT_EQ(3, m_decodeRequestCount); EXPECT_EQ(1, m_decodersDestroyed); }
diff --git a/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp index c568d06..93bc634 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Image.h" #include "platform/graphics/GraphicsLayer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageObserver.cpp b/third_party/WebKit/Source/platform/graphics/ImageObserver.cpp index d6c9753..8138afb 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageObserver.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageObserver.cpp
@@ -27,8 +27,6 @@ * */ -#include "config.h" - #include "platform/graphics/ImageObserver.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/ImageOrientation.cpp b/third_party/WebKit/Source/platform/graphics/ImageOrientation.cpp index c78ca06..7a8d9c3 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageOrientation.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageOrientation.cpp
@@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageOrientation.h" #include "platform/transforms/AffineTransform.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp index 584246d..1db843e 100644 --- a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/ImagePattern.h" #include "platform/graphics/Image.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ImageSource.cpp b/third_party/WebKit/Source/platform/graphics/ImageSource.cpp index 2fbb2f15..8cd7c12e 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageSource.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageSource.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ImageSource.h" #include "platform/graphics/DeferredImageDecoder.h"
diff --git a/third_party/WebKit/Source/platform/graphics/InterceptingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/InterceptingCanvas.cpp index 66907aa..8b01797 100644 --- a/third_party/WebKit/Source/platform/graphics/InterceptingCanvas.cpp +++ b/third_party/WebKit/Source/platform/graphics/InterceptingCanvas.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/InterceptingCanvas.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp index d5482ef..8daec2f 100644 --- a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp +++ b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/LoggingCanvas.h" #include "platform/geometry/IntSize.h"
diff --git a/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.cpp b/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.cpp index 67f6aa8..44264bf 100644 --- a/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.cpp +++ b/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/PaintInvalidationReason.h" #include "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Path.cpp b/third_party/WebKit/Source/platform/graphics/Path.cpp index 069ce1e..c54308e5 100644 --- a/third_party/WebKit/Source/platform/graphics/Path.cpp +++ b/third_party/WebKit/Source/platform/graphics/Path.cpp
@@ -27,7 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Path.h" #include <math.h>
diff --git a/third_party/WebKit/Source/platform/graphics/PathTraversalState.cpp b/third_party/WebKit/Source/platform/graphics/PathTraversalState.cpp index 3919933..fb0e2df 100644 --- a/third_party/WebKit/Source/platform/graphics/PathTraversalState.cpp +++ b/third_party/WebKit/Source/platform/graphics/PathTraversalState.cpp
@@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/PathTraversalState.h" #include "wtf/MathExtras.h"
diff --git a/third_party/WebKit/Source/platform/graphics/Pattern.cpp b/third_party/WebKit/Source/platform/graphics/Pattern.cpp index c40d01e..ce773d5 100644 --- a/third_party/WebKit/Source/platform/graphics/Pattern.cpp +++ b/third_party/WebKit/Source/platform/graphics/Pattern.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/Pattern.h" #include "platform/graphics/ImagePattern.h"
diff --git a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp index c2a4f02e..40c817d 100644 --- a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp +++ b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/PicturePattern.h" #include "platform/graphics/skia/SkiaUtils.h"
diff --git a/third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp b/third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp index d6c7ead7..2746fbf2 100644 --- a/third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp +++ b/third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/PictureSnapshot.h" #include "platform/geometry/IntSize.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ProfilingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/ProfilingCanvas.cpp index 25c390e..cc0db65 100644 --- a/third_party/WebKit/Source/platform/graphics/ProfilingCanvas.cpp +++ b/third_party/WebKit/Source/platform/graphics/ProfilingCanvas.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ProfilingCanvas.h" #include "wtf/CurrentTime.h"
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp index a995604..191cb3f1 100644 --- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp +++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" - #include "platform/graphics/RecordingImageBufferSurface.h" #include "platform/graphics/CanvasMetrics.h"
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp index e504997a..fc35e53 100644 --- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/RecordingImageBufferSurface.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ReplayingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/ReplayingCanvas.cpp index 7e0929c..0a46cc07 100644 --- a/third_party/WebKit/Source/platform/graphics/ReplayingCanvas.cpp +++ b/third_party/WebKit/Source/platform/graphics/ReplayingCanvas.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ReplayingCanvas.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp index 01099ae..2e73786 100644 --- a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp +++ b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/StaticBitmapImage.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/StrokeData.cpp b/third_party/WebKit/Source/platform/graphics/StrokeData.cpp index 25cc92e..aa7b44d5 100644 --- a/third_party/WebKit/Source/platform/graphics/StrokeData.cpp +++ b/third_party/WebKit/Source/platform/graphics/StrokeData.cpp
@@ -26,7 +26,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "config.h" #include "platform/graphics/StrokeData.h" #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransport.cpp b/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransport.cpp index 36bdece4..f191017a 100644 --- a/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransport.cpp +++ b/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransport.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/ThreadSafeDataTransport.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransportTest.cpp b/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransportTest.cpp index 5bb116f..69462ec 100644 --- a/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransportTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/ThreadSafeDataTransportTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/ThreadSafeDataTransport.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp index 465ed70..525c77b 100644 --- a/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp +++ b/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/UnacceleratedImageBufferSurface.h" #include "third_party/skia/include/core/SkSurface.h"
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp index dde06b2..0bce706 100644 --- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp +++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/compositing/PaintArtifactCompositor.h" #include "cc/layers/layer.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/DistantLightSource.cpp b/third_party/WebKit/Source/platform/graphics/filters/DistantLightSource.cpp index 33792d3b..cb86800 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/DistantLightSource.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/DistantLightSource.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/DistantLightSource.h" #include "platform/text/TextStream.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp index 30585dd1..0d5c326 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEBlend.h" #include "SkXfermodeImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp index 49581f63..ae68a85d 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEColorMatrix.h" #include "SkColorFilterImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEComponentTransfer.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEComponentTransfer.cpp index 084b96a..2b372e3 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEComponentTransfer.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEComponentTransfer.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEComponentTransfer.h" #include "SkColorFilterImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp index f5689e0..eec1dcf 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEComposite.cpp
@@ -22,8 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "platform/graphics/filters/FEComposite.h" #include "SkArithmeticMode.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp index b96fad7b..585cce04 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEConvolveMatrix.h" #include "SkMatrixConvolutionImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEDiffuseLighting.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEDiffuseLighting.cpp index 8429690d..bfb899a5 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEDiffuseLighting.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEDiffuseLighting.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEDiffuseLighting.h" #include "platform/graphics/filters/LightSource.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp index 8c0891369..789b353 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEDisplacementMap.h" #include "SkDisplacementMapEffect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEDropShadow.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEDropShadow.cpp index 0087be86..47097abf 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEDropShadow.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEDropShadow.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEDropShadow.h" #include "platform/graphics/filters/FEGaussianBlur.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp index bed2a4a..3a2d198 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEFlood.h" #include "SkColorFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEGaussianBlur.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEGaussianBlur.cpp index 57bf7d2..e454510eb 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEGaussianBlur.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEGaussianBlur.cpp
@@ -23,8 +23,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "platform/graphics/filters/FEGaussianBlur.h" #include "platform/graphics/filters/Filter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FELighting.cpp b/third_party/WebKit/Source/platform/graphics/filters/FELighting.cpp index 39c7d46..53d164f 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FELighting.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FELighting.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/FELighting.h" #include "SkLightingImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp index 0919f97e..20ac88d 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEMerge.h" #include "SkMergeImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEMorphology.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEMorphology.cpp index 3ffde18..cbb0e7e 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEMorphology.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEMorphology.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEMorphology.h" #include "SkMorphologyImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEOffset.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEOffset.cpp index d814b2b..3425716 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FEOffset.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FEOffset.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FEOffset.h" #include "SkOffsetImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FESpecularLighting.cpp b/third_party/WebKit/Source/platform/graphics/filters/FESpecularLighting.cpp index b4b39609..29962d2 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FESpecularLighting.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FESpecularLighting.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FESpecularLighting.h" #include "platform/graphics/filters/LightSource.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FETile.cpp b/third_party/WebKit/Source/platform/graphics/filters/FETile.cpp index 62ba539..8de356e 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FETile.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FETile.cpp
@@ -19,11 +19,9 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FETile.h" #include "SkTileImageFilter.h" - #include "platform/graphics/filters/Filter.h" #include "platform/graphics/filters/SkiaImageFilterBuilder.h" #include "platform/text/TextStream.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp b/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp index f6628a2..1a102d9 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp
@@ -23,7 +23,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FETurbulence.h" #include "SkPerlinNoiseShader.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/Filter.cpp b/third_party/WebKit/Source/platform/graphics/filters/Filter.cpp index 22ba718..3749b3b 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/Filter.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/Filter.cpp
@@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/Filter.h" #include "platform/graphics/filters/FilterEffect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp index 8965d1aa..c4c1d8f 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
@@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/FilterEffect.h" #include "platform/graphics/filters/Filter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp index ecd6c94e..de02f03 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp
@@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/graphics/filters/FilterOperation.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp index f3f30246..b584588 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/FilterOperations.h" #include "platform/LengthFunctions.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterOperationsTest.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterOperationsTest.cpp index 0199765..8bc9a28 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/FilterOperationsTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterOperationsTest.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/FilterOperations.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/ImageFilterBuilderTest.cpp b/third_party/WebKit/Source/platform/graphics/filters/ImageFilterBuilderTest.cpp index 4a886ba..c8c5ee5c 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/ImageFilterBuilderTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/ImageFilterBuilderTest.cpp
@@ -22,8 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "SkImageFilter.h" #include "platform/graphics/filters/FEBlend.h" #include "platform/graphics/filters/FEGaussianBlur.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/LightSource.cpp b/third_party/WebKit/Source/platform/graphics/filters/LightSource.cpp index 6712d64..d2bc9c8e 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/LightSource.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/LightSource.cpp
@@ -27,8 +27,6 @@ * */ -#include "config.h" - #include "platform/graphics/filters/LightSource.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/filters/PointLightSource.cpp b/third_party/WebKit/Source/platform/graphics/filters/PointLightSource.cpp index 7afc3fb..816b080 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/PointLightSource.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/PointLightSource.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/PointLightSource.h" #include "platform/text/TextStream.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp index 84388bd..94171b2 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/SkiaImageFilterBuilder.h" #include "SkBlurImageFilter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/SourceAlpha.cpp b/third_party/WebKit/Source/platform/graphics/filters/SourceAlpha.cpp index 3491602e..0ea1b368 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/SourceAlpha.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/SourceAlpha.cpp
@@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/graphics/filters/SourceAlpha.h" #include "platform/graphics/filters/Filter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/SourceGraphic.cpp b/third_party/WebKit/Source/platform/graphics/filters/SourceGraphic.cpp index 34760867..f0a6db8 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/SourceGraphic.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/SourceGraphic.cpp
@@ -18,8 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "platform/graphics/filters/SourceGraphic.h" #include "platform/graphics/filters/Filter.h"
diff --git a/third_party/WebKit/Source/platform/graphics/filters/SpotLightSource.cpp b/third_party/WebKit/Source/platform/graphics/filters/SpotLightSource.cpp index 2eb311e..6b0b613 100644 --- a/third_party/WebKit/Source/platform/graphics/filters/SpotLightSource.cpp +++ b/third_party/WebKit/Source/platform/graphics/filters/SpotLightSource.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/filters/SpotLightSource.h" #include "platform/text/TextStream.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp index f7a1a94..1a8e508 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/gpu/AcceleratedImageBufferSurface.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp index f2025cf..85baf065 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/gpu/DrawingBuffer.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp index 99280ede..fe8d37ad 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/gpu/DrawingBuffer.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp b/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp index 950b8fa5..47af1934 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/gpu/Extensions3DUtil.h" #include "public/platform/WebGraphicsContext3D.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp index a16cbbf..0d5868f4 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/gpu/SharedContextRateLimiter.h" #include "platform/graphics/gpu/Extensions3DUtil.h"
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp index 2961aa9..94ed963 100644 --- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp +++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/gpu/WebGLImageConversion.h" #include "platform/CheckedInt.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.cpp index 5937362f..2b72943 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/ClipDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/ClipDisplayItem.h" #include "platform/geometry/FloatRoundedRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ClipPathDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/ClipPathDisplayItem.cpp index cc2f698..3adc83a 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ClipPathDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/ClipPathDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/ClipPathDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ClipPathRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/ClipPathRecorder.cpp index 71f35b5..7d91ca5 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ClipPathRecorder.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/ClipPathRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/ClipPathRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ClipRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/ClipRecorder.cpp index 0aad9f2..83d52e3 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ClipRecorder.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/ClipRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/ClipRecorder.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/CompositingDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/CompositingDisplayItem.cpp index efe7bdd..cd12538 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/CompositingDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/CompositingDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/CompositingDisplayItem.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/CullRect.cpp b/third_party/WebKit/Source/platform/graphics/paint/CullRect.cpp index 0ad4b18..ab20caff4 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/CullRect.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/CullRect.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/CullRect.h" #include "platform/geometry/FloatRect.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.cpp index a31f2049..91ef4a1e 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DisplayItem.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.cpp b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.cpp index 560beea..eeb5b2f 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DisplayItemClient.h" #if ENABLE(ASSERT)
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClientTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClientTest.cpp index 78db3532..d27e975 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClientTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemClientTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DisplayItemClient.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemTest.cpp index 9e830e17..4e856972 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DisplayItem.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp index 9169256..8fca123 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DrawingDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp index f74205e..cb396f6 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/DrawingRecorder.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.cpp index 5c2cf44..2b3504a 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/FilterDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/FixedPositionContainerDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/FixedPositionContainerDisplayItem.cpp index 494763a0..ba24719c 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/FixedPositionContainerDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/FixedPositionContainerDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/FixedPositionContainerDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/FixedPositionDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/FixedPositionDisplayItem.cpp index bac5c245..c5ec99e 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/FixedPositionDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/FixedPositionDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/FixedPositionDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/FloatClipDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/FloatClipDisplayItem.cpp index 0da9362..b2f3552 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/FloatClipDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/FloatClipDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/FloatClipDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifact.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifact.cpp index 4f304e2e7..1cdb64b 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifact.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifact.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintArtifact.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvas.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvas.cpp index 292cc66..4c3c8902 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvas.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvas.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintArtifactToSkCanvas.h" #include "platform/graphics/paint/ClipPaintPropertyNode.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp index 3fd07b4..829b38b 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintArtifactToSkCanvas.h" #include "platform/graphics/paint/DisplayItem.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp index 7e482d9..9fc9cb0a 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintChunker.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp index 58dbe49..e6821e5 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintChunker.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp index d62b350..2bd50f9f 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintController.h" #include "platform/NotImplemented.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp index 633ad04..7ac677e9 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/PaintController.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/ScrollDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/ScrollDisplayItem.cpp index 8bbd095..d8f33504 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/ScrollDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/ScrollDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/ScrollDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/SubsequenceRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/SubsequenceRecorder.cpp index e7e79cf1..62524cf 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/SubsequenceRecorder.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/SubsequenceRecorder.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/SubsequenceRecorder.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.cpp index e537b3b..cf630ac8 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/Transform3DDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/paint/TransformDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/TransformDisplayItem.cpp index 60fa693..0f5d153 100644 --- a/third_party/WebKit/Source/platform/graphics/paint/TransformDisplayItem.cpp +++ b/third_party/WebKit/Source/platform/graphics/paint/TransformDisplayItem.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/paint/TransformDisplayItem.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.cpp b/third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.cpp index 09a03c4..aaedaf7 100644 --- a/third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.cpp +++ b/third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/skia/ImagePixelLocker.h" #include "third_party/skia/include/core/SkImage.h"
diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp index 4a597d1..589e464 100644 --- a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp +++ b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/graphics/skia/SkiaUtils.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/graphics/test/FakeGraphicsLayerFactory.cpp b/third_party/WebKit/Source/platform/graphics/test/FakeGraphicsLayerFactory.cpp index 5039db3..3709438 100644 --- a/third_party/WebKit/Source/platform/graphics/test/FakeGraphicsLayerFactory.cpp +++ b/third_party/WebKit/Source/platform/graphics/test/FakeGraphicsLayerFactory.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/graphics/test/FakeGraphicsLayerFactory.h" #include "platform/graphics/GraphicsLayer.h"
diff --git a/third_party/WebKit/Source/platform/heap/BlinkGCInterruptor.cpp b/third_party/WebKit/Source/platform/heap/BlinkGCInterruptor.cpp index d578dd2..464a050c7 100644 --- a/third_party/WebKit/Source/platform/heap/BlinkGCInterruptor.cpp +++ b/third_party/WebKit/Source/platform/heap/BlinkGCInterruptor.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/BlinkGCInterruptor.h" #include "platform/heap/BlinkGC.h"
diff --git a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp index eff0257..6f4f4e7 100644 --- a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp +++ b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/BlinkGCMemoryDumpProvider.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProviderTest.cpp b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProviderTest.cpp index 5ca3a5ad..cd4259a 100644 --- a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProviderTest.cpp +++ b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProviderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/BlinkGCMemoryDumpProvider.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/heap/CallbackStack.cpp b/third_party/WebKit/Source/platform/heap/CallbackStack.cpp index 7f1b7bd..b1fd763 100644 --- a/third_party/WebKit/Source/platform/heap/CallbackStack.cpp +++ b/third_party/WebKit/Source/platform/heap/CallbackStack.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/CallbackStack.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/heap/GCInfo.cpp b/third_party/WebKit/Source/platform/heap/GCInfo.cpp index db5f87e..d97508d2 100644 --- a/third_party/WebKit/Source/platform/heap/GCInfo.cpp +++ b/third_party/WebKit/Source/platform/heap/GCInfo.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/GCInfo.h" #include "platform/heap/Handle.h" @@ -22,7 +21,7 @@ ASSERT(gcInfo); ASSERT(gcInfoIndexSlot); // Keep a global GCInfoTable lock while allocating a new slot. - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); MutexLocker locker(mutex); // If more than one thread ends up allocating a slot for
diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp index 8d17306..1b27d1e49 100644 --- a/third_party/WebKit/Source/platform/heap/Heap.cpp +++ b/third_party/WebKit/Source/platform/heap/Heap.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/heap/Heap.h" #include "platform/ScriptForbiddenScope.h" @@ -655,7 +654,7 @@ static Mutex& regionTreeMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; }
diff --git a/third_party/WebKit/Source/platform/heap/HeapAllocator.cpp b/third_party/WebKit/Source/platform/heap/HeapAllocator.cpp index d78e072..45f1d04f 100644 --- a/third_party/WebKit/Source/platform/heap/HeapAllocator.cpp +++ b/third_party/WebKit/Source/platform/heap/HeapAllocator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/HeapAllocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/heap/HeapPage.cpp b/third_party/WebKit/Source/platform/heap/HeapPage.cpp index 40fe3cf..48fef56b 100644 --- a/third_party/WebKit/Source/platform/heap/HeapPage.cpp +++ b/third_party/WebKit/Source/platform/heap/HeapPage.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/heap/HeapPage.h" #include "platform/ScriptForbiddenScope.h"
diff --git a/third_party/WebKit/Source/platform/heap/HeapTest.cpp b/third_party/WebKit/Source/platform/heap/HeapTest.cpp index f4cadcf23..22bceda 100644 --- a/third_party/WebKit/Source/platform/heap/HeapTest.cpp +++ b/third_party/WebKit/Source/platform/heap/HeapTest.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/Task.h" #include "platform/ThreadSafeFunctional.h" #include "platform/heap/Handle.h" @@ -5321,13 +5319,13 @@ static Mutex& mainThreadMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mainMutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mainMutex, new Mutex); return mainMutex; } static ThreadCondition& mainThreadCondition() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadCondition, mainCondition, new ThreadCondition); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadCondition, mainCondition, new ThreadCondition); return mainCondition; } @@ -5344,13 +5342,13 @@ static Mutex& workerThreadMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, workerMutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, workerMutex, new Mutex); return workerMutex; } static ThreadCondition& workerThreadCondition() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadCondition, workerCondition, new ThreadCondition); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadCondition, workerCondition, new ThreadCondition); return workerCondition; } @@ -5645,7 +5643,7 @@ static RecursiveMutex& recursiveMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, recursiveMutex, new RecursiveMutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, recursiveMutex, new RecursiveMutex); return recursiveMutex; }
diff --git a/third_party/WebKit/Source/platform/heap/PagePool.cpp b/third_party/WebKit/Source/platform/heap/PagePool.cpp index f88e90c..9bda5c0 100644 --- a/third_party/WebKit/Source/platform/heap/PagePool.cpp +++ b/third_party/WebKit/Source/platform/heap/PagePool.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/PagePool.h" #include "platform/heap/Heap.h"
diff --git a/third_party/WebKit/Source/platform/heap/PersistentNode.cpp b/third_party/WebKit/Source/platform/heap/PersistentNode.cpp index 2e986858..abd7a12 100644 --- a/third_party/WebKit/Source/platform/heap/PersistentNode.cpp +++ b/third_party/WebKit/Source/platform/heap/PersistentNode.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/PersistentNode.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp index 3a74f389..b26e137 100644 --- a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp +++ b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/EventTracer.h" #include "platform/heap/Heap.h" #include "wtf/MainThread.h"
diff --git a/third_party/WebKit/Source/platform/heap/SafePoint.cpp b/third_party/WebKit/Source/platform/heap/SafePoint.cpp index c057450..a75bb50 100644 --- a/third_party/WebKit/Source/platform/heap/SafePoint.cpp +++ b/third_party/WebKit/Source/platform/heap/SafePoint.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/SafePoint.h" #include "wtf/Atomics.h"
diff --git a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp index b2203cd..8e45976 100644 --- a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +++ b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/heap/StackFrameDepth.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp index 26ede92f..4b07285 100644 --- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp +++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/heap/ThreadState.h" #include "platform/ScriptForbiddenScope.h" @@ -75,7 +74,7 @@ RecursiveMutex& ThreadState::threadAttachMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, mutex, (new RecursiveMutex)); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, mutex, (new RecursiveMutex)); return mutex; } @@ -494,7 +493,7 @@ CrossThreadPersistentRegion& ThreadState::crossThreadPersistentRegion() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(CrossThreadPersistentRegion, persistentRegion, new CrossThreadPersistentRegion()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(CrossThreadPersistentRegion, persistentRegion, new CrossThreadPersistentRegion()); return persistentRegion; }
diff --git a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReader.cpp b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReader.cpp index 58177d26..a64f4d7 100644 --- a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReader.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReader.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/FastSharedBufferReader.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp index e50fbcc8..3ea9aa0 100644 --- a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/FastSharedBufferReader.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp index 9e2eae5..b660c66 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
@@ -18,7 +18,6 @@ * */ -#include "config.h" #include "platform/image-decoders/ImageDecoder.h" #include "platform/PlatformInstrumentation.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h index 69a73f78..2ebd7797c 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
@@ -255,7 +255,7 @@ static qcms_profile* qcmsOutputDeviceProfile() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile); + DEFINE_THREAD_SAFE_STATIC_LOCAL(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile); return outputDeviceProfile.profile(); }
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp index b0195eb..dc5ee509 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/ImageDecoder.h" #include "platform/image-decoders/ImageFrame.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp index 82758688..7c79270f 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/image-decoders/ImageDecoderTestHelpers.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp index 3b75b8c..8e47908 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/ImageDecoder.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp index 9e7372e..1768bf3 100644 --- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/bmp/BMPImageDecoder.h" #include "platform/image-decoders/FastSharedBufferReader.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp index f04f31c8..4e039549 100644 --- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/image-decoders/bmp/BMPImageDecoder.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp index 1fdb685b..f6999fd 100644 --- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/bmp/BMPImageReader.h" namespace {
diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp index 07dd9de..cc5954e 100644 --- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/gif/GIFImageDecoder.h" #include <limits>
diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp index b7a206a..a252a41 100644 --- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/gif/GIFImageDecoder.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp index 39ce3346..4c6631d 100644 --- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp
@@ -72,7 +72,6 @@ mailing address. */ -#include "config.h" #include "platform/image-decoders/gif/GIFImageReader.h" #include <string.h>
diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp index 0e09640..fef9e77 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/ico/ICOImageDecoder.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp index 91ff175..d6b36fa9 100644 --- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -35,7 +35,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "platform/image-decoders/jpeg/JPEGImageDecoder.h" #include "platform/PlatformInstrumentation.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp index 064a692..9f2c660 100644 --- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/jpeg/JPEGImageDecoder.h" #include "platform/SharedBuffer.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp index a5083a7..b1f7ed4b 100644 --- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -36,7 +36,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "platform/image-decoders/png/PNGImageDecoder.h" #include "png.h"
diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp index 16df7c6..ce5a2f5 100644 --- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/webp/WEBPImageDecoder.h" #if USE(QCMSLIB)
diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp index f7765c3..4caecf6d 100644 --- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp +++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-decoders/webp/WEBPImageDecoder.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/image-encoders/skia/JPEGImageEncoder.cpp b/third_party/WebKit/Source/platform/image-encoders/skia/JPEGImageEncoder.cpp index 3d7aaec..5f360eb4 100644 --- a/third_party/WebKit/Source/platform/image-encoders/skia/JPEGImageEncoder.cpp +++ b/third_party/WebKit/Source/platform/image-encoders/skia/JPEGImageEncoder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-encoders/skia/JPEGImageEncoder.h" #include "SkColorPriv.h"
diff --git a/third_party/WebKit/Source/platform/image-encoders/skia/PNGImageEncoder.cpp b/third_party/WebKit/Source/platform/image-encoders/skia/PNGImageEncoder.cpp index 6909420d..012ae8b 100644 --- a/third_party/WebKit/Source/platform/image-encoders/skia/PNGImageEncoder.cpp +++ b/third_party/WebKit/Source/platform/image-encoders/skia/PNGImageEncoder.cpp
@@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-encoders/skia/PNGImageEncoder.h" + #include "platform/graphics/ImageBuffer.h" #include "wtf/OwnPtr.h"
diff --git a/third_party/WebKit/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp b/third_party/WebKit/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp index 0193b5d..8a8dddb 100644 --- a/third_party/WebKit/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp +++ b/third_party/WebKit/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/image-encoders/skia/WEBPImageEncoder.h" #include "platform/geometry/IntSize.h"
diff --git a/third_party/WebKit/Source/platform/mac/BlockExceptions.mm b/third_party/WebKit/Source/platform/mac/BlockExceptions.mm index bb8d32ce..88d2e08 100644 --- a/third_party/WebKit/Source/platform/mac/BlockExceptions.mm +++ b/third_party/WebKit/Source/platform/mac/BlockExceptions.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/mac/BlockExceptions.h" #import "wtf/Assertions.h"
diff --git a/third_party/WebKit/Source/platform/mac/ColorMac.mm b/third_party/WebKit/Source/platform/mac/ColorMac.mm index 2265b45..6660511 100644 --- a/third_party/WebKit/Source/platform/mac/ColorMac.mm +++ b/third_party/WebKit/Source/platform/mac/ColorMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/mac/ColorMac.h" #import "wtf/RetainPtr.h"
diff --git a/third_party/WebKit/Source/platform/mac/KillRingMac.mm b/third_party/WebKit/Source/platform/mac/KillRingMac.mm index 63fd8f8..e605276 100644 --- a/third_party/WebKit/Source/platform/mac/KillRingMac.mm +++ b/third_party/WebKit/Source/platform/mac/KillRingMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/KillRing.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm index fff7223..cb50058 100644 --- a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm +++ b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
@@ -17,13 +17,11 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" - #include "platform/mac/LocalCurrentGraphicsContext.h" -#include "platform/mac/ThemeMac.h" #include <AppKit/NSGraphicsContext.h> #include "platform/graphics/GraphicsContext.h" +#include "platform/mac/ThemeMac.h" #include "platform_canvas.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm index 914d0ff..111db7e8 100644 --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
@@ -23,8 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/mac/ScrollAnimatorMac.h" #include "platform/PlatformGestureEvent.h"
diff --git a/third_party/WebKit/Source/platform/mac/ThemeMac.mm b/third_party/WebKit/Source/platform/mac/ThemeMac.mm index f5015aad..3fadb63 100644 --- a/third_party/WebKit/Source/platform/mac/ThemeMac.mm +++ b/third_party/WebKit/Source/platform/mac/ThemeMac.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import "config.h" #import "platform/mac/ThemeMac.h" #import <Carbon/Carbon.h>
diff --git a/third_party/WebKit/Source/platform/mac/VersionUtilMac.mm b/third_party/WebKit/Source/platform/mac/VersionUtilMac.mm index d519f239..d91f04492 100644 --- a/third_party/WebKit/Source/platform/mac/VersionUtilMac.mm +++ b/third_party/WebKit/Source/platform/mac/VersionUtilMac.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "config.h" #import "platform/mac/VersionUtilMac.h" #include <sstream>
diff --git a/third_party/WebKit/Source/platform/mac/VersionUtilMacTest.mm b/third_party/WebKit/Source/platform/mac/VersionUtilMacTest.mm index 32c2c74..e808a20 100644 --- a/third_party/WebKit/Source/platform/mac/VersionUtilMacTest.mm +++ b/third_party/WebKit/Source/platform/mac/VersionUtilMacTest.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "config.h" #import "platform/mac/VersionUtilMac.h" #include <AppKit/AppKit.h>
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp index d5bc111..910de87 100644 --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mediastream/MediaStreamCenter.h" #include "platform/mediastream/MediaStreamDescriptor.h"
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp index d1e16cab..23f8e5f 100644 --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mediastream/MediaStreamComponent.h" #include "platform/UUID.h"
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp index c7032fd..88232d0 100644 --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
@@ -29,8 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/mediastream/MediaStreamDescriptor.h" #include "platform/UUID.h"
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp index 2da75e5..0ee34372 100644 --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mediastream/MediaStreamSource.h"
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp index 35aad12..e502c5a 100644 --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp
@@ -28,10 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#if ENABLE(WEB_AUDIO) #include "platform/mediastream/MediaStreamWebAudioSource.h" +#include "wtf/build_config.h" + +#if ENABLE(WEB_AUDIO) #include "platform/audio/AudioBus.h" #include "public/platform/WebAudioSourceProvider.h"
diff --git a/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp b/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp index 7d24500..3c7884b 100644 --- a/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp +++ b/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mhtml/ArchiveResource.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/mhtml/ArchiveResourceCollection.cpp b/third_party/WebKit/Source/platform/mhtml/ArchiveResourceCollection.cpp index d984dd9..13eea6e0 100644 --- a/third_party/WebKit/Source/platform/mhtml/ArchiveResourceCollection.cpp +++ b/third_party/WebKit/Source/platform/mhtml/ArchiveResourceCollection.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mhtml/ArchiveResourceCollection.h" #include "platform/mhtml/ArchiveResource.h"
diff --git a/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp b/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp index f7f616f..8a47d479 100644 --- a/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp +++ b/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mhtml/MHTMLArchive.h" #include "platform/DateComponents.h"
diff --git a/third_party/WebKit/Source/platform/mhtml/MHTMLParser.cpp b/third_party/WebKit/Source/platform/mhtml/MHTMLParser.cpp index 4584698..8782d9d 100644 --- a/third_party/WebKit/Source/platform/mhtml/MHTMLParser.cpp +++ b/third_party/WebKit/Source/platform/mhtml/MHTMLParser.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/mhtml/MHTMLParser.h" #include "platform/MIMETypeRegistry.h"
diff --git a/third_party/WebKit/Source/platform/network/ContentSecurityPolicyParsers.cpp b/third_party/WebKit/Source/platform/network/ContentSecurityPolicyParsers.cpp index fd334ec..7b04d03 100644 --- a/third_party/WebKit/Source/platform/network/ContentSecurityPolicyParsers.cpp +++ b/third_party/WebKit/Source/platform/network/ContentSecurityPolicyParsers.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/ContentSecurityPolicyParsers.h" #include "wtf/ASCIICType.h"
diff --git a/third_party/WebKit/Source/platform/network/ContentSecurityPolicyResponseHeaders.cpp b/third_party/WebKit/Source/platform/network/ContentSecurityPolicyResponseHeaders.cpp index 74e594f..eadfbec7 100644 --- a/third_party/WebKit/Source/platform/network/ContentSecurityPolicyResponseHeaders.cpp +++ b/third_party/WebKit/Source/platform/network/ContentSecurityPolicyResponseHeaders.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/ContentSecurityPolicyResponseHeaders.h" #include "platform/network/ResourceResponse.h"
diff --git a/third_party/WebKit/Source/platform/network/EncodedFormData.cpp b/third_party/WebKit/Source/platform/network/EncodedFormData.cpp index 64db188..a371a098 100644 --- a/third_party/WebKit/Source/platform/network/EncodedFormData.cpp +++ b/third_party/WebKit/Source/platform/network/EncodedFormData.cpp
@@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/network/EncodedFormData.h" #include "platform/FileMetadata.h"
diff --git a/third_party/WebKit/Source/platform/network/EncodedFormDataTest.cpp b/third_party/WebKit/Source/platform/network/EncodedFormDataTest.cpp index 240f745fe..e4143de 100644 --- a/third_party/WebKit/Source/platform/network/EncodedFormDataTest.cpp +++ b/third_party/WebKit/Source/platform/network/EncodedFormDataTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/EncodedFormData.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/network/FormDataEncoder.cpp b/third_party/WebKit/Source/platform/network/FormDataEncoder.cpp index b4f54af..e66bf81 100644 --- a/third_party/WebKit/Source/platform/network/FormDataEncoder.cpp +++ b/third_party/WebKit/Source/platform/network/FormDataEncoder.cpp
@@ -22,7 +22,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/network/FormDataEncoder.h" #include "wtf/CryptographicallyRandomNumber.h"
diff --git a/third_party/WebKit/Source/platform/network/HTTPHeaderMap.cpp b/third_party/WebKit/Source/platform/network/HTTPHeaderMap.cpp index e90f702..28a1b84 100644 --- a/third_party/WebKit/Source/platform/network/HTTPHeaderMap.cpp +++ b/third_party/WebKit/Source/platform/network/HTTPHeaderMap.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/HTTPHeaderMap.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/network/HTTPParsers.cpp b/third_party/WebKit/Source/platform/network/HTTPParsers.cpp index 0294ccdb..c0f13e3 100644 --- a/third_party/WebKit/Source/platform/network/HTTPParsers.cpp +++ b/third_party/WebKit/Source/platform/network/HTTPParsers.cpp
@@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/HTTPParsers.h" #include "wtf/DateMath.h"
diff --git a/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp b/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp index a95d0cd8..2a750061 100644 --- a/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp +++ b/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/HTTPParsers.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/network/NetworkHints.cpp b/third_party/WebKit/Source/platform/network/NetworkHints.cpp index ffbcb51..c2c99f7 100644 --- a/third_party/WebKit/Source/platform/network/NetworkHints.cpp +++ b/third_party/WebKit/Source/platform/network/NetworkHints.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/NetworkHints.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/network/ParsedContentType.cpp b/third_party/WebKit/Source/platform/network/ParsedContentType.cpp index 8586c02..cd923c6 100644 --- a/third_party/WebKit/Source/platform/network/ParsedContentType.cpp +++ b/third_party/WebKit/Source/platform/network/ParsedContentType.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/ParsedContentType.h" #include "wtf/text/CString.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceError.cpp b/third_party/WebKit/Source/platform/network/ResourceError.cpp index 4e8efdb..7f6b618 100644 --- a/third_party/WebKit/Source/platform/network/ResourceError.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceError.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/ResourceError.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceLoadTiming.cpp b/third_party/WebKit/Source/platform/network/ResourceLoadTiming.cpp index fec9ede..544bd700 100644 --- a/third_party/WebKit/Source/platform/network/ResourceLoadTiming.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceLoadTiming.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/ResourceLoadTiming.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp index 196d080..6f4f138 100644 --- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
@@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/ResourceRequest.h" + #include "platform/weborigin/SecurityOrigin.h" #include "public/platform/WebURLRequest.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp index c3339b8..65955fa 100644 --- a/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/ResourceRequest.h" #include "platform/network/EncodedFormData.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp index 1129c67..90b0cb7 100644 --- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/ResourceResponse.h" #include "wtf/CurrentTime.h"
diff --git a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp index a1faa42..97523d73 100644 --- a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/network/ResourceTimingInfo.h" #include "platform/CrossThreadCopier.h"
diff --git a/third_party/WebKit/Source/platform/network/WebSocketHandshakeRequest.cpp b/third_party/WebKit/Source/platform/network/WebSocketHandshakeRequest.cpp index 19bf65c..511954e 100644 --- a/third_party/WebKit/Source/platform/network/WebSocketHandshakeRequest.cpp +++ b/third_party/WebKit/Source/platform/network/WebSocketHandshakeRequest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/WebSocketHandshakeRequest.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/network/WebSocketHandshakeResponse.cpp b/third_party/WebKit/Source/platform/network/WebSocketHandshakeResponse.cpp index 46d1c643..cee86678 100644 --- a/third_party/WebKit/Source/platform/network/WebSocketHandshakeResponse.cpp +++ b/third_party/WebKit/Source/platform/network/WebSocketHandshakeResponse.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/network/WebSocketHandshakeResponse.h" #include "platform/network/WebSocketHandshakeRequest.h"
diff --git a/third_party/WebKit/Source/platform/plugins/PluginData.cpp b/third_party/WebKit/Source/platform/plugins/PluginData.cpp index 6ec5c65..4897488 100644 --- a/third_party/WebKit/Source/platform/plugins/PluginData.cpp +++ b/third_party/WebKit/Source/platform/plugins/PluginData.cpp
@@ -21,7 +21,6 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/plugins/PluginData.h" #include "platform/plugins/PluginListBuilder.h"
diff --git a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp index 64c9afb..820fa79 100644 --- a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp +++ b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/plugins/PluginListBuilder.h" #include "public/platform/WebString.h"
diff --git a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.cpp b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.cpp index 969b16f..db3e0164 100644 --- a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.cpp +++ b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/scheduler/CancellableTaskFactory.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp index 57147ee..f2346a2 100644 --- a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp +++ b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/scheduler/CancellableTaskFactory.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp index f4a0af1..6910c4f8 100644 --- a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp +++ b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/scroll/ProgrammaticScrollAnimator.h" #include "platform/geometry/IntPoint.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp index c3b47315..e9610b0 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollAnimator.h" #include "platform/TraceEvent.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp index da2a57c..2858a07 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollAnimatorBase.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp index dc3a7ca..92457496 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/scroll/ScrollAnimatorCompositorCoordinator.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp index b72c710..2a398a0 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
@@ -25,7 +25,6 @@ // Tests for the ScrollAnimator class. -#include "config.h" #include "platform/scroll/ScrollAnimator.h" #include "platform/Logging.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp index 77996f3..fb93af98 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollableArea.h" #include "platform/HostWindow.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp index c71f4ac..8f4b977 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/scroll/ScrollableArea.h" #include "platform/graphics/GraphicsLayer.h"
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp index 0a1ae696..a86da06 100644 --- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp +++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/Scrollbar.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp index 7d641481..c92af56 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarTheme.h" #include "platform/PlatformMouseEvent.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAndroid.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAndroid.cpp index f41fdb9..e9b00bc 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAndroid.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAndroid.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarTheme.h" #include "platform/scroll/ScrollbarThemeOverlay.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp index 590a5ff..f434c09 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeAura.h" #include "platform/LayoutTestSupport.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.mm index 5832661..b85fcfda 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.mm +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.mm
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/RuntimeEnabledFeatures.h" #include "platform/scroll/ScrollbarThemeMacCommon.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm index 10af831..1515a1f 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeMacNonOverlayAPI.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm index 4a41087e..80820a9 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h" #include "platform/graphics/GraphicsContext.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMock.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMock.cpp index 2651f23b..707accf 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMock.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMock.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeMock.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeNonMacCommon.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeNonMacCommon.cpp index 0a55ef8..837aece8 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeNonMacCommon.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeNonMacCommon.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeNonMacCommon.h" #include "platform/PlatformMouseEvent.h"
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp index 0e1bfd3..f679b981 100644 --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/scroll/ScrollbarThemeOverlay.h" #include "platform/PlatformMouseEvent.h"
diff --git a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisUtterance.cpp b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisUtterance.cpp index f1eb8bd..d4f6c5a 100644 --- a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisUtterance.cpp +++ b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisUtterance.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/speech/PlatformSpeechSynthesisUtterance.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisVoice.cpp b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisVoice.cpp index e618421..e323de4 100644 --- a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisVoice.cpp +++ b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesisVoice.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/speech/PlatformSpeechSynthesisVoice.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesizer.cpp b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesizer.cpp index 5c7124c..7297877 100644 --- a/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesizer.cpp +++ b/third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesizer.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/speech/PlatformSpeechSynthesizer.h" #include "platform/exported/WebSpeechSynthesizerClientImpl.h"
diff --git a/third_party/WebKit/Source/platform/testing/GeometryPrinters.cpp b/third_party/WebKit/Source/platform/testing/GeometryPrinters.cpp index 8861bf2..04f33ec 100644 --- a/third_party/WebKit/Source/platform/testing/GeometryPrinters.cpp +++ b/third_party/WebKit/Source/platform/testing/GeometryPrinters.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/testing/GeometryPrinters.h" #include "platform/geometry/FloatBox.h"
diff --git a/third_party/WebKit/Source/platform/testing/PaintPrinters.cpp b/third_party/WebKit/Source/platform/testing/PaintPrinters.cpp index ffd0c9e..c584725 100644 --- a/third_party/WebKit/Source/platform/testing/PaintPrinters.cpp +++ b/third_party/WebKit/Source/platform/testing/PaintPrinters.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/testing/PaintPrinters.h" #include "platform/graphics/paint/PaintChunk.h"
diff --git a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp index 3cf424c..61373985 100644 --- a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp +++ b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/EventTracer.h" #include "platform/heap/Heap.h" #include "platform/testing/TestingPlatformSupport.h"
diff --git a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp index c4ea220..e62d6721 100644 --- a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp +++ b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
@@ -28,8 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" - #include "platform/testing/TestingPlatformSupport.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/testing/TransformPrinters.cpp b/third_party/WebKit/Source/platform/testing/TransformPrinters.cpp index 13c7f7ad..1707336 100644 --- a/third_party/WebKit/Source/platform/testing/TransformPrinters.cpp +++ b/third_party/WebKit/Source/platform/testing/TransformPrinters.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/testing/TransformPrinters.h" #include "platform/transforms/AffineTransform.h"
diff --git a/third_party/WebKit/Source/platform/testing/TreeTestHelpers.cpp b/third_party/WebKit/Source/platform/testing/TreeTestHelpers.cpp index 247d8a6a..3bff6c06 100644 --- a/third_party/WebKit/Source/platform/testing/TreeTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/testing/TreeTestHelpers.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/testing/TreeTestHelpers.h" #include <cstdlib>
diff --git a/third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp b/third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp index 357918fa..ccd6f1c1 100644 --- a/third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/testing/URLTestHelpers.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp b/third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp index b8b3fa6..dcb8252 100644 --- a/third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp +++ b/third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp
@@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/testing/UnitTestHelpers.h" #include "public/platform/Platform.h"
diff --git a/third_party/WebKit/Source/platform/text/BidiCharacterRun.cpp b/third_party/WebKit/Source/platform/text/BidiCharacterRun.cpp index 569c68d0..f5b257fa 100644 --- a/third_party/WebKit/Source/platform/text/BidiCharacterRun.cpp +++ b/third_party/WebKit/Source/platform/text/BidiCharacterRun.cpp
@@ -21,7 +21,6 @@ * */ -#include "config.h" #include "platform/text/BidiCharacterRun.h" #include "wtf/Partitions.h"
diff --git a/third_party/WebKit/Source/platform/text/BidiContext.cpp b/third_party/WebKit/Source/platform/text/BidiContext.cpp index e8fcb22..bcb3f5a7 100644 --- a/third_party/WebKit/Source/platform/text/BidiContext.cpp +++ b/third_party/WebKit/Source/platform/text/BidiContext.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/text/BidiContext.h" #include "wtf/StdLibExtras.h"
diff --git a/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp b/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp index e1eb25c..e531959 100644 --- a/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp +++ b/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/BidiResolver.h" #include "platform/text/BidiTestHarness.h"
diff --git a/third_party/WebKit/Source/platform/text/BidiTextRun.cpp b/third_party/WebKit/Source/platform/text/BidiTextRun.cpp index e122f6b..99834e2 100644 --- a/third_party/WebKit/Source/platform/text/BidiTextRun.cpp +++ b/third_party/WebKit/Source/platform/text/BidiTextRun.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/BidiTextRun.h" #include "platform/text/BidiResolver.h"
diff --git a/third_party/WebKit/Source/platform/text/DateTimeFormat.cpp b/third_party/WebKit/Source/platform/text/DateTimeFormat.cpp index 1af63ea..2614580 100644 --- a/third_party/WebKit/Source/platform/text/DateTimeFormat.cpp +++ b/third_party/WebKit/Source/platform/text/DateTimeFormat.cpp
@@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include "config.h" #include "platform/text/DateTimeFormat.h" #include "wtf/ASCIICType.h"
diff --git a/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp b/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp index c8183fa2..1a3f8e2 100644 --- a/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp +++ b/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp
@@ -23,9 +23,10 @@ * SUCH DAMAGE. */ -#include "config.h" #include "platform/text/DateTimeFormat.h" +#include "wtf/build_config.h" + #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) #include "testing/gtest/include/gtest/gtest.h" #include "wtf/text/CString.h"
diff --git a/third_party/WebKit/Source/platform/text/LineEnding.cpp b/third_party/WebKit/Source/platform/text/LineEnding.cpp index 7dcefcb..c1ae370c 100644 --- a/third_party/WebKit/Source/platform/text/LineEnding.cpp +++ b/third_party/WebKit/Source/platform/text/LineEnding.cpp
@@ -29,7 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LineEnding.h" #include "wtf/text/CString.h"
diff --git a/third_party/WebKit/Source/platform/text/LocaleICU.cpp b/third_party/WebKit/Source/platform/text/LocaleICU.cpp index a84dc55..2939d52 100644 --- a/third_party/WebKit/Source/platform/text/LocaleICU.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleICU.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleICU.h" #include <unicode/udatpg.h>
diff --git a/third_party/WebKit/Source/platform/text/LocaleICUTest.cpp b/third_party/WebKit/Source/platform/text/LocaleICUTest.cpp index 86be643..75c7ab1 100644 --- a/third_party/WebKit/Source/platform/text/LocaleICUTest.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleICUTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleICU.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/text/LocaleMac.mm b/third_party/WebKit/Source/platform/text/LocaleMac.mm index 56759bf..39c762f 100644 --- a/third_party/WebKit/Source/platform/text/LocaleMac.mm +++ b/third_party/WebKit/Source/platform/text/LocaleMac.mm
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleMac.h" #import <Foundation/NSDateFormatter.h>
diff --git a/third_party/WebKit/Source/platform/text/LocaleMacTest.cpp b/third_party/WebKit/Source/platform/text/LocaleMacTest.cpp index 05469d8..6ae66e3 100644 --- a/third_party/WebKit/Source/platform/text/LocaleMacTest.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleMacTest.cpp
@@ -23,7 +23,6 @@ * DAMAGE. */ -#include "config.h" #include "platform/text/LocaleMac.h" #include "platform/DateComponents.h"
diff --git a/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.cpp b/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.cpp index 48f44a2..055af8fbba 100644 --- a/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleToScriptMapping.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleToScriptMapping.h" #include "wtf/HashMap.h"
diff --git a/third_party/WebKit/Source/platform/text/LocaleWin.cpp b/third_party/WebKit/Source/platform/text/LocaleWin.cpp index 3a797cf..121ca52 100644 --- a/third_party/WebKit/Source/platform/text/LocaleWin.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleWin.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleWin.h" #include <limits>
diff --git a/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp b/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp index d1c72486..ec893817 100644 --- a/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp +++ b/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/LocaleWin.h" #include "platform/DateComponents.h"
diff --git a/third_party/WebKit/Source/platform/text/PlatformLocale.cpp b/third_party/WebKit/Source/platform/text/PlatformLocale.cpp index 84d6e58..98319b3 100644 --- a/third_party/WebKit/Source/platform/text/PlatformLocale.cpp +++ b/third_party/WebKit/Source/platform/text/PlatformLocale.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/PlatformLocale.h" #include "platform/text/DateTimeFormat.h"
diff --git a/third_party/WebKit/Source/platform/text/QuotedPrintable.cpp b/third_party/WebKit/Source/platform/text/QuotedPrintable.cpp index f2c42c0..a045268 100644 --- a/third_party/WebKit/Source/platform/text/QuotedPrintable.cpp +++ b/third_party/WebKit/Source/platform/text/QuotedPrintable.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/QuotedPrintable.h" #include "wtf/ASCIICType.h"
diff --git a/third_party/WebKit/Source/platform/text/SegmentedString.cpp b/third_party/WebKit/Source/platform/text/SegmentedString.cpp index 34f68ee..b13da48 100644 --- a/third_party/WebKit/Source/platform/text/SegmentedString.cpp +++ b/third_party/WebKit/Source/platform/text/SegmentedString.cpp
@@ -17,7 +17,6 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/text/SegmentedString.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/text/SegmentedStringTest.cpp b/third_party/WebKit/Source/platform/text/SegmentedStringTest.cpp index 775a64a..0f2a139 100644 --- a/third_party/WebKit/Source/platform/text/SegmentedStringTest.cpp +++ b/third_party/WebKit/Source/platform/text/SegmentedStringTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/SegmentedString.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/text/StringTruncator.cpp b/third_party/WebKit/Source/platform/text/StringTruncator.cpp index 2f234ef..95c456e 100644 --- a/third_party/WebKit/Source/platform/text/StringTruncator.cpp +++ b/third_party/WebKit/Source/platform/text/StringTruncator.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/StringTruncator.h" #include "platform/fonts/Font.h"
diff --git a/third_party/WebKit/Source/platform/text/TextBoundaries.cpp b/third_party/WebKit/Source/platform/text/TextBoundaries.cpp index 5228f9a..acc324afd 100644 --- a/third_party/WebKit/Source/platform/text/TextBoundaries.cpp +++ b/third_party/WebKit/Source/platform/text/TextBoundaries.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/TextBoundaries.h" #include "platform/text/TextBreakIterator.h"
diff --git a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp index ad5a63d..e1205bf 100644 --- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp +++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
@@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" #include "platform/text/TextBreakIterator.h" #include "wtf/ASCIICType.h"
diff --git a/third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp b/third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp index 94aa2ae..a32666b 100644 --- a/third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp +++ b/third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/text/TextBreakIterator.h" #include "platform/text/TextBreakIteratorInternalICU.h"
diff --git a/third_party/WebKit/Source/platform/text/TextBreakIteratorInternalICU.cpp b/third_party/WebKit/Source/platform/text/TextBreakIteratorInternalICU.cpp index adcd7027..1bcd5fb 100644 --- a/third_party/WebKit/Source/platform/text/TextBreakIteratorInternalICU.cpp +++ b/third_party/WebKit/Source/platform/text/TextBreakIteratorInternalICU.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/text/TextBreakIteratorInternalICU.h" #include "platform/Language.h"
diff --git a/third_party/WebKit/Source/platform/text/TextCheckerClient.cpp b/third_party/WebKit/Source/platform/text/TextCheckerClient.cpp index ab1f227..1977f06 100644 --- a/third_party/WebKit/Source/platform/text/TextCheckerClient.cpp +++ b/third_party/WebKit/Source/platform/text/TextCheckerClient.cpp
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/text/TextCheckerClient.h" -// This TextCheckerClient.cpp, which includes only config.h and +// This TextCheckerClient.cpp, which includes only // TextCheckerClient.h, should be in Source/platform/text, // because TextCheckerClient is not compiled without this cpp. // So if we don't have this cpp, we will see unresolved symbol error
diff --git a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp index 64e8a5de5..d4e7362 100644 --- a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp +++ b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/TextEncodingDetector.h" #include "wtf/text/TextEncoding.h"
diff --git a/third_party/WebKit/Source/platform/text/TextRun.cpp b/third_party/WebKit/Source/platform/text/TextRun.cpp index c0465c8..6fb62655 100644 --- a/third_party/WebKit/Source/platform/text/TextRun.cpp +++ b/third_party/WebKit/Source/platform/text/TextRun.cpp
@@ -23,7 +23,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/TextRun.h" #include "platform/fonts/Character.h"
diff --git a/third_party/WebKit/Source/platform/text/TextStream.cpp b/third_party/WebKit/Source/platform/text/TextStream.cpp index 41bc2545..bc1304a 100644 --- a/third_party/WebKit/Source/platform/text/TextStream.cpp +++ b/third_party/WebKit/Source/platform/text/TextStream.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/TextStream.h" #include "platform/LayoutUnit.h"
diff --git a/third_party/WebKit/Source/platform/text/UnicodeRange.cpp b/third_party/WebKit/Source/platform/text/UnicodeRange.cpp index 7aab2d0e..fa7e20f3 100644 --- a/third_party/WebKit/Source/platform/text/UnicodeRange.cpp +++ b/third_party/WebKit/Source/platform/text/UnicodeRange.cpp
@@ -32,7 +32,6 @@ * version of this file under any of the LGPL, the MPL or the GPL. */ -#include "config.h" #include "platform/text/UnicodeRange.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/text/UnicodeUtilities.cpp b/third_party/WebKit/Source/platform/text/UnicodeUtilities.cpp index 364bbfa..b1a1b952 100644 --- a/third_party/WebKit/Source/platform/text/UnicodeUtilities.cpp +++ b/third_party/WebKit/Source/platform/text/UnicodeUtilities.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/UnicodeUtilities.h" #include "wtf/text/CharacterNames.h"
diff --git a/third_party/WebKit/Source/platform/text/UnicodeUtilitiesTest.cpp b/third_party/WebKit/Source/platform/text/UnicodeUtilitiesTest.cpp index 4f36620..eb6599f 100644 --- a/third_party/WebKit/Source/platform/text/UnicodeUtilitiesTest.cpp +++ b/third_party/WebKit/Source/platform/text/UnicodeUtilitiesTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/text/UnicodeUtilities.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunner.cpp b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunner.cpp index e7f94edb..d5f9bdf42 100644 --- a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunner.cpp +++ b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunner.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/threading/BackgroundTaskRunner.h" #include "base/bind.h"
diff --git a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp index 5578139..fde843f 100644 --- a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp +++ b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/threading/BackgroundTaskRunner.h" #include "platform/ThreadSafeFunctional.h"
diff --git a/third_party/WebKit/Source/platform/transforms/AffineTransform.cpp b/third_party/WebKit/Source/platform/transforms/AffineTransform.cpp index 953923d..54d144d 100644 --- a/third_party/WebKit/Source/platform/transforms/AffineTransform.cpp +++ b/third_party/WebKit/Source/platform/transforms/AffineTransform.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/AffineTransform.h" #include "platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/platform/transforms/InterpolatedTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/InterpolatedTransformOperation.cpp index 4d1fac0..6c80066 100644 --- a/third_party/WebKit/Source/platform/transforms/InterpolatedTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/InterpolatedTransformOperation.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/InterpolatedTransformOperation.h" #include "platform/transforms/IdentityTransformOperation.h"
diff --git a/third_party/WebKit/Source/platform/transforms/Matrix3DTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/Matrix3DTransformOperation.cpp index 845c7ed..f2607f9f 100644 --- a/third_party/WebKit/Source/platform/transforms/Matrix3DTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/Matrix3DTransformOperation.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/Matrix3DTransformOperation.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.cpp index 605709e..6231039 100644 --- a/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/MatrixTransformOperation.h" #include <algorithm>
diff --git a/third_party/WebKit/Source/platform/transforms/PerspectiveTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/PerspectiveTransformOperation.cpp index e3ce2a55..29bdba4d 100644 --- a/third_party/WebKit/Source/platform/transforms/PerspectiveTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/PerspectiveTransformOperation.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/PerspectiveTransformOperation.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/transforms/RotateTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/RotateTransformOperation.cpp index 45f6915..f263310 100644 --- a/third_party/WebKit/Source/platform/transforms/RotateTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/RotateTransformOperation.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/RotateTransformOperation.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.cpp index 20fc400..25c000d 100644 --- a/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/ScaleTransformOperation.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/transforms/SkewTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/SkewTransformOperation.cpp index abb544a..3a70c4d 100644 --- a/third_party/WebKit/Source/platform/transforms/SkewTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/SkewTransformOperation.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/SkewTransformOperation.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp b/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp index 6b33c74..36d13311 100644 --- a/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp +++ b/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/TransformOperations.h" #include "platform/animation/AnimationUtilities.h"
diff --git a/third_party/WebKit/Source/platform/transforms/TransformOperationsTest.cpp b/third_party/WebKit/Source/platform/transforms/TransformOperationsTest.cpp index 3464b25..7130721 100644 --- a/third_party/WebKit/Source/platform/transforms/TransformOperationsTest.cpp +++ b/third_party/WebKit/Source/platform/transforms/TransformOperationsTest.cpp
@@ -22,7 +22,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/TransformOperations.h" #include "platform/geometry/FloatBox.h"
diff --git a/third_party/WebKit/Source/platform/transforms/TransformationMatrix.cpp b/third_party/WebKit/Source/platform/transforms/TransformationMatrix.cpp index 1cb3bca9..ced3d37 100644 --- a/third_party/WebKit/Source/platform/transforms/TransformationMatrix.cpp +++ b/third_party/WebKit/Source/platform/transforms/TransformationMatrix.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/transforms/TransformationMatrix.h" #include "platform/geometry/FloatBox.h"
diff --git a/third_party/WebKit/Source/platform/transforms/TransformationMatrixTest.cpp b/third_party/WebKit/Source/platform/transforms/TransformationMatrixTest.cpp index bd0b70d..309f5d16 100644 --- a/third_party/WebKit/Source/platform/transforms/TransformationMatrixTest.cpp +++ b/third_party/WebKit/Source/platform/transforms/TransformationMatrixTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/transforms/TransformationMatrix.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.cpp b/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.cpp index 864439bc..f7c14289 100644 --- a/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.cpp +++ b/third_party/WebKit/Source/platform/transforms/TranslateTransformOperation.cpp
@@ -19,7 +19,6 @@ * */ -#include "config.h" #include "platform/transforms/TranslateTransformOperation.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp b/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp index 9a2c2d88..e0ea66e 100644 --- a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp +++ b/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/DatabaseIdentifier.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifierTest.cpp b/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifierTest.cpp index 7d34f0e..b82b096 100644 --- a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifierTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifierTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/DatabaseIdentifier.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/KURL.cpp b/third_party/WebKit/Source/platform/weborigin/KURL.cpp index c430db07..22348951 100644 --- a/third_party/WebKit/Source/platform/weborigin/KURL.cpp +++ b/third_party/WebKit/Source/platform/weborigin/KURL.cpp
@@ -25,7 +25,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/KURL.h" #include "platform/weborigin/KnownPorts.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp b/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp index 8f242f3..7359fcc 100644 --- a/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/KURLTest.cpp
@@ -31,7 +31,6 @@ // Basic tests that verify our KURL's interface behaves the same as the // original KURL's. -#include "config.h" #include "platform/weborigin/KURL.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/KnownPorts.cpp b/third_party/WebKit/Source/platform/weborigin/KnownPorts.cpp index 9bde339..b6da7de 100644 --- a/third_party/WebKit/Source/platform/weborigin/KnownPorts.cpp +++ b/third_party/WebKit/Source/platform/weborigin/KnownPorts.cpp
@@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/KnownPorts.h" namespace blink {
diff --git a/third_party/WebKit/Source/platform/weborigin/KnownPortsTest.cpp b/third_party/WebKit/Source/platform/weborigin/KnownPortsTest.cpp index 916bf49..78035dc3 100644 --- a/third_party/WebKit/Source/platform/weborigin/KnownPortsTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/KnownPortsTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/weborigin/KnownPorts.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp index 23dfb75..3172e24 100644 --- a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp +++ b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/OriginAccessEntry.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp index 49ea30e7..72d97a3 100644 --- a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/OriginAccessEntry.h" #include "platform/testing/TestingPlatformSupport.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp index c670274a..8489a85 100644 --- a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
@@ -24,7 +24,6 @@ * */ -#include "config.h" #include "platform/weborigin/SchemeRegistry.h" #include "wtf/ThreadSpecific.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/SchemeRegistryTest.cpp b/third_party/WebKit/Source/platform/weborigin/SchemeRegistryTest.cpp index bfc88ee9..9fd2f74c 100644 --- a/third_party/WebKit/Source/platform/weborigin/SchemeRegistryTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SchemeRegistryTest.cpp
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "config.h" #include "platform/weborigin/SchemeRegistry.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp index 4d75bab3..21659398 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/SecurityOrigin.h" #include "platform/RuntimeEnabledFeatures.h" @@ -162,7 +161,7 @@ : m_protocol(other->m_protocol.isolatedCopy()) , m_host(other->m_host.isolatedCopy()) , m_domain(other->m_domain.isolatedCopy()) - , m_suboriginName(other->m_suboriginName) + , m_suboriginName(other->m_suboriginName.isolatedCopy()) , m_port(other->m_port) , m_effectivePort(other->m_effectivePort) , m_isUnique(other->m_isUnique) @@ -356,6 +355,15 @@ bool SecurityOrigin::isPotentiallyTrustworthy(String& errorMessage) const { + if (isPotentiallyTrustworthy()) + return true; + + errorMessage = "Only secure origins are allowed (see: https://goo.gl/Y0ZkNV)."; + return false; +} + +bool SecurityOrigin::isPotentiallyTrustworthy() const +{ ASSERT(m_protocol != "data"); if (SchemeRegistry::shouldTreatURLSchemeAsSecure(m_protocol) || isLocal() || isLocalhost()) return true; @@ -363,7 +371,6 @@ if (SecurityPolicy::isOriginWhiteListedTrustworthy(*this)) return true; - errorMessage = "Only secure origins are allowed (see: https://goo.gl/Y0ZkNV)."; return false; }
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h index 8d8828c..b4a4a90 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h
@@ -138,6 +138,7 @@ // cryptographically-authenticated origin, as described in // https://w3c.github.io/webappsec/specs/powerfulfeatures/#is-origin-trustworthy. bool isPotentiallyTrustworthy(String& errorMessage) const; + bool isPotentiallyTrustworthy() const; // Returns true if this SecurityOrigin can load local resources, such // as images, iframes, and style sheets, and can link to local URLs.
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp index 364cad7b..37e62118 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/SecurityOrigin.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp index a0bb8b1..af82e512 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp
@@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/SecurityPolicy.h" #include "platform/RuntimeEnabledFeatures.h"
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityPolicyTest.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityPolicyTest.cpp index 6d29ab1..59a3603d 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityPolicyTest.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SecurityPolicyTest.cpp
@@ -28,7 +28,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/weborigin/SecurityPolicy.h" #include "platform/weborigin/KURL.h"
diff --git a/third_party/WebKit/Source/platform/win/SystemInfo.cpp b/third_party/WebKit/Source/platform/win/SystemInfo.cpp index 61abff1..ebad37b3 100644 --- a/third_party/WebKit/Source/platform/win/SystemInfo.cpp +++ b/third_party/WebKit/Source/platform/win/SystemInfo.cpp
@@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "platform/win/SystemInfo.h" #include <windows.h>
diff --git a/third_party/WebKit/Source/wtf/Assertions.cpp b/third_party/WebKit/Source/wtf/Assertions.cpp index 2ce03fb..d72aa69 100644 --- a/third_party/WebKit/Source/wtf/Assertions.cpp +++ b/third_party/WebKit/Source/wtf/Assertions.cpp
@@ -357,7 +357,7 @@ ScopedLogger*& ScopedLogger::current() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<ScopedLogger*>, ref, new ThreadSpecific<ScopedLogger*>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<ScopedLogger*>, ref, new ThreadSpecific<ScopedLogger*>); return *ref; }
diff --git a/third_party/WebKit/Source/wtf/HashTable.cpp b/third_party/WebKit/Source/wtf/HashTable.cpp index 4574c13..1b5eed2 100644 --- a/third_party/WebKit/Source/wtf/HashTable.cpp +++ b/third_party/WebKit/Source/wtf/HashTable.cpp
@@ -35,7 +35,7 @@ static Mutex& hashTableStatsMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; }
diff --git a/third_party/WebKit/Source/wtf/Threading.h b/third_party/WebKit/Source/wtf/Threading.h index ddcc436..f8555f2f 100644 --- a/third_party/WebKit/Source/wtf/Threading.h +++ b/third_party/WebKit/Source/wtf/Threading.h
@@ -39,7 +39,7 @@ // by some toolchains. Make use of double-checked locking to reduce overhead. // Note that this uses system-wide default lock, and cannot be used before // WTF::initializeThreading() is called. -#define DEFINE_STATIC_LOCAL_THREAD_SAFE(T, name, initializer) \ +#define DEFINE_THREAD_SAFE_STATIC_LOCAL(T, name, initializer) \ /* Init to nullptr is thread-safe on all implementations. */ \ static void* name##Pointer = nullptr; \ if (!WTF::acquireLoad(&name##Pointer)) { \
diff --git a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp index a6c07dfb..f3f231d 100644 --- a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp +++ b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp
@@ -38,7 +38,7 @@ static const TextEncoding& UTF7Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7")); return globalUTF7Encoding; } @@ -134,50 +134,50 @@ const TextEncoding& ASCIIEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalASCIIEncoding, new TextEncoding("ASCII")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalASCIIEncoding, new TextEncoding("ASCII")); return globalASCIIEncoding; } const TextEncoding& Latin1Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalLatin1Encoding, new TextEncoding("latin1")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalLatin1Encoding, new TextEncoding("latin1")); return globalLatin1Encoding; } const TextEncoding& UTF16BigEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF16BigEndianEncoding, new TextEncoding("UTF-16BE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF16BigEndianEncoding, new TextEncoding("UTF-16BE")); return globalUTF16BigEndianEncoding; } const TextEncoding& UTF16LittleEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF16LittleEndianEncoding, new TextEncoding("UTF-16LE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF16LittleEndianEncoding, new TextEncoding("UTF-16LE")); return globalUTF16LittleEndianEncoding; } const TextEncoding& UTF32BigEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF32BigEndianEncoding, new TextEncoding("UTF-32BE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF32BigEndianEncoding, new TextEncoding("UTF-32BE")); return globalUTF32BigEndianEncoding; } const TextEncoding& UTF32LittleEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF32LittleEndianEncoding, new TextEncoding("UTF-32LE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF32LittleEndianEncoding, new TextEncoding("UTF-32LE")); return globalUTF32LittleEndianEncoding; } const TextEncoding& UTF8Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF8Encoding, new TextEncoding("UTF-8")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF8Encoding, new TextEncoding("UTF-8")); ASSERT(globalUTF8Encoding.isValid()); return globalUTF8Encoding; } const TextEncoding& WindowsLatin1Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalWindowsLatin1Encoding, new TextEncoding("WinLatin1")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalWindowsLatin1Encoding, new TextEncoding("WinLatin1")); return globalWindowsLatin1Encoding; }
diff --git a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp index 19025c3..c85fe064 100644 --- a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp +++ b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
@@ -43,7 +43,7 @@ static char cachedEquivalentLocale[Collator::ulocFullnameCapacity]; static Mutex& cachedCollatorMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; }
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index 64e3d21..4502661 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc
@@ -15,6 +15,9 @@ #include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/trace_event/trace_event.h" +#include "cc/animation/animation_host.h" +#include "cc/animation/animation_id_provider.h" +#include "cc/animation/animation_timeline.h" #include "cc/base/switches.h" #include "cc/input/input_handler.h" #include "cc/layers/layer.h" @@ -190,6 +193,12 @@ host_ = cc::LayerTreeHost::CreateSingleThreaded(this, ¶ms); UMA_HISTOGRAM_TIMES("GPU.CreateBrowserCompositor", base::TimeTicks::Now() - before_create); + + if (settings.use_compositor_animation_timelines) { + animation_timeline_ = cc::AnimationTimeline::Create( + cc::AnimationIdProvider::NextTimelineId()); + host_->animation_host()->AddAnimationTimeline(animation_timeline_.get()); + } host_->SetRootLayer(root_web_layer_); host_->set_surface_id_namespace(surface_id_allocator_->id_namespace()); host_->SetVisible(true); @@ -210,6 +219,9 @@ if (root_layer_) root_layer_->ResetCompositor(); + if (animation_timeline_) + host_->animation_host()->RemoveAnimationTimeline(animation_timeline_.get()); + // Stop all outstanding draws before telling the ContextFactory to tear // down any contexts that the |host_| may rely upon. host_.reset(); @@ -238,6 +250,10 @@ root_layer_->SetCompositor(this, root_web_layer_); } +cc::AnimationTimeline* Compositor::GetAnimationTimeline() const { + return animation_timeline_.get(); +} + void Compositor::SetHostHasTransparentBackground( bool host_has_transparent_background) { host_->set_has_transparent_background(host_has_transparent_background);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 1602d30..6c3c07d5 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h
@@ -33,6 +33,7 @@ } namespace cc { +class AnimationTimeline; class ContextProvider; class Layer; class LayerTreeDebugState; @@ -177,6 +178,8 @@ Layer* root_layer() { return root_layer_; } void SetRootLayer(Layer* root_layer); + cc::AnimationTimeline* GetAnimationTimeline() const; + // Called when we need the compositor to preserve the alpha channel in the // output for situations when we want to render transparently atop something // else, e.g. Aero glass. @@ -368,6 +371,7 @@ CompositorLock* compositor_lock_; LayerAnimatorCollection layer_animator_collection_; + scoped_refptr<cc::AnimationTimeline> animation_timeline_; // Used to send to any new CompositorBeginFrameObserver immediately. cc::BeginFrameArgs missed_begin_frame_args_;
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index f29f9aa6..cfa0dc29 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc
@@ -155,18 +155,18 @@ compositor_ = compositor; OnDeviceScaleFactorChanged(compositor->device_scale_factor()); - AddAnimatorsInTreeToCollection(compositor_->layer_animator_collection()); root_layer->AddChild(cc_layer_); + SetCompositorForAnimatorsInTree(compositor); SendPendingThreadedAnimations(); } void Layer::ResetCompositor() { DCHECK(!parent_); - if (compositor_) - RemoveAnimatorsInTreeFromCollection( - compositor_->layer_animator_collection()); - compositor_ = nullptr; + if (compositor_) { + ResetCompositorForAnimatorsInTree(compositor_); + compositor_ = nullptr; + } } void Layer::Add(Layer* child) { @@ -177,11 +177,11 @@ children_.push_back(child); cc_layer_->AddChild(child->cc_layer_); child->OnDeviceScaleFactorChanged(device_scale_factor_); - if (GetCompositor()) + Compositor* compositor = GetCompositor(); + if (compositor) { + child->SetCompositorForAnimatorsInTree(compositor); child->SendPendingThreadedAnimations(); - LayerAnimatorCollection* collection = GetLayerAnimatorCollection(); - if (collection) - child->AddAnimatorsInTreeToCollection(collection); + } } void Layer::Remove(Layer* child) { @@ -190,9 +190,10 @@ LayerAnimator* child_animator = child->animator_.get(); if (child_animator) child_animator->StopAnimatingProperty(ui::LayerAnimationElement::BOUNDS); - LayerAnimatorCollection* collection = GetLayerAnimatorCollection(); - if (collection) - child->RemoveAnimatorsInTreeFromCollection(collection); + + Compositor* compositor = GetCompositor(); + if (compositor) + child->ResetCompositorForAnimatorsInTree(compositor); std::vector<Layer*>::iterator i = std::find(children_.begin(), children_.end(), child); @@ -820,7 +821,7 @@ void Layer::CollectAnimators( std::vector<scoped_refptr<LayerAnimator>>* animators) { - if (IsAnimating()) + if (animator_ && animator_->is_animating()) animators->push_back(animator_); for (auto* child : children_) child->CollectAnimators(animators); @@ -973,16 +974,27 @@ DCHECK(cc_layer_); // Until this layer has a compositor (and hence cc_layer_ has a // LayerTreeHost), addAnimation will fail. - if (GetCompositor()) - cc_layer_->AddAnimation(std::move(animation)); - else + if (GetCompositor()) { + if (UILayerSettings().use_compositor_animation_timelines) { + DCHECK(animator_); + animator_->AddThreadedAnimation(std::move(animation)); + } else { + cc_layer_->AddAnimation(std::move(animation)); + } + } else { pending_threaded_animations_.push_back(std::move(animation)); + } } void Layer::RemoveThreadedAnimation(int animation_id) { DCHECK(cc_layer_); if (pending_threaded_animations_.size() == 0) { - cc_layer_->RemoveAnimation(animation_id); + if (UILayerSettings().use_compositor_animation_timelines) { + DCHECK(animator_); + animator_->RemoveThreadedAnimation(animation_id); + } else { + cc_layer_->RemoveAnimation(animation_id); + } return; } @@ -1006,8 +1018,14 @@ } void Layer::SendPendingThreadedAnimations() { - for (auto& animation : pending_threaded_animations_) - cc_layer_->AddAnimation(std::move(animation)); + for (auto& animation : pending_threaded_animations_) { + if (UILayerSettings().use_compositor_animation_timelines) { + DCHECK(animator_); + animator_->AddThreadedAnimation(std::move(animation)); + } else { + cc_layer_->AddAnimation(std::move(animation)); + } + } pending_threaded_animations_.clear(); for (auto* child : children_) @@ -1057,26 +1075,32 @@ subpixel_position_offset_); } -void Layer::AddAnimatorsInTreeToCollection( - LayerAnimatorCollection* collection) { - DCHECK(collection); - if (IsAnimating()) - animator_->AddToCollection(collection); +void Layer::SetCompositorForAnimatorsInTree(Compositor* compositor) { + DCHECK(compositor); + LayerAnimatorCollection* collection = compositor->layer_animator_collection(); + + if (animator_) { + if (animator_->is_animating()) + animator_->AddToCollection(collection); + animator_->SetCompositor(compositor); + } + for (auto* child : children_) - child->AddAnimatorsInTreeToCollection(collection); + child->SetCompositorForAnimatorsInTree(compositor); } -void Layer::RemoveAnimatorsInTreeFromCollection( - LayerAnimatorCollection* collection) { - DCHECK(collection); - if (IsAnimating()) - animator_->RemoveFromCollection(collection); - for (auto* child : children_) - child->RemoveAnimatorsInTreeFromCollection(collection); -} +void Layer::ResetCompositorForAnimatorsInTree(Compositor* compositor) { + DCHECK(compositor); + LayerAnimatorCollection* collection = compositor->layer_animator_collection(); -bool Layer::IsAnimating() const { - return animator_.get() && animator_->is_animating(); + if (animator_) { + animator_->ResetCompositor(compositor); + if (animator_->is_animating()) + animator_->RemoveFromCollection(collection); + } + + for (auto* child : children_) + child->ResetCompositorForAnimatorsInTree(compositor); } } // namespace ui
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index 2628fc1..3e80538 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h
@@ -434,11 +434,8 @@ // be called once we have been added to a tree. void SendPendingThreadedAnimations(); - void AddAnimatorsInTreeToCollection(LayerAnimatorCollection* collection); - void RemoveAnimatorsInTreeFromCollection(LayerAnimatorCollection* collection); - - // Returns whether the layer has an animating LayerAnimator. - bool IsAnimating() const; + void SetCompositorForAnimatorsInTree(Compositor* compositor); + void ResetCompositorForAnimatorsInTree(Compositor* compositor); const LayerType type_;
diff --git a/ui/compositor/layer_animation_delegate.h b/ui/compositor/layer_animation_delegate.h index cc83f43d..e1ec62451 100644 --- a/ui/compositor/layer_animation_delegate.h +++ b/ui/compositor/layer_animation_delegate.h
@@ -39,11 +39,15 @@ virtual float GetGrayscaleForAnimation() const = 0; virtual SkColor GetColorForAnimation() const = 0; virtual float GetDeviceScaleFactor() const = 0; + + // TODO(loyso): Extract these 3 methods as a separate + // LayerThreadedAnimationDelegate. virtual void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) = 0; virtual void RemoveThreadedAnimation(int animation_id) = 0; - virtual LayerAnimatorCollection* GetLayerAnimatorCollection() = 0; virtual cc::Layer* GetCcLayer() const = 0; + virtual LayerAnimatorCollection* GetLayerAnimatorCollection() = 0; + protected: virtual ~LayerAnimationDelegate() {} };
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index b4afd2e..691e020 100644 --- a/ui/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc
@@ -8,6 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "base/trace_event/trace_event.h" #include "cc/animation/animation_id_provider.h" +#include "cc/animation/animation_player.h" +#include "cc/animation/animation_timeline.h" +#include "cc/animation/element_animations.h" +#include "cc/layers/layer_settings.h" #include "cc/output/begin_frame_args.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" @@ -47,6 +51,10 @@ is_started_(false), disable_timer_for_test_(false), adding_animations_(false) { + if (Layer::UILayerSettings().use_compositor_animation_timelines) { + animation_player_ = + cc::AnimationPlayer::Create(cc::AnimationIdProvider::NextPlayerId()); + } } LayerAnimator::~LayerAnimator() { @@ -126,11 +134,78 @@ void LayerAnimator::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) { if (delegate_) { - DCHECK(delegate_->GetCcLayer()); - delegate_->GetCcLayer()->RemoveLayerAnimationEventObserver(this); + if (animation_player_) + DetachLayerFromAnimationPlayer(); + else + delegate_->GetCcLayer()->RemoveLayerAnimationEventObserver(this); } - if (new_layer) - new_layer->AddLayerAnimationEventObserver(this); + if (new_layer) { + if (animation_player_) + AttachLayerToAnimationPlayer(new_layer->id()); + else + new_layer->AddLayerAnimationEventObserver(this); + } +} + +void LayerAnimator::SetCompositor(Compositor* compositor) { + DCHECK(compositor); + if (animation_player_) { + cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline(); + DCHECK(timeline); + timeline->AttachPlayer(animation_player_); + + DCHECK(delegate_->GetCcLayer()); + AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id()); + } +} + +void LayerAnimator::ResetCompositor(Compositor* compositor) { + DCHECK(compositor); + if (animation_player_) { + DetachLayerFromAnimationPlayer(); + + cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline(); + DCHECK(timeline); + timeline->DetachPlayer(animation_player_); + } +} + +void LayerAnimator::AttachLayerToAnimationPlayer(int layer_id) { + DCHECK(animation_player_); + + if (!animation_player_->layer_id()) + animation_player_->AttachLayer(layer_id); + else + DCHECK_EQ(animation_player_->layer_id(), layer_id); + + if (animation_player_->element_animations()) { + animation_player_->element_animations() + ->layer_animation_controller() + ->AddEventObserver(this); + } +} + +void LayerAnimator::DetachLayerFromAnimationPlayer() { + DCHECK(animation_player_); + + if (animation_player_->element_animations()) { + animation_player_->element_animations() + ->layer_animation_controller() + ->RemoveEventObserver(this); + } + + if (animation_player_->layer_id()) + animation_player_->DetachLayer(); +} + +void LayerAnimator::AddThreadedAnimation(scoped_ptr<cc::Animation> animation) { + DCHECK(animation_player_); + animation_player_->AddAnimation(std::move(animation)); +} + +void LayerAnimator::RemoveThreadedAnimation(int animation_id) { + DCHECK(animation_player_); + animation_player_->RemoveAnimation(animation_id); } void LayerAnimator::StartAnimation(LayerAnimationSequence* animation) {
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 1c92ac0..897bff9 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h
@@ -20,6 +20,9 @@ #include "ui/gfx/animation/tween.h" namespace cc { +class Animation; +class AnimationPlayer; +class AnimationTimeline; class Layer; } @@ -30,6 +33,7 @@ } namespace ui { +class Compositor; class Layer; class LayerAnimationSequence; class LayerAnimationDelegate; @@ -107,6 +111,16 @@ // Unsubscribe from |cc_layer_| and subscribe to |new_layer|. void SwitchToLayer(scoped_refptr<cc::Layer> new_layer); + // Attach AnimationPlayer to Layer and AnimationTimeline + void SetCompositor(Compositor* compositor); + // Detach AnimationPlayer from Layer and AnimationTimeline + void ResetCompositor(Compositor* compositor); + + // TODO(loyso): Rework it as an implementation for + // LayerThreadedAnimationDelegate and make it private. + void AddThreadedAnimation(scoped_ptr<cc::Animation> animation); + void RemoveThreadedAnimation(int animation_id); + // Sets the animation preemption strategy. This determines the behaviour if // a property is set during an animation. The default is // IMMEDIATELY_SET_NEW_TARGET (see ImmediatelySetNewTarget below). @@ -324,12 +338,18 @@ // LayerAnimationEventObserver void OnAnimationStarted(const cc::AnimationEvent& event) override; + void AttachLayerToAnimationPlayer(int layer_id); + void DetachLayerFromAnimationPlayer(); + // This is the queue of animations to run. AnimationQueue animation_queue_; // The target of all layer animations. LayerAnimationDelegate* delegate_; + // Plays CC animations. + scoped_refptr<cc::AnimationPlayer> animation_player_; + // The currently running animations. RunningAnimations running_animations_;
diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc index 77800169..61782e4a 100644 --- a/ui/ozone/demo/ozone_demo.cc +++ b/ui/ozone/demo/ozone_demo.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "base/at_exit.h" #include "base/command_line.h" #include "base/memory/scoped_vector.h" @@ -311,7 +313,7 @@ scoped_ptr<DemoWindow> window( new DemoWindow(this, &renderer_factory_, bounds)); window->Start(); - windows_.push_back(window.Pass()); + windows_.push_back(std::move(window)); } else { LOG(ERROR) << "Failed to configure display at " << bounds.ToString(); }
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc index 2b5a5d22..843fd2d74 100644 --- a/ui/ozone/platform/caca/caca_window_manager.cc +++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -137,7 +137,7 @@ scoped_ptr<CacaSurface> canvas(new CacaSurface(window)); bool initialized = canvas->Initialize(); DCHECK(initialized); - return canvas.Pass(); + return canvas; } } // namespace ui
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc index 2a9f4c02..1df1ff6 100644 --- a/ui/ozone/platform/caca/ozone_platform_caca.cc +++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -56,7 +56,7 @@ delegate, window_manager_.get(), event_source_.get(), bounds)); if (!caca_window->Initialize()) return nullptr; - return caca_window.Pass(); + return caca_window; } scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { return make_scoped_ptr(new NativeDisplayDelegateOzone());
diff --git a/ui/ozone/platform/cast/ozone_platform_cast.cc b/ui/ozone/platform/cast/ozone_platform_cast.cc index ec9f8a1..a0e282c 100644 --- a/ui/ozone/platform/cast/ozone_platform_cast.cc +++ b/ui/ozone/platform/cast/ozone_platform_cast.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/cast/ozone_platform_cast.h" +#include <utility> + #include "base/command_line.h" #include "base/lazy_instance.h" #include "chromecast/public/cast_egl_platform.h" @@ -37,7 +39,7 @@ class OzonePlatformCast : public OzonePlatform { public: explicit OzonePlatformCast(scoped_ptr<CastEglPlatform> egl_platform) - : egl_platform_(egl_platform.Pass()) {} + : egl_platform_(std::move(egl_platform)) {} ~OzonePlatformCast() override {} // OzonePlatform implementation: @@ -87,7 +89,7 @@ surface_factory_.reset(new SurfaceFactoryCast()); } void InitializeGPU() override { - surface_factory_.reset(new SurfaceFactoryCast(egl_platform_.Pass())); + surface_factory_.reset(new SurfaceFactoryCast(std::move(egl_platform_))); g_gpu_platform_support.Get() = make_scoped_ptr(new GpuPlatformSupportCast(surface_factory_.get())); } @@ -110,7 +112,7 @@ base::CommandLine::ForCurrentProcess()->argv(); scoped_ptr<chromecast::CastEglPlatform> platform( chromecast::CastEglPlatformShlib::Create(argv)); - return new OzonePlatformCast(platform.Pass()); + return new OzonePlatformCast(std::move(platform)); } } // namespace ui
diff --git a/ui/ozone/platform/cast/surface_factory_cast.cc b/ui/ozone/platform/cast/surface_factory_cast.cc index f92e1c9..01ae9f7 100644 --- a/ui/ozone/platform/cast/surface_factory_cast.cc +++ b/ui/ozone/platform/cast/surface_factory_cast.cc
@@ -6,6 +6,7 @@ #include <dlfcn.h> #include <EGL/egl.h> +#include <utility> #include "base/callback_helpers.h" #include "chromecast/public/cast_egl_platform.h" @@ -76,8 +77,7 @@ window_(0), display_size_(GetInitialDisplaySize()), new_display_size_(GetInitialDisplaySize()), - egl_platform_(egl_platform.Pass()) { -} + egl_platform_(std::move(egl_platform)) {} SurfaceFactoryCast::~SurfaceFactoryCast() { ShutdownHardware();
diff --git a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc index 4a09465..01ce8ce 100644 --- a/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc +++ b/ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/drm/client_native_pixmap_factory_gbm.h" +#include <utility> + #include "ui/gfx/native_pixmap_handle_ozone.h" #include "ui/ozone/public/client_native_pixmap_factory.h" // nogncheck @@ -41,7 +43,7 @@ // It's called in IO thread. We rely on clients for thread-safety. // Switching to an IPC message filter ensures thread-safety. DCHECK_LT(vgem_fd_.get(), 0); - vgem_fd_ = device_fd.Pass(); + vgem_fd_ = std::move(device_fd); #endif } bool IsConfigurationSupported(gfx::BufferFormat format,
diff --git a/ui/ozone/platform/drm/common/drm_util.cc b/ui/ozone/platform/drm/common/drm_util.cc index 57f3488..dee88d8 100644 --- a/ui/ozone/platform/drm/common/drm_util.cc +++ b/ui/ozone/platform/drm/common/drm_util.cc
@@ -9,6 +9,7 @@ #include <stdlib.h> #include <sys/mman.h> #include <xf86drmMode.h> +#include <utility> #include "ui/display/util/edid_parser.h" @@ -108,7 +109,7 @@ continue; if (name == tmp->name) { - *property = tmp.Pass(); + *property = std::move(tmp); return i; } } @@ -162,7 +163,7 @@ ScopedDrmConnectorPtr connector, ScopedDrmCrtcPtr crtc, size_t index) - : connector_(connector.Pass()), crtc_(crtc.Pass()), index_(index) {} + : connector_(std::move(connector)), crtc_(std::move(crtc)), index_(index) {} HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() { } @@ -186,11 +187,11 @@ continue; ScopedDrmCrtcPtr crtc(drmModeGetCrtc(fd, crtc_id)); - displays.push_back( - new HardwareDisplayControllerInfo(connector.Pass(), crtc.Pass(), i)); + displays.push_back(new HardwareDisplayControllerInfo(std::move(connector), + std::move(crtc), i)); } - return displays.Pass(); + return displays; } bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs) {
diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc index 9a16a95e..15e2b3a 100644 --- a/ui/ozone/platform/drm/gpu/drm_device.cc +++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -9,6 +9,7 @@ #include <unistd.h> #include <xf86drm.h> #include <xf86drmMode.h> +#include <utility> #include "base/logging.h" #include "base/message_loop/message_loop.h" @@ -215,7 +216,7 @@ base::File file, bool is_primary_device) : device_path_(device_path), - file_(file.Pass()), + file_(std::move(file)), page_flip_manager_(new PageFlipManager()), is_primary_device_(is_primary_device) {} @@ -370,7 +371,7 @@ continue; if (strcmp(property->name, name) == 0) - return property.Pass(); + return property; } return ScopedDrmPropertyPtr();
diff --git a/ui/ozone/platform/drm/gpu/drm_device_generator.cc b/ui/ozone/platform/drm/gpu/drm_device_generator.cc index d1bde61..ec26f87 100644 --- a/ui/ozone/platform/drm/gpu/drm_device_generator.cc +++ b/ui/ozone/platform/drm/gpu/drm_device_generator.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/drm/gpu/drm_device_generator.h" +#include <utility> + #include "ui/ozone/platform/drm/gpu/drm_device.h" namespace ui { @@ -19,7 +21,7 @@ base::File file, bool is_primary_device) { scoped_refptr<DrmDevice> drm = - new DrmDevice(device_path, file.Pass(), is_primary_device); + new DrmDevice(device_path, std::move(file), is_primary_device); if (drm->Initialize(false)) return drm;
diff --git a/ui/ozone/platform/drm/gpu/drm_device_manager.cc b/ui/ozone/platform/drm/gpu/drm_device_manager.cc index c366f65..c4f3304 100644 --- a/ui/ozone/platform/drm/gpu/drm_device_manager.cc +++ b/ui/ozone/platform/drm/gpu/drm_device_manager.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/drm/gpu/drm_device_manager.h" +#include <utility> + #include "base/file_descriptor_posix.h" #include "base/single_thread_task_runner.h" #include "ui/ozone/platform/drm/gpu/drm_device.h" @@ -29,8 +31,7 @@ DrmDeviceManager::DrmDeviceManager( scoped_ptr<DrmDeviceGenerator> drm_device_generator) - : drm_device_generator_(drm_device_generator.Pass()) { -} + : drm_device_generator_(std::move(drm_device_generator)) {} DrmDeviceManager::~DrmDeviceManager() { DCHECK(drm_device_map_.empty()); @@ -46,8 +47,8 @@ return false; } - scoped_refptr<DrmDevice> device = - drm_device_generator_->CreateDevice(path, file.Pass(), !primary_device_); + scoped_refptr<DrmDevice> device = drm_device_generator_->CreateDevice( + path, std::move(file), !primary_device_); if (!device) { LOG(ERROR) << "Could not initialize DRM device for " << path.value(); return false;
diff --git a/ui/ozone/platform/drm/gpu/drm_thread.cc b/ui/ozone/platform/drm/gpu/drm_thread.cc index 901dedb0..5266f747 100644 --- a/ui/ozone/platform/drm/gpu/drm_thread.cc +++ b/ui/ozone/platform/drm/gpu/drm_thread.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/drm/gpu/drm_thread.h" +#include <utility> + #include "base/command_line.h" #include "base/thread_task_runner_handle.h" #include "ui/ozone/platform/drm/gpu/drm_buffer.h" @@ -51,7 +53,7 @@ base::File file, bool is_primary_device) override { scoped_refptr<DrmDevice> drm = - new GbmDevice(path, file.Pass(), is_primary_device); + new GbmDevice(path, std::move(file), is_primary_device); if (drm->Initialize(use_atomic_)) return drm; @@ -128,7 +130,7 @@ scoped_ptr<DrmWindow> window( new DrmWindow(widget, device_manager_.get(), screen_manager_.get())); window->Initialize(); - screen_manager_->AddWindow(widget, window.Pass()); + screen_manager_->AddWindow(widget, std::move(window)); } void DrmThread::DestroyWindow(gfx::AcceleratedWidget widget) {
diff --git a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc index a722266..9d9d0ecd 100644 --- a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc +++ b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> #include <vector> #include "base/memory/scoped_ptr.h" @@ -99,7 +100,7 @@ window->Initialize(); window->SetBounds( gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); - screen_manager_->AddWindow(kDefaultWidgetHandle, window.Pass()); + screen_manager_->AddWindow(kDefaultWidgetHandle, std::move(window)); } void DrmWindowTest::TearDown() {
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc index 34570f0..567f5d9 100644 --- a/ui/ozone/platform/drm/gpu/gbm_buffer.cc +++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
@@ -8,6 +8,7 @@ #include <fcntl.h> #include <gbm.h> #include <xf86drm.h> +#include <utility> #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -69,7 +70,7 @@ : surface_manager_(surface_manager) {} void GbmPixmap::Initialize(base::ScopedFD dma_buf, int dma_buf_pitch) { - dma_buf_ = dma_buf.Pass(); + dma_buf_ = std::move(dma_buf); dma_buf_pitch_ = dma_buf_pitch; } @@ -82,7 +83,7 @@ PLOG(ERROR) << "Failed to export buffer to dma_buf"; return false; } - Initialize(dma_buf.Pass(), gbm_bo_get_stride(buffer->bo())); + Initialize(std::move(dma_buf), gbm_bo_get_stride(buffer->bo())); buffer_ = buffer; return true; }
diff --git a/ui/ozone/platform/drm/gpu/gbm_device.cc b/ui/ozone/platform/drm/gpu/gbm_device.cc index b25d827..60d63a9e 100644 --- a/ui/ozone/platform/drm/gpu/gbm_device.cc +++ b/ui/ozone/platform/drm/gpu/gbm_device.cc
@@ -5,13 +5,14 @@ #include "ui/ozone/platform/drm/gpu/gbm_device.h" #include <gbm.h> +#include <utility> namespace ui { GbmDevice::GbmDevice(const base::FilePath& device_path, base::File file, bool is_primary_device) - : DrmDevice(device_path, file.Pass(), is_primary_device) {} + : DrmDevice(device_path, std::move(file), is_primary_device) {} GbmDevice::~GbmDevice() { if (device_)
diff --git a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc index 737a066..500d74c 100644 --- a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc +++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
@@ -4,6 +4,8 @@ #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h" +#include <utility> + #include "ui/ozone/platform/drm/gpu/drm_device.h" #include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h" #include "ui/ozone/platform/drm/gpu/drm_window_proxy.h" @@ -14,7 +16,7 @@ GbmSurfaceless::GbmSurfaceless(scoped_ptr<DrmWindowProxy> window, GbmSurfaceFactory* surface_manager) - : window_(window.Pass()), surface_manager_(surface_manager) { + : window_(std::move(window)), surface_manager_(surface_manager) { surface_manager_->RegisterSurface(window_->widget(), this); }
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc index 09d60a96..b22aa7e3 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_controller.cc +++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
@@ -7,6 +7,7 @@ #include <drm.h> #include <string.h> #include <xf86drm.h> +#include <utility> #include "base/basictypes.h" #include "base/logging.h" @@ -34,7 +35,7 @@ const gfx::Point& origin) : origin_(origin), is_disabled_(controller->is_disabled()) { - AddCrtc(controller.Pass()); + AddCrtc(std::move(controller)); } HardwareDisplayController::~HardwareDisplayController() { @@ -201,7 +202,7 @@ crtc_plane_list->old_plane_list.push_back(plane.get()); } - crtc_controllers_.push_back(controller.Pass()); + crtc_controllers_.push_back(std::move(controller)); } scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc( @@ -235,7 +236,7 @@ owned_hardware_planes_.erase(controller->drm().get()); } - return controller.Pass(); + return controller; } }
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc index 88ee51b..6a8ed5dd 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -7,6 +7,7 @@ #include <drm_fourcc.h> #include <set> +#include <utility> #include "base/logging.h" #include "ui/gfx/geometry/rect.h" @@ -108,7 +109,7 @@ // plane is updated via cursor specific DRM API. Hence, we dont keep // track of Cursor plane here to avoid re-using it for any other purpose. if (plane->type() != HardwareDisplayPlane::kCursor) - planes_.push_back(plane.Pass()); + planes_.push_back(std::move(plane)); } } @@ -123,7 +124,7 @@ CreatePlane(resources->crtcs[i] - 1, (1 << i))); if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true, false)) { - planes_.push_back(dummy_plane.Pass()); + planes_.push_back(std::move(dummy_plane)); } } }
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc index 3e72e67..e29e47e 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
@@ -4,6 +4,7 @@ #include <drm_fourcc.h> +#include <utility> #include <vector> #include "base/memory/scoped_ptr.h" @@ -66,7 +67,7 @@ // Add support to test more formats. plane->Initialize(drm_, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888), false, true); - planes_.push_back(plane.Pass()); + planes_.push_back(std::move(plane)); } // The real HDPM uses sorted planes, so sort them for consistency. std::sort(planes_.begin(), planes_.end(),
diff --git a/ui/ozone/platform/drm/gpu/mock_drm_device.cc b/ui/ozone/platform/drm/gpu/mock_drm_device.cc index 8f3e751..80ba401 100644 --- a/ui/ozone/platform/drm/gpu/mock_drm_device.cc +++ b/ui/ozone/platform/drm/gpu/mock_drm_device.cc
@@ -7,6 +7,7 @@ #include <drm_fourcc.h> #include <xf86drm.h> #include <xf86drmMode.h> +#include <utility> #include "base/logging.h" #include "third_party/skia/include/core/SkCanvas.h" @@ -37,7 +38,7 @@ // Add support to test more formats. plane->Initialize(drm, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888), false, true); - planes_.push_back(plane.Pass()); + planes_.push_back(std::move(plane)); } } }
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc index 52959847a..ca58acd5 100644 --- a/ui/ozone/platform/drm/gpu/screen_manager.cc +++ b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -5,6 +5,7 @@ #include "ui/ozone/platform/drm/gpu/screen_manager.h" #include <xf86drmMode.h> +#include <utility> #include "third_party/skia/include/core/SkCanvas.h" #include "ui/gfx/geometry/point.h" @@ -216,7 +217,7 @@ void ScreenManager::AddWindow(gfx::AcceleratedWidget widget, scoped_ptr<DrmWindow> window) { std::pair<WidgetToWindowMap::iterator, bool> result = - window_map_.add(widget, window.Pass()); + window_map_.add(widget, std::move(window)); DCHECK(result.second) << "Window already added."; UpdateControllerToWindowMapping(); } @@ -226,7 +227,7 @@ scoped_ptr<DrmWindow> window = window_map_.take_and_erase(widget); DCHECK(window) << "Attempting to remove non-existing window for " << widget; UpdateControllerToWindowMapping(); - return window.Pass(); + return window; } DrmWindow* ScreenManager::GetWindow(gfx::AcceleratedWidget widget) {
diff --git a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc index 141b7e8..e50fc517 100644 --- a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc +++ b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "testing/gtest/include/gtest/gtest.h" #include "ui/ozone/platform/drm/gpu/crtc_controller.h" #include "ui/ozone/platform/drm/gpu/drm_device_generator.h" @@ -375,7 +377,7 @@ new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get())); window->Initialize(); window->SetBounds(GetPrimaryBounds()); - screen_manager_->AddWindow(1, window.Pass()); + screen_manager_->AddWindow(1, std::move(window)); screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); screen_manager_->ConfigureDisplayController( @@ -395,7 +397,7 @@ gfx::Rect new_bounds = GetPrimaryBounds(); new_bounds.Inset(0, 0, 1, 1); window->SetBounds(new_bounds); - screen_manager_->AddWindow(1, window.Pass()); + screen_manager_->AddWindow(1, std::move(window)); screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); screen_manager_->ConfigureDisplayController( @@ -416,7 +418,7 @@ new ui::DrmWindow(i, device_manager_.get(), screen_manager_.get())); window->Initialize(); window->SetBounds(GetPrimaryBounds()); - screen_manager_->AddWindow(i, window.Pass()); + screen_manager_->AddWindow(i, std::move(window)); } screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); @@ -441,7 +443,7 @@ window_id, device_manager_.get(), screen_manager_.get())); window->Initialize(); window->SetBounds(GetPrimaryBounds()); - screen_manager_->AddWindow(window_id, window.Pass()); + screen_manager_->AddWindow(window_id, std::move(window)); screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); screen_manager_->ConfigureDisplayController( @@ -463,7 +465,7 @@ new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get())); window->Initialize(); window->SetBounds(GetPrimaryBounds()); - screen_manager_->AddWindow(1, window.Pass()); + screen_manager_->AddWindow(1, std::move(window)); screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); screen_manager_->ConfigureDisplayController( @@ -497,7 +499,7 @@ window->SchedulePageFlip( std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(buffer)), base::Bind(&EmptySwapCallback)); - screen_manager_->AddWindow(1, window.Pass()); + screen_manager_->AddWindow(1, std::move(window)); screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector); screen_manager_->ConfigureDisplayController(
diff --git a/ui/ozone/platform/drm/host/drm_device_handle.cc b/ui/ozone/platform/drm/host/drm_device_handle.cc index 8d9fc0c..083c292 100644 --- a/ui/ozone/platform/drm/host/drm_device_handle.cc +++ b/ui/ozone/platform/drm/host/drm_device_handle.cc
@@ -7,6 +7,7 @@ #include <fcntl.h> #include <xf86drm.h> #include <xf86drmMode.h> +#include <utility> #include "base/files/file_path.h" #include "base/posix/eintr_wrapper.h" @@ -65,7 +66,7 @@ } base::ScopedFD DrmDeviceHandle::PassFD() { - return file_.Pass(); + return std::move(file_); } } // namespace ui
diff --git a/ui/ozone/platform/drm/host/drm_display_host_manager.cc b/ui/ozone/platform/drm/host/drm_display_host_manager.cc index f0b86c1..faa9ef0 100644 --- a/ui/ozone/platform/drm/host/drm_display_host_manager.cc +++ b/ui/ozone/platform/drm/host/drm_display_host_manager.cc
@@ -6,6 +6,7 @@ #include <fcntl.h> #include <xf86drm.h> +#include <utility> #include "base/files/file_enumerator.h" #include "base/thread_task_runner_handle.h" @@ -46,7 +47,7 @@ scoped_ptr<DrmDeviceHandle> handle(new DrmDeviceHandle()); handle->Initialize(path); reply_runner->PostTask( - FROM_HERE, base::Bind(callback, path, base::Passed(handle.Pass()))); + FROM_HERE, base::Bind(callback, path, base::Passed(std::move(handle)))); } base::FilePath GetPrimaryDisplayCardPath() { @@ -328,7 +329,7 @@ drm_devices_.clear(); drm_devices_.insert(primary_graphics_card_path_); - scoped_ptr<DrmDeviceHandle> handle = primary_drm_device_handle_.Pass(); + scoped_ptr<DrmDeviceHandle> handle = std::move(primary_drm_device_handle_); if (!handle) { base::ThreadRestrictions::ScopedAllowIO allow_io; handle.reset(new DrmDeviceHandle());
diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc index d8ee6a2c..3f1dc5e 100644 --- a/ui/ozone/platform/drm/ozone_platform_gbm.cc +++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -9,6 +9,7 @@ #include <gbm.h> #include <stdlib.h> #include <xf86drm.h> +#include <utility> #include "base/bind.h" #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" @@ -105,7 +106,7 @@ event_factory_ozone_.get(), cursor_.get(), window_manager_.get(), display_manager_.get())); platform_window->Initialize(); - return platform_window.Pass(); + return std::move(platform_window); } scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { return make_scoped_ptr(