Modified: trunk/Source/WebCore/ChangeLog (288587 => 288588)
--- trunk/Source/WebCore/ChangeLog 2022-01-25 23:59:46 UTC (rev 288587)
+++ trunk/Source/WebCore/ChangeLog 2022-01-26 00:14:48 UTC (rev 288588)
@@ -1,5 +1,22 @@
2022-01-25 Simon Fraser <simon.fra...@apple.com>
+ Fix some spelling errors in Color functions
+ https://bugs.webkit.org/show_bug.cgi?id=235618
+
+ Reviewed by Wenson Hsieh.
+
+ Fix the spelling of outOfLineComponentsEqual and outOfLineComponentsEqualIgnoringSemanticColor.
+
+ * platform/graphics/Color.h:
+ (WebCore::operator==):
+ (WebCore::outOfLineComponentsEqual):
+ (WebCore::outOfLineComponentsEqualIgnoringSemanticColor):
+ (WebCore::equalIgnoringSemanticColor):
+ (WebCore::outOfLineComponentssEqual): Deleted.
+ (WebCore::outOfLineComponentssEqualIgnoringSemanticColor): Deleted.
+
+2022-01-25 Simon Fraser <simon.fra...@apple.com>
+
Fix the lldb Color formatter
https://bugs.webkit.org/show_bug.cgi?id=235613
Modified: trunk/Source/WebCore/platform/graphics/Color.h (288587 => 288588)
--- trunk/Source/WebCore/platform/graphics/Color.h 2022-01-25 23:59:46 UTC (rev 288587)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2022-01-26 00:14:48 UTC (rev 288588)
@@ -160,8 +160,8 @@
// Out of line and inline colors will always be non-equal.
friend bool operator==(const Color& a, const Color& b);
friend bool equalIgnoringSemanticColor(const Color& a, const Color& b);
- friend bool outOfLineComponentssEqual(const Color&, const Color&);
- friend bool outOfLineComponentssEqualIgnoringSemanticColor(const Color&, const Color&);
+ friend bool outOfLineComponentsEqual(const Color&, const Color&);
+ friend bool outOfLineComponentsEqualIgnoringSemanticColor(const Color&, const Color&);
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<Color> decode(Decoder&);
@@ -259,8 +259,8 @@
bool operator!=(const Color&, const Color&);
// One or both must be out of line colors.
-bool outOfLineComponentssEqual(const Color&, const Color&);
-bool outOfLineComponentssEqualIgnoringSemanticColor(const Color&, const Color&);
+bool outOfLineComponentsEqual(const Color&, const Color&);
+bool outOfLineComponentsEqualIgnoringSemanticColor(const Color&, const Color&);
#if USE(CG)
WEBCORE_EXPORT RetainPtr<CGColorRef> cachedCGColor(const Color&);
@@ -273,7 +273,7 @@
inline bool operator==(const Color& a, const Color& b)
{
if (a.isOutOfLine() || b.isOutOfLine())
- return outOfLineComponentssEqual(a, b);
+ return outOfLineComponentsEqual(a, b);
return a.m_colorAndFlags == b.m_colorAndFlags;
}
@@ -282,7 +282,7 @@
return !(a == b);
}
-inline bool outOfLineComponentssEqual(const Color& a, const Color& b)
+inline bool outOfLineComponentsEqual(const Color& a, const Color& b)
{
if (a.isOutOfLine() && b.isOutOfLine())
return a.asOutOfLine().unresolvedComponents() == b.asOutOfLine().unresolvedComponents() && a.colorSpace() == b.colorSpace() && a.flags() == b.flags();
@@ -291,7 +291,7 @@
return false;
}
-inline bool outOfLineComponentssEqualIgnoringSemanticColor(const Color& a, const Color& b)
+inline bool outOfLineComponentsEqualIgnoringSemanticColor(const Color& a, const Color& b)
{
if (a.isOutOfLine() && b.isOutOfLine()) {
auto aFlags = a.flags() - Color::FlagsIncludingPrivate::Semantic;
@@ -306,7 +306,7 @@
inline bool equalIgnoringSemanticColor(const Color& a, const Color& b)
{
if (a.isOutOfLine() || b.isOutOfLine())
- return outOfLineComponentssEqualIgnoringSemanticColor(a, b);
+ return outOfLineComponentsEqualIgnoringSemanticColor(a, b);
auto aFlags = a.flags() - Color::FlagsIncludingPrivate::Semantic;
auto bFlags = b.flags() - Color::FlagsIncludingPrivate::Semantic;