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

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

Issue 2797213002: Fix BaseRenderingContext2D create/put/get-ImageData() for color managed canvas (Closed)
Patch Set: Rebaseline Created 3 years, 8 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.h
diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
index be6a7237674afec4938b5923b50c8530cd0f8e6f..7d9d7c5b385e570c9f5ff03a7ec5f3157f071cac 100644
--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
@@ -187,6 +187,20 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
ImageData* createImageData(ImageData*, ExceptionState&) const;
ImageData* createImageData(int width, int height, ExceptionState&) const;
+ ImageData* createImageData(unsigned,
+ unsigned,
+ ImageDataColorSettings&,
+ ExceptionState&) const;
+ ImageData* createImageData(ImageDataArray&,
+ unsigned,
+ unsigned,
+ ExceptionState&) const;
+ ImageData* createImageData(ImageDataArray&,
+ unsigned,
+ unsigned,
+ ImageDataColorSettings&,
+ ExceptionState&) const;
+
ImageData* getImageData(int sx, int sy, int sw, int sh, ExceptionState&);
void putImageData(ImageData*, int dx, int dy, ExceptionState&);
void putImageData(ImageData*,
@@ -238,6 +252,16 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
virtual void WillDrawImage(CanvasImageSource*) const {}
+ virtual CanvasColorSpace ColorSpace() const {
+ return kLegacyCanvasColorSpace;
+ };
+ virtual String ColorSpaceAsString() const {
+ return kLegacyCanvasColorSpaceName;
+ }
+ virtual CanvasPixelFormat PixelFormat() const {
+ return kRGBA8CanvasPixelFormat;
+ }
+
void RestoreMatrixClipStack(PaintCanvas*) const;
DECLARE_VIRTUAL_TRACE();
@@ -372,6 +396,10 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
void ClearCanvas();
bool RectContainsTransformedRect(const FloatRect&, const SkIRect&) const;
+
+ ImageDataColorSettings GetColorSettingsAsImageDataColorSettings() const;
+
+ bool color_management_enabled_;
};
template <typename DrawFunc, typename ContainsFunc>

Powered by Google App Engine
This is Rietveld 408576698