From d2d02a5fe67ea12c187daf3184da9c76224ae71d Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 29 Sep 2015 11:55:08 -0700 Subject: [PATCH] Run a CPPLint pass on sky/compositor --- sky/compositor/compositor_options.h | 4 +--- sky/compositor/container_layer.h | 1 + sky/compositor/instrumentation.cc | 4 ++-- sky/compositor/instrumentation.h | 3 +-- sky/compositor/paint_context.cc | 4 ++-- sky/compositor/paint_context.h | 9 +++++---- sky/compositor/picture_serializer.cc | 2 +- sky/compositor/statistics_layer.cc | 1 + sky/compositor/statistics_layer.h | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sky/compositor/compositor_options.h b/sky/compositor/compositor_options.h index 76dd10f4d09..7df10fd0692 100644 --- a/sky/compositor/compositor_options.h +++ b/sky/compositor/compositor_options.h @@ -5,11 +5,9 @@ #ifndef SKY_COMPOSITOR_COMPOSITOR_OPTIONS_H_ #define SKY_COMPOSITOR_COMPOSITOR_OPTIONS_H_ -#include "base/macros.h" - #include - #include +#include "base/macros.h" namespace sky { namespace compositor { diff --git a/sky/compositor/container_layer.h b/sky/compositor/container_layer.h index 191f39c2d73..4da312f8339 100644 --- a/sky/compositor/container_layer.h +++ b/sky/compositor/container_layer.h @@ -5,6 +5,7 @@ #ifndef SKY_COMPOSITOR_CONTAINER_LAYER_H_ #define SKY_COMPOSITOR_CONTAINER_LAYER_H_ +#include #include "sky/compositor/layer.h" namespace sky { diff --git a/sky/compositor/instrumentation.cc b/sky/compositor/instrumentation.cc index 9c2c2815ba1..8d492dde328 100644 --- a/sky/compositor/instrumentation.cc +++ b/sky/compositor/instrumentation.cc @@ -44,7 +44,7 @@ void Stopwatch::visualize(SkCanvas& canvas, const SkRect& rect) const { path.moveTo(0, 0); path.lineTo(0, height * (_laps[0].InMillisecondsF() / 16.0)); for (size_t i = 0; i < kMaxSamples; i++) { - path.lineTo(width * ((double)i / kMaxSamples), + path.lineTo(width * (static_cast(i) / kMaxSamples), height * (_laps[i].InMillisecondsF() / 16.0)); } path.lineTo(width, 0); @@ -58,7 +58,7 @@ void Stopwatch::visualize(SkCanvas& canvas, const SkRect& rect) const { paint.setColor(0xFF00FF00); paint.setStrokeWidth(3); paint.setStyle(SkPaint::Style::kStroke_Style); - auto sampleX = width * ((double)_current_sample / kMaxSamples); + auto sampleX = width * (static_cast(_current_sample) / kMaxSamples); canvas.drawLine(sampleX, 0, sampleX, height, paint); } diff --git a/sky/compositor/instrumentation.h b/sky/compositor/instrumentation.h index 45adb8a5ad7..b759e9095d8 100644 --- a/sky/compositor/instrumentation.h +++ b/sky/compositor/instrumentation.h @@ -5,12 +5,11 @@ #ifndef SKY_COMPOSITOR_INSTRUMENTATION_H_ #define SKY_COMPOSITOR_INSTRUMENTATION_H_ +#include #include "base/macros.h" #include "base/time/time.h" #include "third_party/skia/include/core/SkCanvas.h" -#include - namespace sky { namespace compositor { namespace instrumentation { diff --git a/sky/compositor/paint_context.cc b/sky/compositor/paint_context.cc index 175aa6935b7..89510448e29 100644 --- a/sky/compositor/paint_context.cc +++ b/sky/compositor/paint_context.cc @@ -36,7 +36,7 @@ PaintContext::ScopedFrame PaintContext::AcquireFrame( PaintContext::ScopedFrame::ScopedFrame(PaintContext& context, SkCanvas& canvas) : context_(context), canvas_(&canvas) { context_.beginFrame(*this); -}; +} PaintContext::ScopedFrame::ScopedFrame(ScopedFrame&& frame) = default; @@ -51,7 +51,7 @@ PaintContext::ScopedFrame::ScopedFrame(PaintContext& context, canvas_ = trace_recorder_->getRecordingCanvas(); DCHECK(canvas_); context_.beginFrame(*this); -}; +} PaintContext::ScopedFrame::~ScopedFrame() { context_.endFrame(*this); diff --git a/sky/compositor/paint_context.h b/sky/compositor/paint_context.h index 8e61005859e..8f551233fc5 100644 --- a/sky/compositor/paint_context.h +++ b/sky/compositor/paint_context.h @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_COMPOSITOR_PAINT_CONTEXT_CC_ -#define SKY_COMPOSITOR_PAINT_CONTEXT_CC_ +#ifndef SKY_COMPOSITOR_PAINT_CONTEXT_H_ +#define SKY_COMPOSITOR_PAINT_CONTEXT_H_ #include +#include #include "base/macros.h" #include "base/logging.h" @@ -23,7 +24,7 @@ class PaintContext { public: SkCanvas& canvas() { return *canvas_; } - const PaintContext& context() const { return context_; }; + const PaintContext& context() const { return context_; } ScopedFrame(ScopedFrame&& frame); @@ -71,4 +72,4 @@ class PaintContext { } // namespace compositor } // namespace sky -#endif // SKY_COMPOSITOR_PAINT_CONTEXT_CC_ +#endif // SKY_COMPOSITOR_PAINT_CONTEXT_H_ diff --git a/sky/compositor/picture_serializer.cc b/sky/compositor/picture_serializer.cc index 47117e718af..7260d826f66 100644 --- a/sky/compositor/picture_serializer.cc +++ b/sky/compositor/picture_serializer.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 #include "sky/compositor/picture_serializer.h" - #include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkPixelSerializer.h" #include "third_party/skia/include/core/SkStream.h" diff --git a/sky/compositor/statistics_layer.cc b/sky/compositor/statistics_layer.cc index e6f9bf1169f..1f9b5866746 100644 --- a/sky/compositor/statistics_layer.cc +++ b/sky/compositor/statistics_layer.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 #include "sky/compositor/statistics_layer.h" namespace sky { diff --git a/sky/compositor/statistics_layer.h b/sky/compositor/statistics_layer.h index 9961f2bbb5f..52ce88bf196 100644 --- a/sky/compositor/statistics_layer.h +++ b/sky/compositor/statistics_layer.h @@ -14,7 +14,7 @@ namespace compositor { class StatisticsLayer : public Layer { public: - StatisticsLayer(uint64_t enabledOptions); + explicit StatisticsLayer(uint64_t enabledOptions); void Paint(PaintContext::ScopedFrame& frame) override;