Changeset 231997 in webkit
- Timestamp:
- May 19, 2018 8:12:29 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r231996 r231997 1 2018-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 1 14 2018-05-18 Eric Carlson <eric.carlson@apple.com> 2 15 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r231996 r231997 73 73 #include "PlatformMediaSessionManager.h" 74 74 #include "ProgressTracker.h" 75 #include "PublicSuffix.h"76 75 #include "RenderLayerCompositor.h" 77 76 #include "RenderTheme.h" … … 7454 7453 return emptyString(); 7455 7454 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(); 7457 7462 if (!title.isEmpty()) 7458 7463 return title; 7459 7464 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(); 7475 7466 } 7476 7467 -
trunk/Source/WebCore/platform/PublicSuffix.h
r231996 r231997 35 35 WEBCORE_EXPORT bool isPublicSuffix(const String& domain); 36 36 WEBCORE_EXPORT String topPrivatelyControlledDomain(const String& domain); 37 String decodeHostName(const String& domain);38 37 39 38 } // namespace WebCore -
trunk/Source/WebCore/platform/mac/PublicSuffixMac.mm
r231996 r231997 61 61 } 62 62 63 String decodeHostName(const String& domain)64 {65 return decodeHostName(static_cast<NSString*>(domain));66 }67 68 63 } 69 64
Note: See TracChangeset
for help on using the changeset viewer.