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

Unified Diff: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/modules/canvas2d/BaseRenderingContext2D.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
index dd9b9ed7eb4b436a90918c8dcb51b305e9f143a9..65da6165c9fbc0cfea7bfcae19723c49796be94d 100644
--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
@@ -94,11 +94,11 @@ void BaseRenderingContext2D::restore()
static inline void convertCanvasStyleToUnionType(CanvasStyle* style, StringOrCanvasGradientOrCanvasPattern& returnValue)
{
- if (CanvasGradient* gradient = style->canvasGradient()) {
+ if (CanvasGradient* gradient = style->getCanvasGradient()) {
returnValue.setCanvasGradient(gradient);
return;
}
- if (CanvasPattern* pattern = style->canvasPattern()) {
+ if (CanvasPattern* pattern = style->getCanvasPattern()) {
returnValue.setCanvasPattern(pattern);
return;
}
@@ -176,7 +176,7 @@ void BaseRenderingContext2D::setFillStyle(const StringOrCanvasGradientOrCanvasPa
if (originClean() && !canvasPattern->originClean())
setOriginTainted();
- if (canvasPattern->pattern()->isTextureBacked())
+ if (canvasPattern->getPattern()->isTextureBacked())
disableDeferral(DisableDeferralReasonUsingTextureBackedPattern);
canvasStyle = CanvasStyle::createFromPattern(canvasPattern);
}

Powered by Google App Engine
This is Rietveld 408576698