Changeset 232001 in webkit

Timestamp:

May 19, 2018 4:07:38 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

Improve NowPlaying "title"
​https://bugs.webkit.org/show_bug.cgi?id=185680
<rdar://problem/40296700>

Reviewed by Dean Jackson.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaSessionTitle const): Use decodeHostName and
topPrivatelyControlledDomain when possible to make the host name more readable.

• platform/PublicSuffix.h:
• platform/mac/PublicSuffixMac.mm:

(WebCore::decodeHostName): Expose topPrivatelyControlledDomain method to .cpp functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• platform/PublicSuffix.h (modified) (1 diff)
• platform/mac/PublicSuffixMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-19  Eric Carlson  <eric.carlson@apple.com>
+
+        Improve NowPlaying "title"
+        https://bugs.webkit.org/show_bug.cgi?id=185680
+        <rdar://problem/40296700>
+
+        Reviewed by Dean Jackson.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaSessionTitle const): Use decodeHostName and 
+        topPrivatelyControlledDomain when possible to make the host name more readable.
+
+        * platform/PublicSuffix.h:
+        * platform/mac/PublicSuffixMac.mm:
+        (WebCore::decodeHostName): Expose topPrivatelyControlledDomain method to .cpp functions.
+
 2018-05-19  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -73 +73 @@
 #include "PlatformMediaSessionManager.h"
 #include "ProgressTracker.h"
+#include "PublicSuffix.h"
 #include "RenderLayerCompositor.h"
 #include "RenderTheme.h"
@@ -7453 +7454 @@
         return emptyString();
 
-    if (hasAttributeWithoutSynchronization(titleAttr)) {
-        auto title = attributeWithoutSynchronization(titleAttr);
-        if (!title.isEmpty())
-            return title;
-    }
-
-    auto title = document().title();
+    auto title = String(attributeWithoutSynchronization(titleAttr)).stripWhiteSpace().simplifyWhiteSpace();
     if (!title.isEmpty())
         return title;
 
-    return m_currentSrc.host();
+    title = document().title().stripWhiteSpace().simplifyWhiteSpace();
+    if (!title.isEmpty())
+        return title;
+
+    title = m_currentSrc.host();
+#if PLATFORM(MAC) || PLATFORM(IOS)
+    if (!title.isEmpty())
+        title = decodeHostName(title);
+#endif
+#if ENABLE(PUBLIC_SUFFIX_LIST)
+    if (!title.isEmpty()) {
+        auto domain = topPrivatelyControlledDomain(title);
+        if (!domain.isEmpty())
+            title = domain;
+    }
+#endif
+
+    return title;
 }
 

trunk/Source/WebCore/platform/PublicSuffix.h

@@ -35 +35 @@
 WEBCORE_EXPORT bool isPublicSuffix(const String& domain);
 WEBCORE_EXPORT String topPrivatelyControlledDomain(const String& domain);
+String decodeHostName(const String& domain);
 
 } // namespace WebCore

trunk/Source/WebCore/platform/mac/PublicSuffixMac.mm

@@ -61 +61 @@
 }
 
+String decodeHostName(const String& domain)
+{
+    return decodeHostName(static_cast<NSString*>(domain));
+}
+
 }