From 1be74c66980c823a4f499cfec0b7b7dee7bfdfc5 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Fri, 5 Aug 2016 16:23:12 -0700 Subject: [PATCH] Remove unused checkerboard.cc (flutter/engine#2865) --- engine/src/flutter/flow/BUILD.gn | 2 - engine/src/flutter/flow/checkerboard.cc | 47 ------------------- engine/src/flutter/flow/checkerboard.h | 16 ------- .../src/flutter/flow/layers/picture_layer.cc | 6 --- 4 files changed, 71 deletions(-) delete mode 100644 engine/src/flutter/flow/checkerboard.cc delete mode 100644 engine/src/flutter/flow/checkerboard.h diff --git a/engine/src/flutter/flow/BUILD.gn b/engine/src/flutter/flow/BUILD.gn index ed6064ab2c..a5ef7f5c7b 100644 --- a/engine/src/flutter/flow/BUILD.gn +++ b/engine/src/flutter/flow/BUILD.gn @@ -4,8 +4,6 @@ source_set("flow") { sources = [ - "checkerboard.cc", - "checkerboard.h", "compositor_context.cc", "compositor_context.h", "instrumentation.cc", diff --git a/engine/src/flutter/flow/checkerboard.cc b/engine/src/flutter/flow/checkerboard.cc deleted file mode 100644 index b88c0d1b14..0000000000 --- a/engine/src/flutter/flow/checkerboard.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "flow/checkerboard.h" - -#include "third_party/skia/include/core/SkShader.h" - -namespace flow { - -static sk_sp CreateCheckerboardShader(SkColor c1, - SkColor c2, - int size) { - SkBitmap bm; - bm.allocN32Pixels(2 * size, 2 * size); - bm.eraseColor(c1); - bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2); - bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2); - return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); -} - -static void DrawCheckerboard(SkCanvas* canvas, - SkColor c1, - SkColor c2, - int size) { - SkPaint paint; - paint.setShader(CreateCheckerboardShader(c1, c2, size)); - canvas->drawPaint(paint); -} - -void DrawCheckerboard(SkCanvas* canvas, const SkRect& rect) { - // Draw a checkerboard - canvas->save(); - canvas->clipRect(rect); - DrawCheckerboard(canvas, 0x4400FF00, 0x00000000, 12); - canvas->restore(); - - // Stroke the drawn area - SkPaint debugPaint; - debugPaint.setStrokeWidth(3); - debugPaint.setColor(SK_ColorRED); - debugPaint.setStyle(SkPaint::kStroke_Style); - canvas->drawRect(rect, debugPaint); -} - -} // namespace flow diff --git a/engine/src/flutter/flow/checkerboard.h b/engine/src/flutter/flow/checkerboard.h deleted file mode 100644 index 1107171a77..0000000000 --- a/engine/src/flutter/flow/checkerboard.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef FLOW_CHECKERBOARD_H_ -#define FLOW_CHECKERBOARD_H_ - -#include "third_party/skia/include/core/SkCanvas.h" - -namespace flow { - -void DrawCheckerboard(SkCanvas* canvas, const SkRect& rect); - -} // namespace flow - -#endif // FLOW_CHECKERBOARD_H_ diff --git a/engine/src/flutter/flow/layers/picture_layer.cc b/engine/src/flutter/flow/layers/picture_layer.cc index 11b2f3eb56..cb36901b6a 100644 --- a/engine/src/flutter/flow/layers/picture_layer.cc +++ b/engine/src/flutter/flow/layers/picture_layer.cc @@ -4,15 +4,11 @@ #include "flow/layers/picture_layer.h" -#include "flow/checkerboard.h" #include "flow/raster_cache.h" #include "lib/ftl/logging.h" namespace flow { -// TODO(abarth): Make this configurable by developers. -const bool kDebugCheckerboardRasterizedLayers = false; - PictureLayer::PictureLayer() {} PictureLayer::~PictureLayer() {} @@ -32,8 +28,6 @@ void PictureLayer::Paint(PaintContext& context) { SkRect rect = picture_->cullRect().makeOffset(offset_.x(), offset_.y()); context.canvas.drawImageRect(image_.get(), rect, nullptr, SkCanvas::kFast_SrcRectConstraint); - if (kDebugCheckerboardRasterizedLayers) - DrawCheckerboard(&context.canvas, rect); } else { TRACE_EVENT1("flutter", "PictureLayer::Paint", "image", "normal"); SkAutoCanvasRestore save(&context.canvas, true);