Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
index abc55453f929efc0ebf11fcb873038baeab7120b..bedf533bad71d44394059d22f98e2f44c7ad62b9 100644
--- a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
@@ -33,8 +33,8 @@
#include "platform/geometry/FloatRect.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/paint/PaintController.h"
+#include "platform/graphics/paint/PaintRecord.h"
#include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPicture.h"
namespace blink {
@@ -52,7 +52,7 @@ void GeneratedImage::drawPattern(GraphicsContext& destContext,
GraphicsContext context(*paintController);
context.beginRecording(tileRect);
drawTile(context, srcRect);
- sk_sp<SkPicture> tilePicture = context.endRecording();
+ sk_sp<PaintRecord> tilePicture = context.endRecording();
SkMatrix patternMatrix = SkMatrix::MakeTrans(phase.x(), phase.y());
patternMatrix.preScale(scale.width(), scale.height());
@@ -61,7 +61,7 @@ void GeneratedImage::drawPattern(GraphicsContext& destContext,
RefPtr<Pattern> picturePattern =
Pattern::createPicturePattern(std::move(tilePicture));
- SkPaint fillPaint = destContext.fillPaint();
+ PaintFlags fillPaint = destContext.fillPaint();
picturePattern->applyToPaint(fillPaint, patternMatrix);
fillPaint.setColor(SK_ColorBLACK);
fillPaint.setBlendMode(compositeOp);

Powered by Google App Engine
This is Rietveld 408576698