Unreviewed, rolling out r231996.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 May 2018 15:12:29 +0000 (15:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 May 2018 15:12:29 +0000 (15:12 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/platform/PublicSuffix.h
Source/WebCore/platform/mac/PublicSuffixMac.mm

index 220e841..3e0e2b5 100644 (file)
@@ -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"
index b817da2..6c6ee24 100644 (file)
@@ -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
index 22a539a..f7ee973 100644 (file)
@@ -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
 
index 6736e2d..1a8c8f1 100644 (file)
@@ -60,11 +60,6 @@ String topPrivatelyControlledDomain(const String& domain)
     return String();
 }
 
-String decodeHostName(const String& domain)
-{
-    return decodeHostName(static_cast<NSString*>(domain));
-}
-
 }
 
 #endif