Changeset 275091 in webkit

Timestamp:

Mar 26, 2021, 4:07:44 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Fix NowPlayingInfoArtwork operator== logic.
​https://bugs.webkit.org/show_bug.cgi?id=223730
<rdar://problem/75822687>

Patch by Jean-Yves Avenard <Jean-Yves Avenard> on 2021-03-26
Reviewed by Youenn Fablet.

Source/WebCore:

Gtest NowPlayingInfoArtworkTest added .

• platform/audio/NowPlayingInfo.h:

(WebCore::NowPlayingInfoArtwork::operator== const):
(WebCore::NowPlayingInfoArtwork::operator!= const):

Tools:

• TestWebKitAPI/CMakeLists.txt:
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebCore/NowPlayingInfoTests.cpp: Added.

(TestWebKitAPI::testEmptyArtwork):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/NowPlayingInfo.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/CMakeLists.txt (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebCore/NowPlayingInfoTests.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-26  Jean-Yves Avenard  <jya@apple.com>
+
+        Fix NowPlayingInfoArtwork operator== logic.
+        https://bugs.webkit.org/show_bug.cgi?id=223730
+        <rdar://problem/75822687>
+
+        Reviewed by Youenn Fablet.
+
+        Gtest NowPlayingInfoArtworkTest added .
+
+        * platform/audio/NowPlayingInfo.h:
+        (WebCore::NowPlayingInfoArtwork::operator== const):
+        (WebCore::NowPlayingInfoArtwork::operator!= const):
+
 2021-03-26  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/audio/NowPlayingInfo.h

@@ -42 +42 @@
     bool operator==(const NowPlayingInfoArtwork& other) const
     {
-        return *this != other;
+        return src == other.src && mimeType == other.mimeType;
     }
 
     bool operator!=(const NowPlayingInfoArtwork& other) const
     {
-        return src != other.src || mimeType != other.mimeType;
+        return !(*this == other);
     }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-03-26  Jean-Yves Avenard  <jya@apple.com>
+
+        Fix NowPlayingInfoArtwork operator== logic.
+        https://bugs.webkit.org/show_bug.cgi?id=223730
+        <rdar://problem/75822687>
+
+        Reviewed by Youenn Fablet.
+
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebCore/NowPlayingInfoTests.cpp: Added.
+        (TestWebKitAPI::testEmptyArtwork):
+        (TestWebKitAPI::TEST):
+
 2021-03-25  Cameron McCormack  <heycam@apple.com>
 

trunk/Tools/TestWebKitAPI/CMakeLists.txt

@@ -184 +184 @@
         Tests/WebCore/LayoutUnitTests.cpp
         Tests/WebCore/MIMETypeRegistry.cpp
+        Tests/WebCore/NowPlayingInfoTests.cpp
         Tests/WebCore/ParsedContentRange.cpp
         Tests/WebCore/PublicSuffix.cpp

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -319 +319 @@
                 5142B2731517C8C800C32B19 /* ContextMenuCanCopyURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */; };
                 514958BE1F7427AC00E87BAD /* WKWebViewAutofillTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514958BD1F7427AC00E87BAD /* WKWebViewAutofillTests.mm */; };
+                5159F267260D43E300B2DA3C /* NowPlayingInfoTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5159F266260D43E300B2DA3C /* NowPlayingInfoTests.cpp */; };
                 515BE16F1D428BB100DD7C68 /* StoreBlobToBeDeleted.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 515BE16E1D4288FF00DD7C68 /* StoreBlobToBeDeleted.html */; };
                 515BE1711D428E4B00DD7C68 /* StoreBlobThenDelete.mm in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1701D428BD100DD7C68 /* StoreBlobThenDelete.mm */; };
@@ -2097 +2098 @@
                 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ContextMenuCanCopyURL.html; sourceTree = "<group>"; };
                 514958BD1F7427AC00E87BAD /* WKWebViewAutofillTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewAutofillTests.mm; sourceTree = "<group>"; };
+                5159F266260D43E300B2DA3C /* NowPlayingInfoTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NowPlayingInfoTests.cpp; sourceTree = "<group>"; };
                 515BE16E1D4288FF00DD7C68 /* StoreBlobToBeDeleted.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = StoreBlobToBeDeleted.html; sourceTree = "<group>"; };
                 515BE1701D428BD100DD7C68 /* StoreBlobThenDelete.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StoreBlobThenDelete.mm; sourceTree = "<group>"; };
@@ -3627 +3629 @@
                                 CE1866471F72E8F100A0CAB6 /* MarkedText.cpp */,
                                 A5B149DD1F5A19DC00C6DAFF /* MIMETypeRegistry.cpp */,
+                                5159F266260D43E300B2DA3C /* NowPlayingInfoTests.cpp */,
                                 CD225C071C45A69200140761 /* ParsedContentRange.cpp */,
                                 AA96CAB421C7DB4200FD2F97 /* ParsedContentType.cpp */,
@@ -5475 +5478 @@
                                 CD2D0D1A213465560018C784 /* NowPlaying.mm in Sources */,
                                 2ECFF5551D9B12F800B55394 /* NowPlayingControlsTests.mm in Sources */,
+                                5159F267260D43E300B2DA3C /* NowPlayingInfoTests.cpp in Sources */,
                                 A10F047E1E3AD29C00C95E19 /* NSFileManagerExtras.mm in Sources */,
                                 F442851D2140DF2900CCDA22 /* NSFontPanelTesting.mm in Sources */,