Clean up cc/paint interfaces

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 416 matching lines @@
 
 template <typename DrawFunc>
 void BaseRenderingContext2D::compositedDraw(
     const DrawFunc& drawFunc,
     PaintCanvas* c,
     CanvasRenderingContext2DState::PaintType paintType,
     CanvasRenderingContext2DState::ImageType imageType) {
   sk_sp<SkImageFilter> filter = stateGetFilter();
   ASSERT(isFullCanvasCompositeMode(state().globalComposite()) || filter);
   SkMatrix ctm = c->getTotalMatrix();
-  c->resetMatrix();
+  c->setMatrix(SkMatrix::I());
   PaintFlags compositeFlags;
   compositeFlags.setBlendMode((SkBlendMode)state().globalComposite());
   if (state().shouldDrawShadows()) {
     // unroll into two independently composited passes if drawing shadows
     PaintFlags shadowFlags =
         *state().getFlags(paintType, DrawShadowOnly, imageType);
     int saveCount = c->getSaveCount();
     if (filter) {
       PaintFlags foregroundFlags =
           *state().getFlags(paintType, DrawForegroundOnly, imageType);
@@ skipping 20 matching lines @@
   foregroundFlags.setBlendMode(SkBlendMode::kSrcOver);
   c->setMatrix(ctm);
   drawFunc(c, &foregroundFlags);
   c->restore();
   c->setMatrix(ctm);
 }
 
 }  // namespace blink
 
 #endif  // BaseRenderingContext2D_h