Attachment 340774 Details for Bug 185799 – ROLLOUT of r231996

[patch] ROLLOUT of r231996

bug-185799-20180519111040.patch (text/plain), 3.35 KB, created by WebKit Commit Bot on 2018-05-19 08:10:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-05-19 08:10:41 PDT

Size: 3.35 KB

patch

obsolete

>Subversion Revision: 231996
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 220e8416b9a640a3c7accad08267a1adebb55474..3e0e2b5a271fdcc2d70101d315913a5eeea34c6a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-19  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231996.
>+        https://bugs.webkit.org/show_bug.cgi?id=185799
>+
>+         Broke the GTK build (Requested by eric_carlson on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Improve NowPlaying "title""
>+        https://bugs.webkit.org/show_bug.cgi?id=185680
>+        https://trac.webkit.org/changeset/231996
>+
> 2018-05-18  Eric Carlson  <eric.carlson@apple.com>
> 
>         Improve NowPlaying "title"
>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index b817da21df1ea6e9a5fc5ca8b91e7ca5cbf5111c..6c6ee240fafa673021a273b4afcca8917bb9eff7 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -72,7 +72,6 @@
> #include "PageGroup.h"
> #include "PlatformMediaSessionManager.h"
> #include "ProgressTracker.h"
>-#include "PublicSuffix.h"
> #include "RenderLayerCompositor.h"
> #include "RenderTheme.h"
> #include "RenderVideo.h"
>@@ -7453,25 +7452,17 @@ String HTMLMediaElement::mediaSessionTitle() const
>     if (!document().page() || document().page()->usesEphemeralSession())
>         return emptyString();
> 
>-    auto title = String(attributeWithoutSynchronization(titleAttr)).stripWhiteSpace().simplifyWhiteSpace();
>-    if (!title.isEmpty())
>-        return title;
>+    if (hasAttributeWithoutSynchronization(titleAttr)) {
>+        auto title = attributeWithoutSynchronization(titleAttr);
>+        if (!title.isEmpty())
>+            return title;
>+    }
> 
>-    title = document().title().stripWhiteSpace().simplifyWhiteSpace();
>+    auto title = document().title();
>     if (!title.isEmpty())
>         return title;
> 
>-    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;
>+    return m_currentSrc.host();
> }
> 
> uint64_t HTMLMediaElement::mediaSessionUniqueIdentifier() const
>diff --git a/Source/WebCore/platform/PublicSuffix.h b/Source/WebCore/platform/PublicSuffix.h
>index 22a539ae9d17461308323ed99e07f683cf121d10..f7ee973ce77f316e7235a41ea00c662c04d652bf 100644
>--- a/Source/WebCore/platform/PublicSuffix.h
>+++ b/Source/WebCore/platform/PublicSuffix.h
>@@ -34,7 +34,6 @@ 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 6736e2d295bb99865e790e678d4a6e4dbdcf1399..1a8c8f15f50886470a6fbaf54d830b6b3eb0cd93 100644
>--- a/Source/WebCore/platform/mac/PublicSuffixMac.mm
>+++ b/Source/WebCore/platform/mac/PublicSuffixMac.mm
>@@ -60,11 +60,6 @@ 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 185799: 340774