Switch to standard integer types in cc/.

BUG=138542
TBR=danakj@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1539203002

Cr-Commit-Position: refs/heads/master@{#366333}

19 files changed, 45 insertions, 2 deletions

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"