Fix GeneratedImage::drawPattern() use of SkPictureBuilder.

third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/GeneratedImage.h"
 
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/GraphicsContext.h"
+#include "platform/graphics/paint/PaintController.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"

[chrishtr, 2016/12/09 02:02:31]

You can remove this include.

[vmiura, 2016/12/09 03:48:57]

Done.

 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace blink {
 
 void GeneratedImage::drawPattern(GraphicsContext& destContext,
                                  const FloatRect& srcRect,
                                  const FloatSize& scale,
                                  const FloatPoint& phase,
                                  SkBlendMode compositeOp,
                                  const FloatRect& destRect,
                                  const FloatSize& repeatSpacing) {
   FloatRect tileRect = srcRect;
   tileRect.expand(FloatSize(repeatSpacing));
 
-  SkPictureBuilder builder(tileRect, nullptr, &destContext);
-  builder.context().beginRecording(tileRect);
-  drawTile(builder.context(), srcRect);
-  sk_sp<SkPicture> tilePicture = builder.endRecording();
+  std::unique_ptr<PaintController> paintController = PaintController::create();
+  GraphicsContext context(*paintController);
+  context.beginRecording(tileRect);
+  drawTile(context, srcRect);
+  sk_sp<SkPicture> tilePicture = context.endRecording();
 
   SkMatrix patternMatrix = SkMatrix::MakeTrans(phase.x(), phase.y());
   patternMatrix.preScale(scale.width(), scale.height());
   patternMatrix.preTranslate(tileRect.x(), tileRect.y());
 
   RefPtr<Pattern> picturePattern =
       Pattern::createPicturePattern(std::move(tilePicture));
 
   SkPaint fillPaint = destContext.fillPaint();
   picturePattern->applyToPaint(fillPaint, patternMatrix);
   fillPaint.setColor(SK_ColorBLACK);
   fillPaint.setBlendMode(compositeOp);
 
   destContext.drawRect(destRect, fillPaint);
 }
 
 sk_sp<SkImage> GeneratedImage::imageForCurrentFrame() {
   return nullptr;
 }
 
 }  // namespace blink