Enable linting in several files (#20134)

zanderso · web-flow · commit d986b8d606bf · 2020-07-31T21:28:36.000-07:00
diff --git a/flow/instrumentation.cc b/flow/instrumentation.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/flow/instrumentation.h"
 
@@ -52,16 +51,18 @@ double Stopwatch::UnitFrameInterval(double raster_time_ms) const {
 double Stopwatch::UnitHeight(double raster_time_ms,
                              double max_unit_interval) const {
   double unitHeight = UnitFrameInterval(raster_time_ms) / max_unit_interval;
-  if (unitHeight > 1.0)
+  if (unitHeight > 1.0) {
     unitHeight = 1.0;
+  }
   return unitHeight;
 }
 
 fml::TimeDelta Stopwatch::MaxDelta() const {
   fml::TimeDelta max_delta;
   for (size_t i = 0; i < kMaxSamples; i++) {
-    if (laps_[i] > max_delta)
+    if (laps_[i] > max_delta) {
       max_delta = laps_[i];
+    }
   }
   return max_delta;
 }
@@ -135,7 +136,7 @@ void Stopwatch::InitVisualizeSurface(const SkRect& rect) const {
   cache_canvas->drawPath(path, paint);
 }
 
-void Stopwatch::Visualize(SkCanvas& canvas, const SkRect& rect) const {
+void Stopwatch::Visualize(SkCanvas* canvas, const SkRect& rect) const {
   // Initialize visualize cache if it has not yet been initialized.
   InitVisualizeSurface(rect);
 
@@ -191,8 +192,9 @@ void Stopwatch::Visualize(SkCanvas& canvas, const SkRect& rect) const {
 
     // Limit the number of markers displayed. After a certain point, the graph
     // becomes crowded
-    if (frame_marker_count > kMaxFrameMarkers)
+    if (frame_marker_count > kMaxFrameMarkers) {
       frame_marker_count = 1;
+    }
 
     for (size_t frame_index = 0; frame_index < frame_marker_count;
          frame_index++) {
@@ -224,7 +226,7 @@ void Stopwatch::Visualize(SkCanvas& canvas, const SkRect& rect) const {
 
   // Draw the cached surface onto the output canvas.
   paint.reset();
-  visualize_cache_surface_->draw(&canvas, rect.x(), rect.y(), &paint);
+  visualize_cache_surface_->draw(canvas, rect.x(), rect.y(), &paint);
 }
 
 CounterValues::CounterValues() : current_sample_(kMaxSamples - 1) {
@@ -238,7 +240,7 @@ void CounterValues::Add(int64_t value) {
   values_[current_sample_] = value;
 }
 
-void CounterValues::Visualize(SkCanvas& canvas, const SkRect& rect) const {
+void CounterValues::Visualize(SkCanvas* canvas, const SkRect& rect) const {
   size_t max_bytes = GetMaxValue();
 
   if (max_bytes == 0) {
@@ -252,7 +254,7 @@ void CounterValues::Visualize(SkCanvas& canvas, const SkRect& rect) const {
 
   // Paint the background.
   paint.setColor(0x99FFFFFF);
-  canvas.drawRect(rect, paint);
+  canvas->drawRect(rect, paint);
 
   // Establish the graph position.
   const SkScalar x = rect.x();
@@ -268,10 +270,12 @@ void CounterValues::Visualize(SkCanvas& canvas, const SkRect& rect) const {
 
   for (size_t i = 0; i < kMaxSamples; ++i) {
     int64_t current_bytes = values_[i];
-    double ratio =
-        (double)(current_bytes - min_bytes) / (max_bytes - min_bytes);
-    path.lineTo(x + (((double)(i) / (double)kMaxSamples) * width),
-                y + ((1.0 - ratio) * height));
+    double ratio = static_cast<double>(current_bytes - min_bytes) /
+                   static_cast<double>(max_bytes - min_bytes);
+    path.lineTo(
+        x + ((static_cast<double>(i) / static_cast<double>(kMaxSamples)) *
+             width),
+        y + ((1.0 - ratio) * height));
   }
 
   path.rLineTo(100, 0);
@@ -280,7 +284,7 @@ void CounterValues::Visualize(SkCanvas& canvas, const SkRect& rect) const {
 
   // Draw the graph.
   paint.setColor(0xAA0000FF);
-  canvas.drawPath(path, paint);
+  canvas->drawPath(path, paint);
 
   // Paint the vertical marker for the current frame.
   const double sample_unit_width = (1.0 / kMaxSamples);
@@ -294,7 +298,7 @@ void CounterValues::Visualize(SkCanvas& canvas, const SkRect& rect) const {
   const auto marker_rect = SkRect::MakeLTRB(
       sample_x, y,
       sample_x + width * sample_unit_width + sample_margin_width * 2, bottom);
-  canvas.drawRect(marker_rect, paint);
+  canvas->drawRect(marker_rect, paint);
 }
 
 int64_t CounterValues::GetCurrentValue() const {
diff --git a/flow/instrumentation.h b/flow/instrumentation.h
@@ -30,7 +30,7 @@ class Stopwatch {
 
   void InitVisualizeSurface(const SkRect& rect) const;
 
-  void Visualize(SkCanvas& canvas, const SkRect& rect) const;
+  void Visualize(SkCanvas* canvas, const SkRect& rect) const;
 
   void Start();
 
@@ -81,7 +81,7 @@ class CounterValues {
 
   void Add(int64_t value);
 
-  void Visualize(SkCanvas& canvas, const SkRect& rect) const;
+  void Visualize(SkCanvas* canvas, const SkRect& rect) const;
 
   int64_t GetCurrentValue() const;
 
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/flow/layers/layer_tree.h"
 
@@ -117,7 +116,7 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
   }
 
   Layer::PaintContext context = {
-      (SkCanvas*)&internal_nodes_canvas,
+      static_cast<SkCanvas*>(&internal_nodes_canvas),
       frame.canvas(),
       frame.gr_context(),
       frame.view_embedder(),
@@ -129,8 +128,9 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
       frame_physical_depth_,
       frame_device_pixel_ratio_};
 
-  if (root_layer_->needs_painting())
+  if (root_layer_->needs_painting()) {
     root_layer_->Paint(context);
+  }
 }
 
 sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
@@ -171,7 +171,7 @@ sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
   internal_nodes_canvas.addCanvas(canvas);
 
   Layer::PaintContext paint_context = {
-      (SkCanvas*)&internal_nodes_canvas,
+      static_cast<SkCanvas*>(&internal_nodes_canvas),
       canvas,  // canvas
       nullptr,
       nullptr,
diff --git a/flow/layers/performance_overlay_layer.cc b/flow/layers/performance_overlay_layer.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include <iomanip>
 #include <iostream>
@@ -14,7 +13,7 @@
 namespace flutter {
 namespace {
 
-void VisualizeStopWatch(SkCanvas& canvas,
+void VisualizeStopWatch(SkCanvas* canvas,
                         const Stopwatch& stopwatch,
                         SkScalar x,
                         SkScalar y,
@@ -37,7 +36,7 @@ void VisualizeStopWatch(SkCanvas& canvas,
         stopwatch, label_prefix, font_path);
     SkPaint paint;
     paint.setColor(SK_ColorGRAY);
-    canvas.drawTextBlob(text, x + label_x, y + height + label_y, paint);
+    canvas->drawTextBlob(text, x + label_x, y + height + label_y, paint);
   }
 }
 
@@ -77,8 +76,9 @@ PerformanceOverlayLayer::PerformanceOverlayLayer(uint64_t options,
 void PerformanceOverlayLayer::Paint(PaintContext& context) const {
   const int padding = 8;
 
-  if (!options_)
+  if (!options_) {
     return;
+  }
 
   TRACE_EVENT0("flutter", "PerformanceOverlayLayer::Paint");
   SkScalar x = paint_bounds().x() + padding;
@@ -88,11 +88,11 @@ void PerformanceOverlayLayer::Paint(PaintContext& context) const {
   SkAutoCanvasRestore save(context.leaf_nodes_canvas, true);
 
   VisualizeStopWatch(
-      *context.leaf_nodes_canvas, context.raster_time, x, y, width,
+      context.leaf_nodes_canvas, context.raster_time, x, y, width,
       height - padding, options_ & kVisualizeRasterizerStatistics,
       options_ & kDisplayRasterizerStatistics, "Raster", font_path_);
 
-  VisualizeStopWatch(*context.leaf_nodes_canvas, context.ui_time, x, y + height,
+  VisualizeStopWatch(context.leaf_nodes_canvas, context.ui_time, x, y + height,
                      width, height - padding,
                      options_ & kVisualizeEngineStatistics,
                      options_ & kDisplayEngineStatistics, "UI", font_path_);
diff --git a/flow/matrix_decomposition.cc b/flow/matrix_decomposition.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/flow/matrix_decomposition.h"
 
@@ -18,12 +17,12 @@ MatrixDecomposition::MatrixDecomposition(const SkMatrix& matrix)
     : MatrixDecomposition(SkM44{matrix}) {}
 
 // Use custom normalize to avoid skia precision loss/normalize() privatization.
-static inline void SkV3Normalize(SkV3& v) {
-  double mag = sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
+static inline void SkV3Normalize(SkV3* v) {
+  double mag = sqrt(v->x * v->x + v->y * v->y + v->z * v->z);
   double scale = 1.0 / mag;
-  v.x *= scale;
-  v.y *= scale;
-  v.z *= scale;
+  v->x *= scale;
+  v->y *= scale;
+  v->z *= scale;
 }
 
 MatrixDecomposition::MatrixDecomposition(SkM44 matrix) : valid_(false) {
@@ -71,14 +70,14 @@ MatrixDecomposition::MatrixDecomposition(SkM44 matrix) : valid_(false) {
 
   scale_.x = row[0].length();
 
-  SkV3Normalize(row[0]);
+  SkV3Normalize(&row[0]);
 
   shear_.x = row[0].dot(row[1]);
   row[1] = SkV3Combine(row[1], 1.0, row[0], -shear_.x);
 
   scale_.y = row[1].length();
 
-  SkV3Normalize(row[1]);
+  SkV3Normalize(&row[1]);
 
   shear_.x /= scale_.y;
 
@@ -89,7 +88,7 @@ MatrixDecomposition::MatrixDecomposition(SkM44 matrix) : valid_(false) {
 
   scale_.z = row[2].length();
 
-  SkV3Normalize(row[2]);
+  SkV3Normalize(&row[2]);
 
   shear_.y /= scale_.z;
   shear_.z /= scale_.z;
diff --git a/flow/matrix_decomposition_unittests.cc b/flow/matrix_decomposition_unittests.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/fml/build_config.h"
 
@@ -98,7 +97,8 @@ TEST(MatrixDecomposition, Combination) {
 
 TEST(MatrixDecomposition, ScaleFloatError) {
   constexpr float scale_increment = 0.00001f;
-  for (float scale = 0.0001f; scale < 2.0f; scale += scale_increment) {
+  float scale = 0.0001f;
+  while (scale < 2.0f) {
     SkM44 matrix;
     matrix.setScale(scale, scale, 1.0f);
 
@@ -111,11 +111,12 @@ TEST(MatrixDecomposition, ScaleFloatError) {
     ASSERT_FLOAT_EQ(0, decomposition3.rotation().x);
     ASSERT_FLOAT_EQ(0, decomposition3.rotation().y);
     ASSERT_FLOAT_EQ(0, decomposition3.rotation().z);
+    scale += scale_increment;
   }
 
   SkM44 matrix;
-  const auto scale = 1.7734375f;
-  matrix.setScale(scale, scale, 1.f);
+  const auto scale1 = 1.7734375f;
+  matrix.setScale(scale1, scale1, 1.f);
 
   // Bug upper bound (empirical)
   const auto scale2 = 1.773437559603f;
@@ -136,8 +137,8 @@ TEST(MatrixDecomposition, ScaleFloatError) {
   flutter::MatrixDecomposition decomposition3(matrix3);
   ASSERT_TRUE(decomposition3.IsValid());
 
-  ASSERT_FLOAT_EQ(scale, decomposition.scale().x);
-  ASSERT_FLOAT_EQ(scale, decomposition.scale().y);
+  ASSERT_FLOAT_EQ(scale1, decomposition.scale().x);
+  ASSERT_FLOAT_EQ(scale1, decomposition.scale().y);
   ASSERT_FLOAT_EQ(1.f, decomposition.scale().z);
   ASSERT_FLOAT_EQ(0, decomposition.rotation().x);
   ASSERT_FLOAT_EQ(0, decomposition.rotation().y);
diff --git a/flow/paint_utils.cc b/flow/paint_utils.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/flow/paint_utils.h"
 
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "flutter/flow/raster_cache.h"
 
@@ -160,10 +159,11 @@ std::unique_ptr<RasterCacheResult> RasterCache::RasterizeLayer(
                                            canvas_size.height());
         internal_nodes_canvas.addCanvas(canvas);
         Layer::PaintContext paintContext = {
-            (SkCanvas*)&internal_nodes_canvas,  // internal_nodes_canvas
-            canvas,                             // leaf_nodes_canvas
-            context->gr_context,                // gr_context
-            nullptr,                            // view_embedder
+            /* internal_nodes_canvas= */ static_cast<SkCanvas*>(
+                &internal_nodes_canvas),
+            /* leaf_nodes_canvas= */ canvas,
+            /* gr_context= */ context->gr_context,
+            /* view_embedder= */ nullptr,
             context->raster_time,
             context->ui_time,
             context->texture_registry,
@@ -233,7 +233,7 @@ bool RasterCache::Draw(const SkPicture& picture, SkCanvas& canvas) const {
   entry.used_this_frame = true;
 
   if (entry.image) {
-    entry.image->draw(canvas);
+    entry.image->draw(canvas, nullptr);
     return true;
   }
 
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
@@ -22,7 +22,7 @@ class RasterCacheResult {
 
   virtual ~RasterCacheResult() = default;
 
-  virtual void draw(SkCanvas& canvas, const SkPaint* paint = nullptr) const;
+  virtual void draw(SkCanvas& canvas, const SkPaint* paint) const;
 
   virtual SkISize image_dimensions() const {
     return image_ ? image_->dimensions() : SkISize::Make(0, 0);
diff --git a/flow/rtree_unittests.cc b/flow/rtree_unittests.cc
diff --git a/fml/logging.cc b/fml/logging.cc
diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc
diff --git a/fml/memory/weak_ptr_unittest.cc b/fml/memory/weak_ptr_unittest.cc
