Revert of Back PaintRecord with PaintOpBuffer instead of SkPicture

cc/paint/paint_flags.h

 // 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_PAINT_FLAGS_H_
 #define CC_PAINT_PAINT_FLAGS_H_
 
 #include "base/compiler_specific.h"
 #include "cc/paint/paint_export.h"
+#include "cc/paint/paint_shader.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMaskFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPathEffect.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
 namespace cc {
 
-using PaintShader = SkShader;
-
 class CC_PAINT_EXPORT PaintFlags {
  public:
   enum Style {
     kFill_Style = SkPaint::kFill_Style,
     kStroke_Style = SkPaint::kStroke_Style,
     kStrokeAndFill_Style = SkPaint::kStrokeAndFill_Style,
   };
   ALWAYS_INLINE Style getStyle() const {
     return static_cast<Style>(paint_.getStyle());
   }
@@ skipping 159 matching lines @@
     paint_.setLooper(std::move(looper));
   }
   ALWAYS_INLINE bool canComputeFastBounds() const {
     return paint_.canComputeFastBounds();
   }
   ALWAYS_INLINE const SkRect& computeFastBounds(const SkRect& orig,
                                                 SkRect* storage) const {
     return paint_.computeFastBounds(orig, storage);
   }
 
-  bool operator==(const PaintFlags& flags) { return flags.paint_ == paint_; }
-  bool operator!=(const PaintFlags& flags) { return flags.paint_ != paint_; }
-
-  // Returns true if this just represents an opacity blend when
-  // used as saveLayer flags.
-  bool IsSimpleOpacity() const;
-  bool SupportsFoldingAlpha() const;
-
  private:
   friend const SkPaint& ToSkPaint(const PaintFlags& flags);
   friend const SkPaint* ToSkPaint(const PaintFlags* flags);
 
   SkPaint paint_;
 };
 
 ALWAYS_INLINE const SkPaint& ToSkPaint(const PaintFlags& flags) {
   return flags.paint_;
 }
 
 ALWAYS_INLINE const SkPaint* ToSkPaint(const PaintFlags* flags) {
   return &flags->paint_;
 }
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_FLAGS_H_