Title: [285091] trunk/Source/WebCore
- Revision
- 285091
- Author
- [email protected]
- Date
- 2021-10-31 01:49:17 -0700 (Sun, 31 Oct 2021)
Log Message
Change some bitwise OR operators to logical OR
https://bugs.webkit.org/show_bug.cgi?id=232537
<rdar://problem/84845378>
Reviewed by Alexey Proskuryakov.
* html/canvas/CanvasRenderingContext2DBase.cpp:
(WebCore::CanvasRenderingContext2DBase::translate):
(WebCore::CanvasRenderingContext2DBase::transform):
(WebCore::CanvasRenderingContext2DBase::setTransform):
(WebCore::validateRectForCanvas):
(WebCore::CanvasRenderingContext2DBase::canDrawText):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (285090 => 285091)
--- trunk/Source/WebCore/ChangeLog 2021-10-31 03:22:46 UTC (rev 285090)
+++ trunk/Source/WebCore/ChangeLog 2021-10-31 08:49:17 UTC (rev 285091)
@@ -1,3 +1,18 @@
+2021-10-31 Cameron McCormack <[email protected]>
+
+ Change some bitwise OR operators to logical OR
+ https://bugs.webkit.org/show_bug.cgi?id=232537
+ <rdar://problem/84845378>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ (WebCore::CanvasRenderingContext2DBase::translate):
+ (WebCore::CanvasRenderingContext2DBase::transform):
+ (WebCore::CanvasRenderingContext2DBase::setTransform):
+ (WebCore::validateRectForCanvas):
+ (WebCore::CanvasRenderingContext2DBase::canDrawText):
+
2021-10-30 Myles C. Maxfield <[email protected]>
Migrate the first few callers from ImageBuffer::truncatedLogicalSize() to ImageBuffer::logicalSize()
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (285090 => 285091)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-10-31 03:22:46 UTC (rev 285090)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-10-31 08:49:17 UTC (rev 285091)
@@ -790,7 +790,7 @@
if (!state().hasInvertibleTransform)
return;
- if (!std::isfinite(tx) | !std::isfinite(ty))
+ if (!std::isfinite(tx) || !std::isfinite(ty))
return;
AffineTransform newTransform = state().transform;
@@ -813,7 +813,7 @@
if (!state().hasInvertibleTransform)
return;
- if (!std::isfinite(m11) | !std::isfinite(m21) | !std::isfinite(dx) | !std::isfinite(m12) | !std::isfinite(m22) | !std::isfinite(dy))
+ if (!std::isfinite(m11) || !std::isfinite(m21) || !std::isfinite(dx) || !std::isfinite(m12) || !std::isfinite(m22) || !std::isfinite(dy))
return;
AffineTransform transform(m11, m12, m21, m22, dx, dy);
@@ -843,7 +843,7 @@
if (!c)
return;
- if (!std::isfinite(m11) | !std::isfinite(m21) | !std::isfinite(dx) | !std::isfinite(m12) | !std::isfinite(m22) | !std::isfinite(dy))
+ if (!std::isfinite(m11) || !std::isfinite(m21) || !std::isfinite(dx) || !std::isfinite(m12) || !std::isfinite(m22) || !std::isfinite(dy))
return;
resetTransform();
@@ -967,7 +967,7 @@
static bool validateRectForCanvas(double& x, double& y, double& width, double& height)
{
- if (!std::isfinite(x) | !std::isfinite(y) | !std::isfinite(width) | !std::isfinite(height))
+ if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(width) || !std::isfinite(height))
return false;
if (!width && !height)
@@ -2364,7 +2364,7 @@
return false;
if (!state().hasInvertibleTransform)
return false;
- if (!std::isfinite(x) | !std::isfinite(y))
+ if (!std::isfinite(x) || !std::isfinite(y))
return false;
if (maxWidth && (!std::isfinite(maxWidth.value()) || maxWidth.value() <= 0))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
