| Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
|
| index 5e5d5ea796f9d0f351ddcd4d554920e285913d9a..a794d6c717c1465aafb047f16ba45a202b656392 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
|
| @@ -95,7 +95,7 @@ public:
|
| virtual void resetCanvas(SkCanvas*) const;
|
|
|
| SkCanvas* canvas() const;
|
| - void disableDeferral() const;
|
| + void disableDeferral(DisableDeferralReason) const;
|
|
|
| // Called at the end of a task that rendered a whole frame
|
| void finalizeFrame(const FloatRect &dirtyRect);
|
| @@ -122,13 +122,13 @@ public:
|
|
|
| bool copyRenderingResultsFromDrawingBuffer(DrawingBuffer*, SourceDrawingBuffer);
|
|
|
| - void flush(); // process deferred draw commands immediately
|
| - void flushGpu(); // Like flush(), but flushes all the way down to the Gpu context if the surface is accelerated
|
| + void flush(FlushReason); // process deferred draw commands immediately
|
| + void flushGpu(FlushReason); // Like flush(), but flushes all the way down to the Gpu context if the surface is accelerated
|
|
|
| void notifySurfaceInvalid();
|
|
|
| - PassRefPtr<SkImage> newSkImageSnapshot(AccelerationHint) const;
|
| - PassRefPtr<Image> newImageSnapshot(AccelerationHint = PreferNoAcceleration) const;
|
| + PassRefPtr<SkImage> newSkImageSnapshot(AccelerationHint, SnapshotReason) const;
|
| + PassRefPtr<Image> newImageSnapshot(AccelerationHint = PreferNoAcceleration, SnapshotReason = SnapshotReasonUnknown) const;
|
|
|
| void draw(GraphicsContext&, const FloatRect&, const FloatRect*, SkXfermode::Mode);
|
|
|
|
|