Diff
Modified: trunk/LayoutTests/ChangeLog (271645 => 271646)
--- trunk/LayoutTests/ChangeLog 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/LayoutTests/ChangeLog 2021-01-20 13:55:13 UTC (rev 271646)
@@ -1,3 +1,13 @@
+2021-01-20 Sam Weinig <wei...@apple.com>
+
+ Remove remaining non-standard CMYKA support from canvas
+ https://bugs.webkit.org/show_bug.cgi?id=220760
+
+ Reviewed by Darin Adler and Wenson Hsieh.
+
+ * inspector/canvas/recording-2d-full-expected.txt:
+ Update test results for removal.
+
2021-01-20 Diego Pino Garcia <dp...@igalia.com>
[WPE] Unreviewed gardening. Add removed WebXR tests in r270745.
Modified: trunk/LayoutTests/inspector/canvas/recording-2d-full-expected.txt (271645 => 271646)
--- trunk/LayoutTests/inspector/canvas/recording-2d-full-expected.txt 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/LayoutTests/inspector/canvas/recording-2d-full-expected.txt 2021-01-20 13:55:13 UTC (rev 271646)
@@ -785,8 +785,8 @@
0: setShadow
1: (anonymous function)
2: executeFrameFunction
- 5: setShadow(24, 25, 26, 27, 28, 29, 30, 31)
- swizzleTypes: [Number, Number, Number, Number, Number, Number, Number, Number]
+ 5: setShadow(24, 25, 26, 27, 28, 29, 30)
+ swizzleTypes: [Number, Number, Number, Number, Number, Number, Number]
trace:
0: setShadow
1: (anonymous function)
Modified: trunk/Source/WebCore/ChangeLog (271645 => 271646)
--- trunk/Source/WebCore/ChangeLog 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/Source/WebCore/ChangeLog 2021-01-20 13:55:13 UTC (rev 271646)
@@ -1,3 +1,20 @@
+2021-01-20 Sam Weinig <wei...@apple.com>
+
+ "Remove remaining non-standard CMYKA support from Canvas"
+ https://bugs.webkit.org/show_bug.cgi?id=220760
+
+ Reviewed by Darin Adler and Wenson Hsieh.
+
+ In r267645, most of the non-standard CMYKA taking functions on `CanvasRenderingContext2D`
+ were removed, leaving only the `setShadow` overload left. This finishes that removal and
+ cleans up some dead declarations that were left behind. As with the overloads removed in
+ r267645, we are quite confident no one is using these.
+
+ * html/canvas/CanvasRenderingContext2D.idl:
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ * html/canvas/CanvasRenderingContext2DBase.h:
+ * html/canvas/CanvasStyle.h:
+
2021-01-18 Sergio Villar Senin <svil...@igalia.com>
[css-multicol] OOM with 1px height columns
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (271645 => 271646)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2021-01-20 13:55:13 UTC (rev 271646)
@@ -69,7 +69,6 @@
undefined setShadow(unrestricted float width, unrestricted float height, unrestricted float blur, optional DOMString color, optional unrestricted float alpha);
undefined setShadow(unrestricted float width, unrestricted float height, unrestricted float blur, unrestricted float grayLevel, optional unrestricted float alpha = 1);
undefined setShadow(unrestricted float width, unrestricted float height, unrestricted float blur, unrestricted float r, unrestricted float g, unrestricted float b, unrestricted float a);
- undefined setShadow(float width, unrestricted float height, unrestricted float blur, unrestricted float c, unrestricted float m, unrestricted float y, unrestricted float k, unrestricted float a);
undefined clearShadow();
// Inspector-only.
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (271645 => 271646)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-01-20 13:55:13 UTC (rev 271646)
@@ -1308,11 +1308,6 @@
setShadow(FloatSize(width, height), blur, convertToComponentBytes(SRGBA { r, g, b, a }));
}
-void CanvasRenderingContext2DBase::setShadow(float width, float height, float blur, float c, float m, float y, float k, float a)
-{
- setShadow(FloatSize(width, height), blur, convertToComponentBytes(toSRGBA(CMYKA { c, m, y, k, a })));
-}
-
void CanvasRenderingContext2DBase::clearShadow()
{
setShadow(FloatSize(), 0, Color::transparentBlack);
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (271645 => 271646)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h 2021-01-20 13:55:13 UTC (rev 271646)
@@ -144,12 +144,10 @@
void setStrokeColor(const String& color, Optional<float> alpha = WTF::nullopt);
void setStrokeColor(float grayLevel, float alpha = 1.0);
void setStrokeColor(float r, float g, float b, float a);
- void setStrokeColor(float c, float m, float y, float k, float a);
void setFillColor(const String& color, Optional<float> alpha = WTF::nullopt);
void setFillColor(float grayLevel, float alpha = 1.0f);
void setFillColor(float r, float g, float b, float a);
- void setFillColor(float c, float m, float y, float k, float a);
void beginPath();
@@ -174,7 +172,6 @@
void setShadow(float width, float height, float blur, const String& color = String(), Optional<float> alpha = WTF::nullopt);
void setShadow(float width, float height, float blur, float grayLevel, float alpha = 1.0);
void setShadow(float width, float height, float blur, float r, float g, float b, float a);
- void setShadow(float width, float height, float blur, float c, float m, float y, float k, float a);
void clearShadow();
Modified: trunk/Source/WebCore/html/canvas/CanvasStyle.h (271645 => 271646)
--- trunk/Source/WebCore/html/canvas/CanvasStyle.h 2021-01-20 13:10:31 UTC (rev 271645)
+++ trunk/Source/WebCore/html/canvas/CanvasStyle.h 2021-01-20 13:55:13 UTC (rev 271646)
@@ -43,7 +43,6 @@
CanvasStyle();
CanvasStyle(Color);
CanvasStyle(const SRGBA<float>&);
- CanvasStyle(const CMYKA<float>&);
CanvasStyle(CanvasGradient&);
CanvasStyle(CanvasPattern&);
@@ -63,7 +62,6 @@
bool isEquivalentColor(const CanvasStyle&) const;
bool isEquivalent(const SRGBA<float>&) const;
- bool isEquivalent(const CMYKA<float>&) const;
private:
struct Invalid { };
