diff options
Diffstat (limited to 'cc')
499 files changed, 1156 insertions, 256 deletions
diff --git a/cc/animation/animation.h b/cc/animation/animation.h index 153e4ef..fb8f8d8 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 53027e2..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.h b/cc/animation/animation_player.h index 3665a23..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_registrar.cc b/cc/animation/animation_registrar.cc index a3edd74..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 4cb31f5..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..24101f6 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..b909dcc 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 7f0f033..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 95f3d9f..d27a6dd 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 f6f4011..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 572ab47..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 f58f5f8..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 b5e3a6a..dde2e62 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 @@ const char* GetClientNameForMetrics() { } // 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 be0b2b7..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..e82de66 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 3030a17..8332f9a 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..0b389f4 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 b9bc0fb..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 869da4e..ca3ad61 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 732b04d..004db11 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 @@ namespace cc { 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..b54091a 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 6179697..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 0eb381f..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 @@ blink::WebSize WebExternalBitmapImpl::size() { 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 @@ class WebExternalBitmapImpl : public blink::WebExternalBitmap { // 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 42bab59..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 e642915..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 3a21853..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..b6f1cab 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 99cfa21..af70156 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 1efabde..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..bea3467 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 @@ class ScopedImageDecodeTask { 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 c43270d..a6b4a44 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..ad91598 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 6c54ea2..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..6b2b57c 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 e1e7258..dda2e31 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..5341b6a 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 7383497..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 @@ bool InvalidationBenchmark::ProcessMessage(scoped_ptr<base::Value> value) { // 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 9423d5d..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 @@ class CC_EXPORT InvalidationBenchmark : public MicroBenchmark { 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..3b5ba3a 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..b1879af 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 41cd9cc..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 2d649cc..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..bb4d9a0 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 @@ struct CC_EXPORT RenderingStats { // 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 94768c6..de7057e 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 @@ void RenderingStatsInstrumentation::AccumulateAndClearImplThreadStats() { 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 @@ void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) { 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::AddVisibleContentArea(int64 area) { } void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -63,7 +65,7 @@ void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea( } void RenderingStatsInstrumentation::AddCheckerboardedVisibleContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -72,7 +74,7 @@ void RenderingStatsInstrumentation::AddCheckerboardedVisibleContentArea( } void RenderingStatsInstrumentation::AddCheckerboardedNoRecordingContentArea( - int64 area) { + int64_t area) { if (!record_rendering_stats_) return; @@ -81,7 +83,7 @@ void RenderingStatsInstrumentation::AddCheckerboardedNoRecordingContentArea( } 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 @@ class CC_EXPORT RenderingStatsInstrumentation { 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..6b42243 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 7b09cc1..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 cc { 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 3d05109..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 @@ struct AppendQuadsData { 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 6c9983b..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..c567b82 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..5d51116 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 725fb79..b94dedf 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 bcab910..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..5ffa31a 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 4d65a81..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..e104c33 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 c2e3530..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 526b5dd..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..6c9036c 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 789152a..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..ff76663 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 e4c779a..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 0d25dbc..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 8f01601..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..8ea06ab 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 3edc450..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..fd3c1a2 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 8d2efe0..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 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass, 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 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass, // 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 @@ void PictureLayerImpl::RecalculateRasterScales() { 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 6cbd7a0..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..c38dd3e 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 c41ff5a..badd37f 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 97751fd..9568bde 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 96ca40b..e8eb264 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 99d52b6..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 2068ac5..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 a7317ec..a4d1bfa 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..a285f44 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 @@ class SatisfySwapPromise : public SwapPromise { 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..c2e8a2d 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 e0dcadf..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 4d2c48b..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 2348909..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 @@ bool TextureLayerImpl::WillDraw(DrawMode draw_mode, } 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 680aaf0..e799eff 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 fe2e006..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 @@ struct CommonMailboxObjects { 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..52a45b7 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..05293e6 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..e337baa 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..d173cc6 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 efe4cc5..695c47e 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 3ab1e8c..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 392c6b0..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 23a8e2c..5ff7f93 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..c560ad0 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 3cb946c..8d9d275 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..4b0c9cc 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..28f2591 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 @@ void DynamicGeometryBinding::InitializeCustomQuadWithUVs(const gfx::QuadF& quad, 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 1579e55..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 @@ GeometryBindingQuadIndex::GeometryBindingQuadIndex() { 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 GeometryBindingQuad { 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 df6227f..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 dda82ef..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 @@ void GLRenderer::FinishedReadback(unsigned source_buffer, 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..8a7694a 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..f20eb2d 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 @@ void LatencyInfoSwapPromise::DidNotSwap(DidNotSwapReason reason) { // 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..23a1c86 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 @@ class CC_EXPORT LatencyInfoSwapPromise : public SwapPromise { 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 537c87b..450bfbc 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 9ed3ff5..22b9357 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..0dc7def 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..de2ecfd 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 108f556..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 @@ class SkiaGpuTraceMemoryDump : public SkTraceMemoryDump { 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 8f3704c..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 076ea9d..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 bdf2cc2..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..806753b 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 e525025..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 7cccb24..9405474 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 1c7f086..6c5e255 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 CreateTestTextureDrawQuad(const gfx::Rect& rect, 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 @@ void CreateTestYUVVideoDrawQuad_Striped( 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 @@ void CreateTestYUVVideoDrawQuad_TwoColor( 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 @@ void CreateTestYUVVideoDrawQuad_TwoColor( 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 @@ void CreateTestYUVVideoDrawQuad_TwoColor( } } - 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 @@ void CreateTestYUVVideoDrawQuad_Solid( 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 @@ void CreateTestYUVVideoDrawQuad_Solid( 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..75cac6c 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..88b632e 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..722a192 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 58d0417..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..df54067 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 @@ StaticGeometryBinding::StaticGeometryBinding(gpu::gles2::GLES2Interface* gl, 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..86b84ee 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..f3c3fbd 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 @@ class CC_EXPORT SwapPromise { // 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 5140213..97e877e 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..1a39af2 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..0ad1eff 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..6828fcf 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 e109e2b..93ee2c5 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..1c7c1fb 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 80c713d..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 8c06c8d..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 c7b3af9..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 57602fb..9054238 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..d1caf98 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 f314608..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 261b3b3..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 d51da7c..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 c0a8df9..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..8c34c5f 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..7c76114 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 cce5671..8350c61 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 8f7303c..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..5b89136 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..9bf17f2 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 4a8a072..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..cd5dd38 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..62593e5 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 e6cc67a..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 5fea6dc..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..11cb777 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 1044fdc..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..46f6be4 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..d13ac97 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 3dfd85b..1a72078 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 c059483..8892502 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 20ac14c..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 @@ void OneCopyTileTaskWorkerPool::StagingBuffer::OnMemoryDump( 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 d9613b3..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 156ef9a..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 95faedc..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..95d3c77 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..55b0ca4 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 2d2771a..311a4c3 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 6f1005b..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..96ab60d 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 1958ca2..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 6b550fa..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..c873089 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 8830c1f..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 15ddc75..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 @@ class MemoryHistory { 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 17eddc1..f7d3705 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 507aa2b..b9630fa 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 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider { ~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 4e49075..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 @@ bool ResourceProvider::OnMemoryDump( 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 @@ class ContextSharedData { 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 @@ class ContextSharedData { 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 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { } 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..35de506 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 fc15736..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 04dab74..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 @@ GetSharedBitmapGUIDForTracing(const SharedBitmapId& bitmap_id); 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 @@ class CC_EXPORT SharedBitmap { 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::MailboxHolder& mailbox_holder) 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, 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..42109c6 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 @@ class CC_EXPORT TextureMailbox { 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 @@ class CC_EXPORT TextureMailbox { 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 a3231bc..55d2216 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 @@ struct CC_EXPORT TransferableResource { 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 953d419..b8fbf31 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 129be96..34e73ee 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..7d57a41 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 3da2023..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 @@ class VideoResourceUpdaterTest : public testing::Test { 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 2681983..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 87ed17f..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..43ba4fa 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 kActivateEstimationPercentile = 90.0; 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 1523aeb..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..2cbc8a8 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 @@ TEST(DelayBasedTimeSourceTest, AchievesTargetRateWithNoNoise) { 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..22c58d0 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..7f577a6 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 1344847..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..6c29dc8 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..a83aee3 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 3c97bdc..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 6df7e6b..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..95f0261 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 @@ TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) { 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 @@ TEST_F(SurfaceFactoryTest, DestroyAll) { 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 144d0d6..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 04f60d9..d714675 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 31b1e87..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..03951e4 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 8430ea6..7466501 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/begin_frame_args_test.cc b/cc/test/begin_frame_args_test.cc index 4c3b5a4..8b4dfd3 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 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 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 9ef5d53..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 @@ BeginFrameArgs CreateBeginFrameArgsForTesting( 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 98f5d90..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 4878ea5..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 6ffa8fe..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 c63f5d2..5354833 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..ae47704 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 72ea250..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..6bb9b17 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 3d8431e..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..aa76d6a 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 8ae49e4..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..9dde749 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 a025629..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 02b66ac..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..f111032 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..48a5dbb 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 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( 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> LayerTreePixelTest::CopyTextureMailboxToBitmap( 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..cb3c4c5 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..8b2a6ca 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 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp, // 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 1bb9966..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 c04c1e0..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..c237c39 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..2973aff 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 05e54b7..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 3a570ca..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..b0ac88e 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..bf033fc 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() 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 @@ void TestContextSupport::SignalSyncToken(const gpu::SyncToken& sync_token, 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::SetScheduleOverlayPlaneCallback( 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..d82c7ae 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 @@ class TestContextSupport : public gpu::ContextSupport { ~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 85f642c..fcaaa32 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..fd1745e 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 904ac6d..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 7697bd1..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 @@ class OwnedSharedBitmap : public SharedBitmap { 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 @@ scoped_ptr<SharedBitmap> TestSharedBitmapManager::GetSharedBitmapFromId( 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..b0e9bc4 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..fea16fb 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..96b11b4 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 @@ void TestWebGraphicsContext3D::bufferData(GLenum target, 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 4e6d761..08447f7 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 @@ class TestWebGraphicsContext3D { ~Buffer(); GLenum target; - scoped_ptr<uint8[]> pixels; + scoped_ptr<uint8_t[]> pixels; size_t size; private: @@ -418,7 +422,7 @@ class TestWebGraphicsContext3D { 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 f07892c..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 @@ namespace BASE_HASH_NAMESPACE { 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..5612287 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 e2187d2..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 e245e01..6ca9e87 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 @@ class CC_EXPORT Tile { 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() 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 @@ class CC_EXPORT TileManager { 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 2c69999..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 184fc2d..023fac5 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 59696e4..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..a010176 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 6c90c6c..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..6550db1 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..c8a3d3f 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::OnSetNeedsRedrawOnImpl() { 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..df74721 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 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses( 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 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses( 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 @@ void LayerTreeHostImpl::UpdateTileManagerMemoryPolicy( 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 7f2cc34..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..78be80f 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 @@ class BrowserCompositorInvalidateLayerTreePerfTest 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 29ab0d0..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 @@ SkColor kCSSTestColors[] = { 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..971fc37 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..6974c92 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 @@ class TestSwapPromise : public SwapPromise { 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 @@ class LayerTreeHostAnimationTestNotifyAnimationFinished 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 8c5dd8a..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 96b18da..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..b0ddf86 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 e00b085..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..c1c3cb4 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..6d4ba26 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..0eb1849 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 0939ba0..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 fec4915..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..250ac4d 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 3ae39e6..ccaa75a 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 5c658c3..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..1120d30 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 5afbcac..ff5c8a5 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 e7bcd6d..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..cab850e 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 5d10f4a..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 17350d8..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 9935147..72b6daa 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..a580362 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> |