Revert of Back PaintRecord with PaintOpBuffer instead of SkPicture

cc/paint/record_paint_canvas.h

Index: cc/paint/record_paint_canvas.h
diff --git a/cc/paint/record_paint_canvas.h b/cc/paint/record_paint_canvas.h
deleted file mode 100644
index 4677512a9b88ec26ac1ab713df85e9c075a4d37e..0000000000000000000000000000000000000000
--- a/cc/paint/record_paint_canvas.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2017 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 CC_PAINT_RECORD_PAINT_CANVAS_H_
-#define CC_PAINT_RECORD_PAINT_CANVAS_H_
-
-#include <memory>
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/optional.h"
-#include "build/build_config.h"
-#include "cc/paint/paint_canvas.h"
-#include "cc/paint/paint_flags.h"
-#include "cc/paint/paint_record.h"
-#include "third_party/skia/include/utils/SkNoDrawCanvas.h"
-
-namespace cc {
-
-class PaintOpBuffer;
-class PaintFlags;
-
-class CC_PAINT_EXPORT RecordPaintCanvas final : public PaintCanvas {
- public:
-  explicit RecordPaintCanvas(PaintOpBuffer* buffer);
-  ~RecordPaintCanvas() override;
-
-  SkMetaData& getMetaData() override;
-  SkImageInfo imageInfo() const override;
-
-  void flush() override;
-
-  int save() override;
-  int saveLayer(const SkRect* bounds, const PaintFlags* flags) override;
-  int saveLayerAlpha(const SkRect* bounds, uint8_t alpha) override;
-
-  void restore() override;
-  int getSaveCount() const override;
-  void restoreToCount(int save_count) override;
-  void translate(SkScalar dx, SkScalar dy) override;
-  void scale(SkScalar sx, SkScalar sy) override;
-  void rotate(SkScalar degrees) override;
-  void concat(const SkMatrix& matrix) override;
-  void setMatrix(const SkMatrix& matrix) override;
-
-  void clipRect(const SkRect& rect, SkClipOp op, bool antialias) override;
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool antialias) override;
-  void clipPath(const SkPath& path, SkClipOp op, bool antialias) override;
-  bool quickReject(const SkRect& rect) const override;
-  bool quickReject(const SkPath& path) const override;
-  SkRect getLocalClipBounds() const override;
-  bool getLocalClipBounds(SkRect* bounds) const override;
-  SkIRect getDeviceClipBounds() const override;
-  bool getDeviceClipBounds(SkIRect* bounds) const override;
-  void drawColor(SkColor color, SkBlendMode mode) override;
-  void clear(SkColor color) override;
-
-  void drawLine(SkScalar x0,
-                SkScalar y0,
-                SkScalar x1,
-                SkScalar y1,
-                const PaintFlags& flags) override;
-  void drawRect(const SkRect& rect, const PaintFlags& flags) override;
-  void drawIRect(const SkIRect& rect, const PaintFlags& flags) override;
-  void drawOval(const SkRect& oval, const PaintFlags& flags) override;
-  void drawRRect(const SkRRect& rrect, const PaintFlags& flags) override;
-  void drawDRRect(const SkRRect& outer,
-                  const SkRRect& inner,
-                  const PaintFlags& flags) override;
-  void drawCircle(SkScalar cx,
-                  SkScalar cy,
-                  SkScalar radius,
-                  const PaintFlags& flags) override;
-  void drawArc(const SkRect& oval,
-               SkScalar start_angle,
-               SkScalar sweep_angle,
-               bool use_center,
-               const PaintFlags& flags) override;
-  void drawRoundRect(const SkRect& rect,
-                     SkScalar rx,
-                     SkScalar ry,
-                     const PaintFlags& flags) override;
-  void drawPath(const SkPath& path, const PaintFlags& flags) override;
-  void drawImage(const PaintImage& image,
-                 SkScalar left,
-                 SkScalar top,
-                 const PaintFlags* flags) override;
-  void drawImageRect(const PaintImage& image,
-                     const SkRect& src,
-                     const SkRect& dst,
-                     const PaintFlags* flags,
-                     SrcRectConstraint constraint) override;
-  void drawBitmap(const SkBitmap& bitmap,
-                  SkScalar left,
-                  SkScalar top,
-                  const PaintFlags* flags) override;
-
-  void drawText(const void* text,
-                size_t byte_length,
-                SkScalar x,
-                SkScalar y,
-                const PaintFlags& flags) override;
-  void drawPosText(const void* text,
-                   size_t byte_length,
-                   const SkPoint pos[],
-                   const PaintFlags& flags) override;
-  void drawTextBlob(sk_sp<SkTextBlob> blob,
-                    SkScalar x,
-                    SkScalar y,
-                    const PaintFlags& flags) override;
-
-  void drawDisplayItemList(
-      scoped_refptr<DisplayItemList> display_item_list) override;
-
-  void drawPicture(sk_sp<const PaintRecord> record) override;
-
-  bool isClipEmpty() const override;
-  bool isClipRect() const override;
-  const SkMatrix& getTotalMatrix() const override;
-
-  void Annotate(AnnotationType type,
-                const SkRect& rect,
-                sk_sp<SkData> data) override;
-
-  void PlaybackPaintRecord(sk_sp<const PaintRecord> record) override;
-
-  // Don't shadow non-virtual helper functions.
-  using PaintCanvas::clipRect;
-  using PaintCanvas::clipRRect;
-  using PaintCanvas::clipPath;
-  using PaintCanvas::drawBitmap;
-  using PaintCanvas::drawColor;
-  using PaintCanvas::drawImage;
-  using PaintCanvas::drawPicture;
-
- private:
-  const SkNoDrawCanvas* GetCanvas() const;
-  SkNoDrawCanvas* GetCanvas();
-
-  PaintOpBuffer* buffer_;
-
-  // TODO(enne): Although RecordPaintCanvas is mostly a write-only interface
-  // where paint commands are stored, occasionally users of PaintCanvas want
-  // to ask stateful questions mid-stream of clip and transform state.
-  // To avoid duplicating all this code (for now?), just forward to an SkCanvas
-  // that's not backed by anything but can answer these questions.
-  //
-  // This is mutable so that const functions (e.g. quickReject) that may
-  // lazy initialize the canvas can still be const.
-  mutable base::Optional<SkNoDrawCanvas> canvas_;
-
-  DISALLOW_COPY_AND_ASSIGN(RecordPaintCanvas);
-};
-
-}  // namespace cc
-
-#endif  // CC_PAINT_RECORD_PAINT_CANVAS_H_