Changeset 231997 in webkit


Ignore:
Timestamp:
May 19, 2018 8:12:29 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

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

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r231996 r231997  
     12018-05-19  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r231996.
     4        https://bugs.webkit.org/show_bug.cgi?id=185799
     5
     6         Broke the GTK build (Requested by eric_carlson on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Improve NowPlaying "title""
     11        https://bugs.webkit.org/show_bug.cgi?id=185680
     12        https://trac.webkit.org/changeset/231996
     13
    1142018-05-18  Eric Carlson  <eric.carlson@apple.com>
    215
  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r231996 r231997  
    7373#include "PlatformMediaSessionManager.h"
    7474#include "ProgressTracker.h"
    75 #include "PublicSuffix.h"
    7675#include "RenderLayerCompositor.h"
    7776#include "RenderTheme.h"
     
    74547453        return emptyString();
    74557454
    7456     auto title = String(attributeWithoutSynchronization(titleAttr)).stripWhiteSpace().simplifyWhiteSpace();
     7455    if (hasAttributeWithoutSynchronization(titleAttr)) {
     7456        auto title = attributeWithoutSynchronization(titleAttr);
     7457        if (!title.isEmpty())
     7458            return title;
     7459    }
     7460
     7461    auto title = document().title();
    74577462    if (!title.isEmpty())
    74587463        return title;
    74597464
    7460     title = document().title().stripWhiteSpace().simplifyWhiteSpace();
    7461     if (!title.isEmpty())
    7462         return title;
    7463 
    7464     title = m_currentSrc.host();
    7465 #if ENABLE(PUBLIC_SUFFIX_LIST)
    7466     if (!title.isEmpty()) {
    7467         title = decodeHostName(title);
    7468         auto domain = topPrivatelyControlledDomain(title);
    7469         if (!domain.isEmpty())
    7470             title = domain;
    7471     }
    7472 #endif
    7473 
    7474     return title;
     7465    return m_currentSrc.host();
    74757466}
    74767467
  • trunk/Source/WebCore/platform/PublicSuffix.h

    r231996 r231997  
    3535WEBCORE_EXPORT bool isPublicSuffix(const String& domain);
    3636WEBCORE_EXPORT String topPrivatelyControlledDomain(const String& domain);
    37 String decodeHostName(const String& domain);
    3837
    3938} // namespace WebCore
  • trunk/Source/WebCore/platform/mac/PublicSuffixMac.mm

    r231996 r231997  
    6161}
    6262
    63 String decodeHostName(const String& domain)
    64 {
    65     return decodeHostName(static_cast<NSString*>(domain));
    66 }
    67 
    6863}
    6964
Note: See TracChangeset for help on using the changeset viewer.