0

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}
This commit is contained in:
avi
2015-12-20 22:14:36 -08:00
committed by Commit bot
parent a0b6d530f2
commit 02a4d17f5a
499 changed files with 1156 additions and 256 deletions
cc
animation
base
blink
debug
input
layers
append_quads_data.hcontent_layer_client.hdelegated_frame_provider.ccdelegated_frame_provider.hdelegated_frame_resource_collection.ccdelegated_frame_resource_collection.hdelegated_renderer_layer.hdelegated_renderer_layer_impl.ccdelegated_renderer_layer_impl.hdelegated_renderer_layer_impl_unittest.ccdraw_properties.hheads_up_display_layer.hheads_up_display_layer_impl.ccheads_up_display_layer_impl.hheads_up_display_layer_impl_unittest.ccio_surface_layer.ccio_surface_layer.hio_surface_layer_impl.hio_surface_layer_impl_unittest.cclayer.cclayer.hlayer_impl.cclayer_impl.hlayer_iterator.hlayer_unittest.ccnine_patch_layer.hnine_patch_layer_impl.hnine_patch_layer_impl_unittest.ccpainted_scrollbar_layer.ccpainted_scrollbar_layer.hpainted_scrollbar_layer_impl.hpainted_scrollbar_layer_impl_unittest.ccpicture_image_layer.ccpicture_image_layer.hpicture_image_layer_impl.hpicture_layer.hpicture_layer_impl.ccpicture_layer_impl.hpicture_layer_impl_perftest.ccpicture_layer_impl_unittest.ccpicture_layer_unittest.ccrender_surface_impl.ccrender_surface_impl.hrender_surface_impl_unittest.ccscrollbar_layer_impl_base.hscrollbar_layer_interface.hscrollbar_layer_unittest.ccsolid_color_layer.hsolid_color_layer_impl.hsolid_color_layer_impl_unittest.ccsolid_color_scrollbar_layer.hsolid_color_scrollbar_layer_impl_unittest.ccsurface_layer.ccsurface_layer.hsurface_layer_impl.ccsurface_layer_impl.hsurface_layer_impl_unittest.ccsurface_layer_unittest.cctexture_layer.htexture_layer_impl.cctexture_layer_impl.htexture_layer_impl_unittest.cctexture_layer_unittest.ccui_resource_layer.hui_resource_layer_impl.hui_resource_layer_impl_unittest.ccvideo_frame_provider_client_impl.hvideo_frame_provider_client_impl_unittest.ccvideo_layer.hvideo_layer_impl.ccvideo_layer_impl.hvideo_layer_impl_unittest.ccviewport.h
output
playback
proto
quads
raster
resources
scheduler
surfaces
test
tiles
trees

@ -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"

@ -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"

@ -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"

@ -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 {

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -4,6 +4,8 @@
#include "cc/animation/layer_animation_controller.h"
#include <stddef.h>
#include <algorithm>
#include <vector>

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -4,6 +4,8 @@
#include "cc/animation/transform_operations.h"
#include <stddef.h>
#include <algorithm>
#include "ui/gfx/animation/tween.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"

@ -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"

@ -4,6 +4,8 @@
#include "cc/base/contiguous_container.h"
#include <stddef.h>
#include <utility>
namespace cc {

@ -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"

@ -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"

@ -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"

@ -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) {
}

@ -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"

@ -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"

@ -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;

@ -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"

@ -4,6 +4,8 @@
#include "cc/base/list_container.h"
#include <stddef.h>
#include <algorithm>
#include <vector>
#include "testing/gmock/include/gmock/gmock.h"

@ -4,6 +4,8 @@
#include "cc/base/math_util.h"
#include <stdint.h>
#include <cmath>
#include "cc/test/geometry_test_utils.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"

@ -4,6 +4,8 @@
#include "cc/base/random_access_list_container.h"
#include <stddef.h>
#include <algorithm>
#include <vector>

@ -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"

@ -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"

@ -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"

@ -4,6 +4,9 @@
#include "cc/base/rtree.h"
#include <stddef.h>
#include <stdint.h>
#include <cmath>
#include "base/logging.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>

@ -4,6 +4,8 @@
#include "cc/base/rtree.h"
#include <stddef.h>
#include "testing/gtest/include/gtest/gtest.h"
namespace 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;
}

@ -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"

@ -4,6 +4,8 @@
#include "cc/base/simple_enclosed_region.h"
#include <stddef.h>
#include <algorithm>
#include <vector>

@ -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"

@ -4,6 +4,8 @@
#include "cc/base/tiling_data.h"
#include <stddef.h>
#include <algorithm>
#include <vector>

@ -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));
}

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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.

@ -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(); }

@ -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"

@ -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"

@ -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"

@ -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 {

@ -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"

@ -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"

@ -4,6 +4,9 @@
#include "cc/blink/web_layer_impl.h"
#include <stddef.h>
#include <stdint.h>
#include <utility>
#include <vector>

@ -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"

@ -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"

@ -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"

@ -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"

@ -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 {

@ -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"

@ -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"

@ -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"

@ -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 {

@ -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"

@ -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"

@ -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);

@ -4,6 +4,8 @@
#include "cc/debug/frame_rate_counter.h"
#include <stddef.h>
#include <algorithm>
#include <limits>

@ -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"

@ -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 {

@ -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"

@ -4,6 +4,8 @@
#include "cc/debug/frame_timing_tracker.h"
#include <stdint.h>
#include <algorithm>
#include <limits>

@ -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"

@ -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>

@ -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"

@ -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

@ -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

@ -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"

@ -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 {

@ -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 {

@ -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 {

@ -4,6 +4,8 @@
#include "cc/debug/picture_debug_util.h"
#include <stddef.h>
#include <vector>
#include "base/base64.h"

@ -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"

@ -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>

@ -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"

@ -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>

@ -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;

@ -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;

@ -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(

Some files were not shown because too many files have changed in this diff Show More