Attachment 340769 Details for Bug 185680 – Respond to post-review comments

[patch] Respond to post-review comments

bug-185680-20180518194025.patch (text/plain), 3.58 KB, created by Eric Carlson on 2018-05-18 19:40:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-18 19:40:25 PDT

Size: 3.58 KB

patch

obsolete

>Subversion Revision: 231983
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ef77cb83859a3bc9b332867e0a88dea75276f71a..49154ded6c9300f411971cf82f0da4ab3787b3cb 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-18  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-18  Jer Noble  <jer.noble@apple.com>
> 
>         Complete fix for enabling modern EME by default
>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index 6c6ee240fafa673021a273b4afcca8917bb9eff7..b817da21df1ea6e9a5fc5ca8b91e7ca5cbf5111c 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -72,6 +72,7 @@
> #include "PageGroup.h"
> #include "PlatformMediaSessionManager.h"
> #include "ProgressTracker.h"
>+#include "PublicSuffix.h"
> #include "RenderLayerCompositor.h"
> #include "RenderTheme.h"
> #include "RenderVideo.h"
>@@ -7452,17 +7453,25 @@ String HTMLMediaElement::mediaSessionTitle() const
>     if (!document().page() || document().page()->usesEphemeralSession())
>         return emptyString();
> 
>-    if (hasAttributeWithoutSynchronization(titleAttr)) {
>-        auto title = attributeWithoutSynchronization(titleAttr);
>-        if (!title.isEmpty())
>-            return title;
>-    }
>+    auto title = String(attributeWithoutSynchronization(titleAttr)).stripWhiteSpace().simplifyWhiteSpace();
>+    if (!title.isEmpty())
>+        return title;
> 
>-    auto title = document().title();
>+    title = document().title().stripWhiteSpace().simplifyWhiteSpace();
>     if (!title.isEmpty())
>         return title;
> 
>-    return m_currentSrc.host();
>+    title = m_currentSrc.host();
>+#if ENABLE(PUBLIC_SUFFIX_LIST)
>+    if (!title.isEmpty()) {
>+        title = decodeHostName(title);
>+        auto domain = topPrivatelyControlledDomain(title);
>+        if (!domain.isEmpty())
>+            title = domain;
>+    }
>+#endif
>+
>+    return title;
> }
> 
> uint64_t HTMLMediaElement::mediaSessionUniqueIdentifier() const
>diff --git a/Source/WebCore/platform/PublicSuffix.h b/Source/WebCore/platform/PublicSuffix.h
>index f7ee973ce77f316e7235a41ea00c662c04d652bf..22a539ae9d17461308323ed99e07f683cf121d10 100644
>--- a/Source/WebCore/platform/PublicSuffix.h
>+++ b/Source/WebCore/platform/PublicSuffix.h
>@@ -34,6 +34,7 @@ namespace WebCore {
> 
> WEBCORE_EXPORT bool isPublicSuffix(const String& domain);
> WEBCORE_EXPORT String topPrivatelyControlledDomain(const String& domain);
>+String decodeHostName(const String& domain);
> 
> } // namespace WebCore
> 
>diff --git a/Source/WebCore/platform/mac/PublicSuffixMac.mm b/Source/WebCore/platform/mac/PublicSuffixMac.mm
>index 1a8c8f15f50886470a6fbaf54d830b6b3eb0cd93..6736e2d295bb99865e790e678d4a6e4dbdcf1399 100644
>--- a/Source/WebCore/platform/mac/PublicSuffixMac.mm
>+++ b/Source/WebCore/platform/mac/PublicSuffixMac.mm
>@@ -60,6 +60,11 @@ String topPrivatelyControlledDomain(const String& domain)
>     return String();
> }
> 
>+String decodeHostName(const String& domain)
>+{
>+    return decodeHostName(static_cast<NSString*>(domain));
>+}
>+
> }
> 
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 185680: 340504 | 340762 | 340763 | 340764 | 340766 | 340767 | 340769 | 340786 | 340880