remove legacy Skia flags

third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h

 // Copyright 2016 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 BaseRenderingContext2D_h
 #define BaseRenderingContext2D_h
 
 #include "bindings/modules/v8/CSSImageValueOrHTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmapOrOffscreenCanvas.h"
 #include "bindings/modules/v8/StringOrCanvasGradientOrCanvasPattern.h"
 #include "core/html/ImageData.h"
@@ skipping 210 matching lines @@
 
   virtual SkCanvas* drawingCanvas() const = 0;
   virtual SkCanvas* existingDrawingCanvas() const = 0;
   virtual void disableDeferral(DisableDeferralReason) = 0;
 
   virtual AffineTransform baseTransform() const = 0;
 
   virtual void didDraw(const SkIRect& dirtyRect) = 0;
 
   virtual bool stateHasFilter() = 0;
-  virtual SkImageFilter* stateGetFilter() = 0;
+  virtual sk_sp<SkImageFilter> stateGetFilter() = 0;
   virtual void snapshotStateForFilter() = 0;
 
   virtual void validateStateStack() const = 0;
 
   virtual bool hasAlpha() const = 0;
 
   virtual bool isContextLost() const = 0;
 
   void restoreMatrixClipStack(SkCanvas*) const;
 
@@ skipping 173 matching lines @@
   }
   return true;
 }
 
 template <typename DrawFunc>
 void BaseRenderingContext2D::compositedDraw(
     const DrawFunc& drawFunc,
     SkCanvas* c,
     CanvasRenderingContext2DState::PaintType paintType,
     CanvasRenderingContext2DState::ImageType imageType) {
-  SkImageFilter* filter = stateGetFilter();
+  sk_sp<SkImageFilter> filter = stateGetFilter();
   ASSERT(isFullCanvasCompositeMode(state().globalComposite()) || filter);
   SkMatrix ctm = c->getTotalMatrix();
   c->resetMatrix();
   SkPaint compositePaint;
   compositePaint.setBlendMode((SkBlendMode)state().globalComposite());
   if (state().shouldDrawShadows()) {
     // unroll into two independently composited passes if drawing shadows
     SkPaint shadowPaint =
         *state().getPaint(paintType, DrawShadowOnly, imageType);
     int saveCount = c->getSaveCount();
     if (filter) {
       SkPaint foregroundPaint =
           *state().getPaint(paintType, DrawForegroundOnly, imageType);
       sk_sp<SkImageFilter> composedFilter =
           sk_ref_sp(foregroundPaint.getImageFilter());
       composedFilter = SkComposeImageFilter::Make(
           std::move(composedFilter), sk_ref_sp(shadowPaint.getImageFilter()));
-      composedFilter = SkComposeImageFilter::Make(std::move(composedFilter),
-                                                  sk_ref_sp(filter));
+      composedFilter =
+          SkComposeImageFilter::Make(std::move(composedFilter), filter);
       foregroundPaint.setImageFilter(std::move(composedFilter));
       c->setMatrix(ctm);
       drawFunc(c, &foregroundPaint);
     } else {
       ASSERT(isFullCanvasCompositeMode(state().globalComposite()));
       c->saveLayer(nullptr, &compositePaint);
       shadowPaint.setBlendMode(SkBlendMode::kSrcOver);
       c->setMatrix(ctm);
       drawFunc(c, &shadowPaint);
     }
     c->restoreToCount(saveCount);
   }
 
   compositePaint.setImageFilter(filter);

[f(malita), 2016/11/02 14:24:50]

nit: should be safe to std::move(filter) here.

[reed1, 2016/11/02 15:30:37]

Done.

   c->saveLayer(nullptr, &compositePaint);
   SkPaint foregroundPaint =
       *state().getPaint(paintType, DrawForegroundOnly, imageType);
   foregroundPaint.setBlendMode(SkBlendMode::kSrcOver);
   c->setMatrix(ctm);
   drawFunc(c, &foregroundPaint);
   c->restore();
   c->setMatrix(ctm);
 }
 
 }  // namespace blink
 
 #endif  // BaseRenderingContext2D_h