Use refs for GraphicsContext

Review URL: https://codereview.chromium.org/1512803004 Cr-Commit-Position: refs/heads/master@{#364486}
author: wangxianzhu <wangxianzhu@chromium.org> 2015-12-10 13:45:14 -0800
committer: Commit bot <commit-bot@chromium.org> 2015-12-10 21:46:06 +0000
commit: a734170517b9576bedce9feeddfe53473510c4e9 (patch)
tree: 0563eb9611710c1e8886e2cca4989671449e9852 /third_party/WebKit/Source/platform/graphics
parent: dd79f4d8688ee24ff8ac0e0d7d011d21ddd2dd2b (diff)
download: chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.zip
chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.tar.gz
chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.tar.bz2
19 files changed, 48 insertions, 48 deletions
diff --git a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
index 9d19b6c..19a095c 100644
--- a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
@@ -87,18 +87,18 @@ void CrossfadeGeneratedImage::draw(SkCanvas* canvas, const SkPaint& paint, const
     canvas->restore();
 }
 
-void CrossfadeGeneratedImage::drawTile(GraphicsContext* context, const FloatRect& srcRect)
+void CrossfadeGeneratedImage::drawTile(GraphicsContext& context, const FloatRect& srcRect)
 {
     // Draw nothing if either of the images hasn't loaded yet.
     if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
         return;
 
-    SkPaint paint = context->fillPaint();
+    SkPaint paint = context.fillPaint();
     paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
-    paint.setAntiAlias(context->shouldAntialias());
+    paint.setAntiAlias(context.shouldAntialias());
     FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize));
-    paint.setFilterQuality(context->computeFilterQuality(this, destRect, srcRect));
-    drawCrossfade(context->canvas(), paint, ClampImageToSourceRect);
+    paint.setFilterQuality(context.computeFilterQuality(this, destRect, srcRect));
+    drawCrossfade(context.canvas(), paint, ClampImageToSourceRect);
 }
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h
index a13f640..5ce4dd4 100644
--- a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h
+++ b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h
@@ -49,7 +49,7 @@ public:
 
 protected:
     void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, RespectImageOrientationEnum, ImageClampingMode) override;
-    void drawTile(GraphicsContext*, const FloatRect&) final;
+    void drawTile(GraphicsContext&, const FloatRect&) final;
 
     CrossfadeGeneratedImage(Image* fromImage, Image* toImage, float percentage, IntSize crossfadeSize, const IntSize&);
 
diff --git a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
index aec9957..66dc392 100644
--- a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp
@@ -44,16 +44,16 @@ void GeneratedImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length&
     intrinsicRatio = FloatSize();
 }
 
-void GeneratedImage::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const FloatSize& scale,
+void GeneratedImage::drawPattern(GraphicsContext& destContext, const FloatRect& srcRect, const FloatSize& scale,
     const FloatPoint& phase, SkXfermode::Mode compositeOp, const FloatRect& destRect,
     const FloatSize& repeatSpacing)
 {
     FloatRect tileRect = srcRect;
     tileRect.expand(FloatSize(repeatSpacing));
 
-    SkPictureBuilder builder(tileRect, nullptr, destContext);
+    SkPictureBuilder builder(tileRect, nullptr, &destContext);
     builder.context().beginRecording(tileRect);
-    drawTile(&builder.context(), srcRect);
+    drawTile(builder.context(), srcRect);
     RefPtr<const SkPicture> tilePicture = builder.endRecording();
 
     AffineTransform patternTransform;
@@ -64,12 +64,12 @@ void GeneratedImage::drawPattern(GraphicsContext* destContext, const FloatRect&
     RefPtr<Pattern> picturePattern = Pattern::createPicturePattern(tilePicture);
     picturePattern->setPatternSpaceTransform(patternTransform);
 
-    SkPaint fillPaint = destContext->fillPaint();
+    SkPaint fillPaint = destContext.fillPaint();
     picturePattern->applyToPaint(fillPaint);
     fillPaint.setColor(SK_ColorBLACK);
     fillPaint.setXfermodeMode(compositeOp);
 
-    destContext->drawRect(destRect, fillPaint);
+    destContext.drawRect(destRect, fillPaint);
 }
 
 PassRefPtr<SkImage> GeneratedImage::imageForCurrentFrame()
diff --git a/third_party/WebKit/Source/platform/graphics/GeneratedImage.h b/third_party/WebKit/Source/platform/graphics/GeneratedImage.h
index 643312c..a02ff7d 100644
--- a/third_party/WebKit/Source/platform/graphics/GeneratedImage.h
+++ b/third_party/WebKit/Source/platform/graphics/GeneratedImage.h
@@ -49,7 +49,7 @@ public:
     PassRefPtr<SkImage> imageForCurrentFrame() override;
 
 protected:
-    void drawPattern(GraphicsContext*, const FloatRect&,
+    void drawPattern(GraphicsContext&, const FloatRect&,
         const FloatSize&, const FloatPoint&, SkXfermode::Mode,
         const FloatRect&, const FloatSize& repeatSpacing) final;
 
@@ -58,7 +58,7 @@ protected:
 
     GeneratedImage(const IntSize& size) : m_size(size) { }
 
-    virtual void drawTile(GraphicsContext*, const FloatRect&) = 0;
+    virtual void drawTile(GraphicsContext&, const FloatRect&) = 0;
 
     IntSize m_size;
 };
diff --git a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp
index eace3cd..724405a 100644
--- a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp
@@ -44,10 +44,10 @@ void GradientGeneratedImage::draw(SkCanvas* canvas, const SkPaint& paint, const
     canvas->drawRect(SkRect::MakeWH(m_size.width(), m_size.height()), gradientPaint);
 }
 
-void GradientGeneratedImage::drawTile(GraphicsContext* context, const FloatRect& srcRect)
+void GradientGeneratedImage::drawTile(GraphicsContext& context, const FloatRect& srcRect)
 {
-    context->setFillGradient(m_gradient);
-    context->fillRect(srcRect);
+    context.setFillGradient(m_gradient);
+    context.fillRect(srcRect);
 }
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.h b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.h
index e2e493a..4a4f219 100644
--- a/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.h
+++ b/third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.h
@@ -46,7 +46,7 @@ public:
 
 protected:
     void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, RespectImageOrientationEnum, ImageClampingMode) override;
-    void drawTile(GraphicsContext*, const FloatRect&) final;
+    void drawTile(GraphicsContext&, const FloatRect&) final;
 
     GradientGeneratedImage(PassRefPtr<Gradient> generator, const IntSize& size)
         : GeneratedImage(size)
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
index 2cd05cf..4b768c8 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
@@ -829,21 +829,21 @@ SkFilterQuality GraphicsContext::computeFilterQuality(Image* image, const FloatR
             resampling = InterpolationLow;
         }
     }
-    return static_cast<SkFilterQuality>(limitInterpolationQuality(this, resampling));
+    return static_cast<SkFilterQuality>(limitInterpolationQuality(*this, resampling));
 }
 
 void GraphicsContext::drawTiledImage(Image* image, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& tileSize, SkXfermode::Mode op, const FloatSize& repeatSpacing)
 {
     if (contextDisabled() || !image)
         return;
-    image->drawTiled(this, destRect, srcPoint, tileSize, op, repeatSpacing);
+    image->drawTiled(*this, destRect, srcPoint, tileSize, op, repeatSpacing);
 }
 
 void GraphicsContext::drawTiledImage(Image* image, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize, SkXfermode::Mode op, const IntSize& repeatSpacing)
 {
     if (contextDisabled() || !image)
         return;
-    image->drawTiled(this, destRect, srcPoint, FloatSize(tileSize), op, FloatSize(repeatSpacing));
+    image->drawTiled(*this, destRect, srcPoint, FloatSize(tileSize), op, FloatSize(repeatSpacing));
 }
 
 void GraphicsContext::drawTiledImage(Image* image, const FloatRect& dest, const FloatRect& srcRect,
@@ -858,7 +858,7 @@ void GraphicsContext::drawTiledImage(Image* image, const FloatRect& dest, const
         return;
     }
 
-    image->drawTiled(this, dest, srcRect, tileScaleFactor, hRule, vRule, op);
+    image->drawTiled(*this, dest, srcRect, tileScaleFactor, hRule, vRule, op);
 }
 
 void GraphicsContext::drawOval(const SkRect& oval, const SkPaint& paint)
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContextStateSaver.h b/third_party/WebKit/Source/platform/graphics/GraphicsContextStateSaver.h
index d227763..687364e 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsContextStateSaver.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsContextStateSaver.h
@@ -75,7 +75,7 @@ public:
         m_saveAndRestore = false;
     }
 
-    GraphicsContext* context() const { return &m_context; }
+    GraphicsContext& context() const { return m_context; }
     bool saved() const { return m_saveAndRestore; }
 
 private:
diff --git a/third_party/WebKit/Source/platform/graphics/Image.cpp b/third_party/WebKit/Source/platform/graphics/Image.cpp
index 265cbfc..413d1a4 100644
--- a/third_party/WebKit/Source/platform/graphics/Image.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Image.cpp
@@ -96,7 +96,7 @@ bool Image::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
     return dataChanged(allDataReceived);
 }
 
-void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const FloatSize& repeatSpacing)
+void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const FloatSize& repeatSpacing)
 {
     FloatSize intrinsicTileSize = FloatSize(size());
     if (hasRelativeWidth())
@@ -120,7 +120,7 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl
         visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
         visibleSrcRect.setWidth(destRect.width() / scale.width());
         visibleSrcRect.setHeight(destRect.height() / scale.height());
-        ctxt->drawImage(this, destRect, visibleSrcRect, op, DoNotRespectImageOrientation);
+        ctxt.drawImage(this, destRect, visibleSrcRect, op, DoNotRespectImageOrientation);
         return;
     }
 
@@ -131,7 +131,7 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl
 }
 
 // FIXME: Merge with the other drawTiled eventually, since we need a combination of both for some things.
-void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect,
+void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& dstRect, const FloatRect& srcRect,
     const FloatSize& providedTileScaleFactor, TileRule hRule, TileRule vRule, SkXfermode::Mode op)
 {
     // FIXME: We do not support 'space' yet. For now just map it to 'repeat'.
@@ -173,10 +173,10 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& dstRect, const Flo
     FloatPoint patternPhase(dstRect.x() - hPhase, dstRect.y() - vPhase);
 
     if (useLowInterpolationQuality) {
-        InterpolationQuality previousInterpolationQuality = ctxt->imageInterpolationQuality();
-        ctxt->setImageInterpolationQuality(InterpolationLow);
+        InterpolationQuality previousInterpolationQuality = ctxt.imageInterpolationQuality();
+        ctxt.setImageInterpolationQuality(InterpolationLow);
         drawPattern(ctxt, srcRect, tileScaleFactor, patternPhase, op, dstRect);
-        ctxt->setImageInterpolationQuality(previousInterpolationQuality);
+        ctxt.setImageInterpolationQuality(previousInterpolationQuality);
     } else {
         drawPattern(ctxt, srcRect, tileScaleFactor, patternPhase, op, dstRect);
     }
@@ -209,7 +209,7 @@ PassRefPtr<SkShader> createPatternShader(const SkImage* image, const SkMatrix& s
 
 } // anonymous namespace
 
-void Image::drawPattern(GraphicsContext* context, const FloatRect& floatSrcRect, const FloatSize& scale,
+void Image::drawPattern(GraphicsContext& context, const FloatRect& floatSrcRect, const FloatSize& scale,
     const FloatPoint& phase, SkXfermode::Mode compositeOp, const FloatRect& destRect, const FloatSize& repeatSpacing)
 {
     TRACE_EVENT0("skia", "Image::drawPattern");
@@ -245,15 +245,15 @@ void Image::drawPattern(GraphicsContext* context, const FloatRect& floatSrcRect,
         return;
 
     {
-        SkPaint paint = context->fillPaint();
+        SkPaint paint = context.fillPaint();
         paint.setColor(SK_ColorBLACK);
         paint.setXfermodeMode(compositeOp);
-        paint.setFilterQuality(context->computeFilterQuality(this, destRect, normSrcRect));
-        paint.setAntiAlias(context->shouldAntialias());
+        paint.setFilterQuality(context.computeFilterQuality(this, destRect, normSrcRect));
+        paint.setAntiAlias(context.shouldAntialias());
         RefPtr<SkShader> shader = createPatternShader(image.get(), localMatrix, paint,
             FloatSize(repeatSpacing.width() / scale.width(), repeatSpacing.height() / scale.height()));
         paint.setShader(shader.get());
-        context->drawRect(destRect, paint);
+        context.drawRect(destRect, paint);
     }
 
     if (currentFrameIsLazyDecoded())
diff --git a/third_party/WebKit/Source/platform/graphics/Image.h b/third_party/WebKit/Source/platform/graphics/Image.h
index bcf6000..b8f33f3 100644
--- a/third_party/WebKit/Source/platform/graphics/Image.h
+++ b/third_party/WebKit/Source/platform/graphics/Image.h
@@ -145,7 +145,7 @@ public:
     virtual PassRefPtr<SkImage> imageForCurrentFrame() = 0;
     virtual PassRefPtr<Image> imageForDefaultFrame();
 
-    virtual void drawPattern(GraphicsContext*, const FloatRect&,
+    virtual void drawPattern(GraphicsContext&, const FloatRect&,
         const FloatSize&, const FloatPoint& phase, SkXfermode::Mode,
         const FloatRect&, const FloatSize& repeatSpacing = FloatSize());
 
@@ -159,9 +159,9 @@ public:
 protected:
     Image(ImageObserver* = 0);
 
-    void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
+    void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
         SkXfermode::Mode, const FloatSize& repeatSpacing);
-    void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, SkXfermode::Mode);
+    void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, SkXfermode::Mode);
 
 private:
     RefPtr<SharedBuffer> m_encodedImageData;
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
index c27bd0b..bcbe300 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
@@ -251,7 +251,7 @@ bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu
         GL_UNSIGNED_BYTE, 0, true, false, sourceBuffer);
 }
 
-void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect* srcPtr, SkXfermode::Mode op)
+void ImageBuffer::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect* srcPtr, SkXfermode::Mode op)
 {
     if (!isSurfaceValid())
         return;
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
index 41a0a95..2dcad6e 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
@@ -129,7 +129,7 @@ public:
     PassRefPtr<SkImage> newSkImageSnapshot(AccelerationHint) const;
     PassRefPtr<Image> newImageSnapshot(AccelerationHint = PreferNoAcceleration) const;
 
-    void draw(GraphicsContext*, const FloatRect&, const FloatRect*, SkXfermode::Mode);
+    void draw(GraphicsContext&, const FloatRect&, const FloatRect*, SkXfermode::Mode);
 
 private:
     ImageBuffer(PassOwnPtr<ImageBufferSurface>);
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
index 6ae446f..de6f39f 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
@@ -70,14 +70,14 @@ void ImageBufferSurface::clear()
     }
 }
 
-void ImageBufferSurface::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
+void ImageBufferSurface::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
 {
     RefPtr<SkImage> snapshot = newImageSnapshot(PreferNoAcceleration);
     if (!snapshot)
         return;
 
     RefPtr<Image> image = StaticBitmapImage::create(snapshot.release());
-    context->drawImage(image.get(), destRect, srcRect, op);
+    context.drawImage(image.get(), destRect, srcRect, op);
 }
 
 void ImageBufferSurface::flush()
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
index 353d623..aa51c7a 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
@@ -73,7 +73,7 @@ public:
     virtual void setImageBuffer(ImageBuffer*) { }
     virtual PassRefPtr<SkPicture> getPicture();
     virtual void finalizeFrame(const FloatRect &dirtyRect) { }
-    virtual void draw(GraphicsContext*, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode);
+    virtual void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode);
     virtual void setHasExpensiveOp() { }
     virtual Platform3DObject getBackingTextureHandleForOverwrite() { return 0; }
     virtual void flush(); // Execute all deferred rendering immediately
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
index 5c51f5b..0c187dd 100644
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
@@ -205,7 +205,7 @@ bool RecordingImageBufferSurface::finalizeFrameInternal()
     return true;
 }
 
-void RecordingImageBufferSurface::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
+void RecordingImageBufferSurface::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
 {
     if (m_fallbackSurface) {
         m_fallbackSurface->draw(context, destRect, srcRect, op);
@@ -214,7 +214,7 @@ void RecordingImageBufferSurface::draw(GraphicsContext* context, const FloatRect
 
     RefPtr<SkPicture> picture = getPicture();
     if (picture) {
-        context->compositePicture(picture.get(), destRect, srcRect, op);
+        context.compositePicture(picture.get(), destRect, srcRect, op);
     } else {
         ImageBufferSurface::draw(context, destRect, srcRect, op);
     }
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
index c104465..0c3a2ef 100644
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
@@ -51,7 +51,7 @@ public:
     virtual void finalizeFrame(const FloatRect&);
     void setImageBuffer(ImageBuffer*) override;
     PassRefPtr<SkImage> newImageSnapshot(AccelerationHint) override;
-    void draw(GraphicsContext*, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode) override;
+    void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode) override;
     bool isExpensiveToPaint() override;
     void setHasExpensiveOp() override { m_currentFrameHasExpensiveOp = true; }
 
diff --git a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
index 15f588d5..dbde9d6 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
@@ -20,7 +20,7 @@ class SkPictureBuilder final {
     WTF_MAKE_NONCOPYABLE(SkPictureBuilder);
     STACK_ALLOCATED();
 public:
-    SkPictureBuilder(const FloatRect& bounds, SkMetaData* metaData = 0, GraphicsContext* containingContext = 0)
+    SkPictureBuilder(const FloatRect& bounds, SkMetaData* metaData = nullptr, GraphicsContext* containingContext = nullptr)
         : m_bounds(bounds)
     {
         GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
index 17900c5..77f921f 100644
--- a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
+++ b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
@@ -243,9 +243,9 @@ bool nearlyIntegral(float value)
     return fabs(value - floorf(value)) < std::numeric_limits<float>::epsilon();
 }
 
-InterpolationQuality limitInterpolationQuality(const GraphicsContext* context, InterpolationQuality resampling)
+InterpolationQuality limitInterpolationQuality(const GraphicsContext& context, InterpolationQuality resampling)
 {
-    return std::min(resampling, context->imageInterpolationQuality());
+    return std::min(resampling, context.imageInterpolationQuality());
 }
 
 InterpolationQuality computeInterpolationQuality(
diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.h b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.h
index 44b16b3..4d605d8 100644
--- a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.h
+++ b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.h
@@ -103,7 +103,7 @@ SkMatrix PLATFORM_EXPORT affineTransformToSkMatrix(const AffineTransform&);
 
 bool nearlyIntegral(float value);
 
-InterpolationQuality limitInterpolationQuality(const GraphicsContext*, InterpolationQuality resampling);
+InterpolationQuality limitInterpolationQuality(const GraphicsContext&, InterpolationQuality resampling);
 
 InterpolationQuality computeInterpolationQuality(
     float srcWidth,
author	wangxianzhu <wangxianzhu@chromium.org>	2015-12-10 13:45:14 -0800
committer	Commit bot <commit-bot@chromium.org>	2015-12-10 21:46:06 +0000
commit	a734170517b9576bedce9feeddfe53473510c4e9 (patch)
tree	0563eb9611710c1e8886e2cca4989671449e9852 /third_party/WebKit/Source/platform/graphics
parent	dd79f4d8688ee24ff8ac0e0d7d011d21ddd2dd2b (diff)
download	chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.zip chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.tar.gz chromium_src-a734170517b9576bedce9feeddfe53473510c4e9.tar.bz2