<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195951] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195951">195951</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-01-31 21:46:20 -0800 (Sun, 31 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cut down on calls to String::lower; mostly replace with convertToASCIILowercase
https://bugs.webkit.org/show_bug.cgi?id=153732
Reviewed by Dean Jackson.
Source/WebCore:
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::isTypeSupported): Added comment about mysterious call
to lower(); should probably return here and remove it.
* Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
(WebCore::initProtocolHandlerWhitelist): Deleted. Moved into isProtocolWhitelisted.
(WebCore::isProtocolWhitelisted): Changed set to be ASCIICaseInsensitiveHash and
initialized it using a lambda instead of a separate function.
(WebCore::verifyProtocolHandlerScheme): Added a FIXME about some case sensitive
checking of the protocol prefix here.
* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::supportsMimeType): Changed set to be
ASCIICaseInsensitiveHash and initialized it using a lambda instead of using
an explict check for empty.
(WebCore::QuickTimePluginReplacement::supportsFileExtension): Ditto.
* Modules/plugins/YouTubePluginReplacement.cpp:
(WebCore::queryKeysAndValues): Use convertToASCIILowercase. The keys here are
going to be all ASCII.
(WebCore::isYouTubeURL): Use equalLettersIgnoringASCIICase instead of lowercasing
the string.
(WebCore::processAndCreateYouTubeURL): Use url.protocolIsInHTTPFamily instead of
listing "http" and then "https" explicitly. Use equalLettersIgnoringASCIICase
instead of lowercasing a string.
(WebCore::YouTubePluginReplacement::youTubeURL): Ditto.
* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::hostName): Use convertToASCIILowercase on host name.
(WebCore::WebSocketHandshake::host): Ditto.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetAttributes): Call convertToASCIILowercase instead of lower
to lowercase an element's tag name. This is a strange way to do things; typically
would be better to use some other function on Element, since tagName goes out of
its way to be capitalized, but some ATK expert can improve this later.
* css/CSSGrammar.y.in: Use the new convertToASCIILowercaseInPlace function rather
than the old lower function. We only need to lowercase the ASCII letters, and it's
also better to have the function have a clearer name.
* css/CSSParser.cpp:
(WebCore::convertToASCIILowercaseInPlace): Renamed from makeLower and made it deal
with only ASCII lowercasing.
(WebCore::CSSParserString::convertToASCIILowercaseInPlace): Renamed from lower.
(WebCore::isUniversalKeyword): Added. Helper for the function below that uses
equalLettersIgnoringASCIICase rather than lowercasing the string.
(WebCore::parseKeywordValue): Use isUniversalKeyword. Also clarified a comment.
(WebCore::CSSParser::parseAttr): Use convertToASCIILowercaseInPlace and delay
String creation until later in the function, using CSSParserString operations more.
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::parsePseudoElementSelector): Use
convertToASCIILowercaseInPlace by its new name, with its new behavior.
* css/CSSParserValues.h: Tweaked comment and formatting a bit. Replaced the lower
function with the convertToASCIILowercaseInPlace function.
* css/CSSSelector.cpp:
(WebCore::CSSSelector::RareData::parseNth): Rewrote this to avoid the need to
make a lowercased copy of m_argument. Use equalLettersIgnoringASCIICase, and two
calls to find. Also use String::toIntStrict so we don't have to create String
objects for substrings.
* css/MediaQuery.cpp:
(WebCore::MediaQuery::MediaQuery): Use convertToASCIILowercase for media type name.
* css/MediaQueryExp.cpp:
(WebCore::MediaQueryExp::serialize): Use convertToASCIILowercase for media feature name.
* dom/Document.cpp:
(WebCore::isSeparator): Tweaked formatting and removed non-helpful comment.
(WebCore::processArguments): Changed this from a static member function to a non-member
file internal function. Use a std::function instead of a function pointer with a void*
pointer. Rewrote algorithm to simplify it and use StringView instead of String for the
keys and values.
(WebCore::Document::processViewport): Use a lambda instead of a function pointer to
call setViewportFeature, so that function's interface is no longer dictated by
the exact type of the function pointer argument to processArguments.
(WebCore::Document::processFormatDetection): Use a lambda instead of the
setParserFeature function above; use equalLettersIgnoringASCIICase for both the
key and the value, since processArguments no longer lowercases the string.
(WebCore::Document::processArguments): Deleted.
* dom/Document.h: Removed unnecessary declaration of processArguments and
ArgumentsCallback. Both are now private to the cpp file.
* dom/Element.cpp:
(WebCore::makeIdForStyleResolution): Use convertToASCIILowercase. When in quirks mode,
we want to match IDs in an ASCII case-insensitive way not match compatibility caseless.
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::isScriptTypeSupported): Remove the use of lower here since
the MIME type registry is now itself ASCII case-insensitive.
* dom/ViewportArguments.cpp:
(WebCore::numericPrefix): Changed to use StringView and take a Document&, rearranged
argument order so Document& comes first.
(WebCore::findSizeValue): Ditto.
(WebCore::findScaleValue): Ditto.
(WebCore::findBooleanValue): Ditto. Also use std::abs instead of fabs, possibly
avoiding a conversion from float to double (not sure it was happening before but it's
definitely not happening now).
(WebCore::setViewportFeature): Changed to put arguments in a more logical order, to take
the ViewportArguments as a reference, not a void*, and to use StringView to avoid forcing
the caller to allocate strings. Also changed to use equalLettersIgnoringASCIICase so we
don't rely on the caller to make the key lowercase for us.
(WebCore::reportViewportWarning): Changed argument types. Added a couple comments about
mistakes in the function.
* dom/ViewportArguments.h: Removed unnecessary declaration of reportViewportWarning,
which is now private to the cpp file. Updated for new arguments to setViewportFeature.
* editing/EditorCommand.cpp:
(WebCore::executeFormatBlock): Use convertToASCIILowercase on the argument, which is
specifying a tag name.
* fileapi/Blob.cpp:
(WebCore::Blob::isValidContentType): Removed unnecessary separate loops for
8-bit and 16-bit strings. Content types are short strings and this small optimization is
not worth the additional code complexity.
(WebCore::Blob::normalizedContentType): Use convertToASCIILowercase since valid
content types are guaranteed to be all ASCII.
(WebCore::Blob::isNormalizedContentType): Removed unnecessary separate loops for
8-bit and 16-bit strings. Content types are short strings and this small optimization is
not worth the additional code complexity.
* html/parser/HTMLParserIdioms.cpp: Added now-needed include of QualifiedName.h.
* html/parser/HTMLParserIdioms.h: Removed unneeded include of QualifiedName.h and
WTFString.h. Made sure every function is declared first, even if it's also defined
later in the header in the section for functions templates and inline functions.
* loader/archive/ArchiveFactory.cpp:
(WebCore::ArchiveFactory::registerKnownArchiveMIMETypes): Use auto& for the type of
the set of MIME types here, since it's now using ASCIICaseInsensitiveHash.
* platform/MIMETypeRegistry.cpp: Changed the MIME type sets to use
ASCIICaseInsensitiveHash since MIME type are not case sensitive.
(WebCore::initializeSupportedImageMIMETypes): Use a modern for loop.
(WebCore::initializeSupportedImageMIMETypesForEncoding): Updated for HashSet type change.
(WebCore::initializePDFMIMETypes): Use a modern for loop.
(WebCore::initializeSupportedNonImageMimeTypes): Use a modern for loop.
(WebCore::initializeSupportedMediaMIMETypes): Updated for HashSet type change.
(WebCore::initializeUnsupportedTextMIMETypes): Use a modern for loop.
(WebCore::initializeMIMETypeRegistry): Updated for HashSet type change.
(WebCore::MIMETypeRegistry::getSupportedImageMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getSupportedImageResourceMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getSupportedImageMIMETypesForEncoding): Ditto.
(WebCore::MIMETypeRegistry::getSupportedNonImageMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getSupportedMediaMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getPDFMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getPDFAndPostScriptMIMETypes): Ditto.
(WebCore::MIMETypeRegistry::getUnsupportedTextMIMETypes): Ditto.
(WebCore::mimeTypeAssociationMap): Use ASCIICaseInsensitiveHash.
(WebCore::MIMETypeRegistry::getNormalizedMIMEType): Use auto to make code tighter.
* platform/MIMETypeRegistry.h: Changed return types of the getMIMETypes functions
to use ASCIICaseInsensitiveHash.
* platform/SchemeRegistry.cpp:
(WebCore::schemesForbiddenFromDomainRelaxation): Changed type to
use ASCIICaseInsensitiveHash.
* platform/URL.cpp:
(WebCore::mimeTypeFromDataURL): Use convertToASCIILowercase instead of lower.
Also removed some dead code that tried to handle the case where the data URL
has a comma as one of the first 5 characters: That can't happen since it's a
precondition of this function that the first five characters are "data:".
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::getSupportedTypes): Change type of argument to
a HashSet with ASCIICaseInsensitiveHash.
* platform/graphics/MediaPlayer.h: Ditto.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::staticMIMETypeList):
Changed type of HashSet to use ASCIICaseInsensitiveHash.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h: Ditto.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::avfMIMETypes):
Changed type of HashSet to use ASCIICaseInsensitiveHash.
(WebCore::MediaPlayerPrivateAVFoundationCF::getSupportedTypes): Ditto.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h: Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
Changed type of HashSet to use ASCIICaseInsensitiveHash.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithImageGenerator): Removed
an unnecessary line of code to set a local variable to 0 just before it falls
out of scope.
(WebCore::avfMIMETypes): Ditto. Also tightened up the code a bit.
(WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
Changed type of HashSet to use ASCIICaseInsensitiveHash.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::mimeTypeCache): Ditto.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h: Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes): Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::mimeTypeCache): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes): Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Ditto.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h: Ditto.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::shouldRejectMIMEType): Made this non-case-sensitive by using startsWith
and the "false" argument. Later change this to startsWithIgnoringASCIICase or
startsWithLettersIgnoringASCIICase.
(WebCore::addFileTypesToCache): Use ASCIICaseInsensitiveHash. ALso rewrote to
tighten up the code a bit and use modern Objective-C for loops.
(WebCore::mimeCommonTypesCache): Use ASCIICaseInsensitiveHash.
(WebCore::mimeModernTypesCache): Ditto.
(WebCore::concatenateHashSets): Ditto.
(WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): Ditto.
(WebCore::MediaPlayerPrivateQTKit::disableUnsupportedTracks): Initialied
track type set using lambda, but left it case sensitive.
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
(WebCore::mimeTypeCache): Changed type of HashSet to use ASCIICaseInsensitiveHash.
(WebCore::MediaPlayerPrivateMediaFoundation::getSupportedTypes): Ditto.
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::mimeTypeCache): Ditto.
(WebCore::MockMediaPlayerMediaSource::getSupportedTypes): Ditto.
* platform/mock/mediasource/MockMediaPlayerMediaSource.h: Ditto.
Source/WebKit/mac:
* WebView/WebHTMLRepresentation.mm:
(newArrayWithStrings): Updated to use HashSet<String, ASCIICaseInsensitiveHash>
and also to use a modern for loop.
Source/WTF:
* wtf/text/StringView.h: Added toIntStrict. Not thrilled about the name of this
function, but generally it seems likely to be useful more often than toInt.
And it's needed for one call site in WebCore that was using String::lower.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsYouTubePluginReplacementcpp">trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp">trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaQuerycpp">trunk/Source/WebCore/css/MediaQuery.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryExpcpp">trunk/Source/WebCore/css/MediaQueryExp.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomViewportArgumentscpp">trunk/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#trunkSourceWebCoredomViewportArgumentsh">trunk/Source/WebCore/dom/ViewportArguments.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobcpp">trunk/Source/WebCore/fileapi/Blob.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomsh">trunk/Source/WebCore/html/parser/HTMLParserIdioms.h</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveFactorycpp">trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistryh">trunk/Source/WebCore/platform/MIMETypeRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSchemeRegistrycpp">trunk/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationmm">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WTF/ChangeLog 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-01-31 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Cut down on calls to String::lower; mostly replace with convertToASCIILowercase
+ https://bugs.webkit.org/show_bug.cgi?id=153732
+
+ Reviewed by Dean Jackson.
+
+ * wtf/text/StringView.h: Added toIntStrict. Not thrilled about the name of this
+ function, but generally it seems likely to be useful more often than toInt.
+ And it's needed for one call site in WebCore that was using String::lower.
+
+2016-01-31 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Get rid of most calls to String::upper; mostly replace them with convertToASCIIUppercase
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153715
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WTF/wtf/text/StringView.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> WTF_EXPORT_STRING_API bool endsWithIgnoringASCIICase(const StringView&) const;
</span><span class="cx">
</span><span class="cx"> int toInt(bool& isValid) const;
</span><ins>+ int toIntStrict(bool& isValid) const;
</ins><span class="cx"> float toFloat(bool& isValid) const;
</span><span class="cx">
</span><span class="cx"> static void invalidate(const StringImpl&);
</span><span class="lines">@@ -461,6 +462,13 @@
</span><span class="cx"> return charactersToInt(characters16(), length(), &isValid);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline int StringView::toIntStrict(bool& isValid) const
+{
+ if (is8Bit())
+ return charactersToIntStrict(characters8(), m_length, &isValid);
+ return charactersToIntStrict(characters16(), length(), &isValid);
+}
+
</ins><span class="cx"> inline String StringView::toStringWithoutCopying() const
</span><span class="cx"> {
</span><span class="cx"> if (is8Bit())
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/ChangeLog 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1,3 +1,243 @@
</span><ins>+2016-01-31 Darin Adler <darin@apple.com>
+
+ Cut down on calls to String::lower; mostly replace with convertToASCIILowercase
+ https://bugs.webkit.org/show_bug.cgi?id=153732
+
+ Reviewed by Dean Jackson.
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::isTypeSupported): Added comment about mysterious call
+ to lower(); should probably return here and remove it.
+
+ * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+ (WebCore::initProtocolHandlerWhitelist): Deleted. Moved into isProtocolWhitelisted.
+ (WebCore::isProtocolWhitelisted): Changed set to be ASCIICaseInsensitiveHash and
+ initialized it using a lambda instead of a separate function.
+ (WebCore::verifyProtocolHandlerScheme): Added a FIXME about some case sensitive
+ checking of the protocol prefix here.
+
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ (WebCore::QuickTimePluginReplacement::supportsMimeType): Changed set to be
+ ASCIICaseInsensitiveHash and initialized it using a lambda instead of using
+ an explict check for empty.
+ (WebCore::QuickTimePluginReplacement::supportsFileExtension): Ditto.
+
+ * Modules/plugins/YouTubePluginReplacement.cpp:
+ (WebCore::queryKeysAndValues): Use convertToASCIILowercase. The keys here are
+ going to be all ASCII.
+ (WebCore::isYouTubeURL): Use equalLettersIgnoringASCIICase instead of lowercasing
+ the string.
+ (WebCore::processAndCreateYouTubeURL): Use url.protocolIsInHTTPFamily instead of
+ listing "http" and then "https" explicitly. Use equalLettersIgnoringASCIICase
+ instead of lowercasing a string.
+ (WebCore::YouTubePluginReplacement::youTubeURL): Ditto.
+
+ * Modules/websockets/WebSocketHandshake.cpp:
+ (WebCore::hostName): Use convertToASCIILowercase on host name.
+ (WebCore::WebSocketHandshake::host): Ditto.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetAttributes): Call convertToASCIILowercase instead of lower
+ to lowercase an element's tag name. This is a strange way to do things; typically
+ would be better to use some other function on Element, since tagName goes out of
+ its way to be capitalized, but some ATK expert can improve this later.
+
+ * css/CSSGrammar.y.in: Use the new convertToASCIILowercaseInPlace function rather
+ than the old lower function. We only need to lowercase the ASCII letters, and it's
+ also better to have the function have a clearer name.
+
+ * css/CSSParser.cpp:
+ (WebCore::convertToASCIILowercaseInPlace): Renamed from makeLower and made it deal
+ with only ASCII lowercasing.
+ (WebCore::CSSParserString::convertToASCIILowercaseInPlace): Renamed from lower.
+ (WebCore::isUniversalKeyword): Added. Helper for the function below that uses
+ equalLettersIgnoringASCIICase rather than lowercasing the string.
+ (WebCore::parseKeywordValue): Use isUniversalKeyword. Also clarified a comment.
+ (WebCore::CSSParser::parseAttr): Use convertToASCIILowercaseInPlace and delay
+ String creation until later in the function, using CSSParserString operations more.
+
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::parsePseudoElementSelector): Use
+ convertToASCIILowercaseInPlace by its new name, with its new behavior.
+
+ * css/CSSParserValues.h: Tweaked comment and formatting a bit. Replaced the lower
+ function with the convertToASCIILowercaseInPlace function.
+
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::RareData::parseNth): Rewrote this to avoid the need to
+ make a lowercased copy of m_argument. Use equalLettersIgnoringASCIICase, and two
+ calls to find. Also use String::toIntStrict so we don't have to create String
+ objects for substrings.
+
+ * css/MediaQuery.cpp:
+ (WebCore::MediaQuery::MediaQuery): Use convertToASCIILowercase for media type name.
+ * css/MediaQueryExp.cpp:
+ (WebCore::MediaQueryExp::serialize): Use convertToASCIILowercase for media feature name.
+
+ * dom/Document.cpp:
+ (WebCore::isSeparator): Tweaked formatting and removed non-helpful comment.
+ (WebCore::processArguments): Changed this from a static member function to a non-member
+ file internal function. Use a std::function instead of a function pointer with a void*
+ pointer. Rewrote algorithm to simplify it and use StringView instead of String for the
+ keys and values.
+ (WebCore::Document::processViewport): Use a lambda instead of a function pointer to
+ call setViewportFeature, so that function's interface is no longer dictated by
+ the exact type of the function pointer argument to processArguments.
+ (WebCore::Document::processFormatDetection): Use a lambda instead of the
+ setParserFeature function above; use equalLettersIgnoringASCIICase for both the
+ key and the value, since processArguments no longer lowercases the string.
+ (WebCore::Document::processArguments): Deleted.
+
+ * dom/Document.h: Removed unnecessary declaration of processArguments and
+ ArgumentsCallback. Both are now private to the cpp file.
+
+ * dom/Element.cpp:
+ (WebCore::makeIdForStyleResolution): Use convertToASCIILowercase. When in quirks mode,
+ we want to match IDs in an ASCII case-insensitive way not match compatibility caseless.
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::isScriptTypeSupported): Remove the use of lower here since
+ the MIME type registry is now itself ASCII case-insensitive.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::numericPrefix): Changed to use StringView and take a Document&, rearranged
+ argument order so Document& comes first.
+ (WebCore::findSizeValue): Ditto.
+ (WebCore::findScaleValue): Ditto.
+ (WebCore::findBooleanValue): Ditto. Also use std::abs instead of fabs, possibly
+ avoiding a conversion from float to double (not sure it was happening before but it's
+ definitely not happening now).
+ (WebCore::setViewportFeature): Changed to put arguments in a more logical order, to take
+ the ViewportArguments as a reference, not a void*, and to use StringView to avoid forcing
+ the caller to allocate strings. Also changed to use equalLettersIgnoringASCIICase so we
+ don't rely on the caller to make the key lowercase for us.
+ (WebCore::reportViewportWarning): Changed argument types. Added a couple comments about
+ mistakes in the function.
+
+ * dom/ViewportArguments.h: Removed unnecessary declaration of reportViewportWarning,
+ which is now private to the cpp file. Updated for new arguments to setViewportFeature.
+
+ * editing/EditorCommand.cpp:
+ (WebCore::executeFormatBlock): Use convertToASCIILowercase on the argument, which is
+ specifying a tag name.
+
+ * fileapi/Blob.cpp:
+ (WebCore::Blob::isValidContentType): Removed unnecessary separate loops for
+ 8-bit and 16-bit strings. Content types are short strings and this small optimization is
+ not worth the additional code complexity.
+ (WebCore::Blob::normalizedContentType): Use convertToASCIILowercase since valid
+ content types are guaranteed to be all ASCII.
+ (WebCore::Blob::isNormalizedContentType): Removed unnecessary separate loops for
+ 8-bit and 16-bit strings. Content types are short strings and this small optimization is
+ not worth the additional code complexity.
+
+ * html/parser/HTMLParserIdioms.cpp: Added now-needed include of QualifiedName.h.
+
+ * html/parser/HTMLParserIdioms.h: Removed unneeded include of QualifiedName.h and
+ WTFString.h. Made sure every function is declared first, even if it's also defined
+ later in the header in the section for functions templates and inline functions.
+
+ * loader/archive/ArchiveFactory.cpp:
+ (WebCore::ArchiveFactory::registerKnownArchiveMIMETypes): Use auto& for the type of
+ the set of MIME types here, since it's now using ASCIICaseInsensitiveHash.
+
+ * platform/MIMETypeRegistry.cpp: Changed the MIME type sets to use
+ ASCIICaseInsensitiveHash since MIME type are not case sensitive.
+ (WebCore::initializeSupportedImageMIMETypes): Use a modern for loop.
+ (WebCore::initializeSupportedImageMIMETypesForEncoding): Updated for HashSet type change.
+ (WebCore::initializePDFMIMETypes): Use a modern for loop.
+ (WebCore::initializeSupportedNonImageMimeTypes): Use a modern for loop.
+ (WebCore::initializeSupportedMediaMIMETypes): Updated for HashSet type change.
+ (WebCore::initializeUnsupportedTextMIMETypes): Use a modern for loop.
+ (WebCore::initializeMIMETypeRegistry): Updated for HashSet type change.
+ (WebCore::MIMETypeRegistry::getSupportedImageMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getSupportedImageResourceMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getSupportedImageMIMETypesForEncoding): Ditto.
+ (WebCore::MIMETypeRegistry::getSupportedNonImageMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getSupportedMediaMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getPDFMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getPDFAndPostScriptMIMETypes): Ditto.
+ (WebCore::MIMETypeRegistry::getUnsupportedTextMIMETypes): Ditto.
+ (WebCore::mimeTypeAssociationMap): Use ASCIICaseInsensitiveHash.
+ (WebCore::MIMETypeRegistry::getNormalizedMIMEType): Use auto to make code tighter.
+
+ * platform/MIMETypeRegistry.h: Changed return types of the getMIMETypes functions
+ to use ASCIICaseInsensitiveHash.
+
+ * platform/SchemeRegistry.cpp:
+ (WebCore::schemesForbiddenFromDomainRelaxation): Changed type to
+ use ASCIICaseInsensitiveHash.
+
+ * platform/URL.cpp:
+ (WebCore::mimeTypeFromDataURL): Use convertToASCIILowercase instead of lower.
+ Also removed some dead code that tried to handle the case where the data URL
+ has a comma as one of the first 5 characters: That can't happen since it's a
+ precondition of this function that the first five characters are "data:".
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::getSupportedTypes): Change type of argument to
+ a HashSet with ASCIICaseInsensitiveHash.
+ * platform/graphics/MediaPlayer.h: Ditto.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::staticMIMETypeList):
+ Changed type of HashSet to use ASCIICaseInsensitiveHash.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h: Ditto.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::avfMIMETypes):
+ Changed type of HashSet to use ASCIICaseInsensitiveHash.
+ (WebCore::MediaPlayerPrivateAVFoundationCF::getSupportedTypes): Ditto.
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h: Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ Changed type of HashSet to use ASCIICaseInsensitiveHash.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithImageGenerator): Removed
+ an unnecessary line of code to set a local variable to 0 just before it falls
+ out of scope.
+ (WebCore::avfMIMETypes): Ditto. Also tightened up the code a bit.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ Changed type of HashSet to use ASCIICaseInsensitiveHash.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::mimeTypeCache): Ditto.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes): Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h: Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes): Ditto.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::mimeTypeCache): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes): Ditto.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Ditto.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h: Ditto.
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::shouldRejectMIMEType): Made this non-case-sensitive by using startsWith
+ and the "false" argument. Later change this to startsWithIgnoringASCIICase or
+ startsWithLettersIgnoringASCIICase.
+ (WebCore::addFileTypesToCache): Use ASCIICaseInsensitiveHash. ALso rewrote to
+ tighten up the code a bit and use modern Objective-C for loops.
+ (WebCore::mimeCommonTypesCache): Use ASCIICaseInsensitiveHash.
+ (WebCore::mimeModernTypesCache): Ditto.
+ (WebCore::concatenateHashSets): Ditto.
+ (WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): Ditto.
+ (WebCore::MediaPlayerPrivateQTKit::disableUnsupportedTracks): Initialied
+ track type set using lambda, but left it case sensitive.
+
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+ (WebCore::mimeTypeCache): Changed type of HashSet to use ASCIICaseInsensitiveHash.
+ (WebCore::MediaPlayerPrivateMediaFoundation::getSupportedTypes): Ditto.
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+ (WebCore::mimeTypeCache): Ditto.
+ (WebCore::MockMediaPlayerMediaSource::getSupportedTypes): Ditto.
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.h: Ditto.
+
</ins><span class="cx"> 2016-01-31 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Add "WebKit built-in PDF" Plugin to set of publicly visible plugins
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -732,6 +732,7 @@
</span><span class="cx"> if (type.isNull() || type.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // FIXME: Why do we convert to lowercase here, but not in MediaSource::addSourceBuffer?
</ins><span class="cx"> ContentType contentType(type.lower());
</span><span class="cx"> String codecs = contentType.parameter("codecs");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -39,15 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static HashSet<String>* protocolWhitelist;
-
-static void initProtocolHandlerWhitelist()
-{
- protocolWhitelist = new HashSet<String>;
- for (auto* protocol : { "bitcoin", "geo", "im", "irc", "ircs", "magnet", "mailto", "mms", "news", "nntp", "sip", "sms", "smsto", "ssh", "tel", "urn", "webcal", "wtai", "xmpp" })
- protocolWhitelist->add(protocol);
-}
-
</del><span class="cx"> static bool verifyCustomHandlerURL(const URL& baseURL, const String& url, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> // The specification requires that it is a SYNTAX_ERR if the "%s" token is
</span><span class="lines">@@ -74,11 +65,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isProtocolWhitelisted(const String& scheme)
</del><ins>+static inline bool isProtocolWhitelisted(const String& scheme)
</ins><span class="cx"> {
</span><del>- if (!protocolWhitelist)
- initProtocolHandlerWhitelist();
- return protocolWhitelist->contains(scheme.convertToASCIILowercase());
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> protocolWhitelist = []() {
+ HashSet<String, ASCIICaseInsensitiveHash> set;
+ for (auto* protocol : { "bitcoin", "geo", "im", "irc", "ircs", "magnet", "mailto", "mms", "news", "nntp", "sip", "sms", "smsto", "ssh", "tel", "urn", "webcal", "wtai", "xmpp" })
+ set.add(protocol);
+ return set;
+ }();
+ return protocolWhitelist.get().contains(scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionCode& ec)
</span><span class="lines">@@ -86,6 +81,7 @@
</span><span class="cx"> if (isProtocolWhitelisted(scheme))
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ // FIXME: Should this be case sensitive, or should it be ASCII case-insensitive?
</ins><span class="cx"> if (scheme.startsWith("web+")) {
</span><span class="cx"> // The specification requires that the length of scheme is at least five characters (including 'web+' prefix).
</span><span class="cx"> if (scheme.length() >= 5 && isValidProtocol(scheme))
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -82,36 +82,36 @@
</span><span class="cx">
</span><span class="cx"> bool QuickTimePluginReplacement::supportsMimeType(const String& mimeType)
</span><span class="cx"> {
</span><del>- static const char* types[] = {
- "application/vnd.apple.mpegurl", "application/x-mpegurl", "audio/3gpp", "audio/3gpp2", "audio/aac", "audio/aiff",
- "audio/amr", "audio/basic", "audio/mp3", "audio/mp4", "audio/mpeg", "audio/mpeg3", "audio/mpegurl", "audio/scpls",
- "audio/wav", "audio/x-aac", "audio/x-aiff", "audio/x-caf", "audio/x-m4a", "audio/x-m4b", "audio/x-m4p",
- "audio/x-m4r", "audio/x-mp3", "audio/x-mpeg", "audio/x-mpeg3", "audio/x-mpegurl", "audio/x-scpls", "audio/x-wav",
- "video/3gpp", "video/3gpp2", "video/mp4", "video/quicktime", "video/x-m4v"
- };
- static NeverDestroyed<HashSet<String>> typeHash;
- if (!typeHash.get().size()) {
- for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i)
- typeHash.get().add(types[i]);
- }
-
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> typeHash = []() {
+ static const char* const types[] = {
+ "application/vnd.apple.mpegurl", "application/x-mpegurl", "audio/3gpp", "audio/3gpp2", "audio/aac", "audio/aiff",
+ "audio/amr", "audio/basic", "audio/mp3", "audio/mp4", "audio/mpeg", "audio/mpeg3", "audio/mpegurl", "audio/scpls",
+ "audio/wav", "audio/x-aac", "audio/x-aiff", "audio/x-caf", "audio/x-m4a", "audio/x-m4b", "audio/x-m4p",
+ "audio/x-m4r", "audio/x-mp3", "audio/x-mpeg", "audio/x-mpeg3", "audio/x-mpegurl", "audio/x-scpls", "audio/x-wav",
+ "video/3gpp", "video/3gpp2", "video/mp4", "video/quicktime", "video/x-m4v"
+ };
+ HashSet<String, ASCIICaseInsensitiveHash> set;
+ for (auto& type : types)
+ set.add(type);
+ return set;
+ }();
</ins><span class="cx"> return typeHash.get().contains(mimeType);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool QuickTimePluginReplacement::supportsFileExtension(const String& extension)
</span><span class="cx"> {
</span><del>- static const char* extensions[] = {
- "3g2", "3gp", "3gp2", "3gpp", "aac", "adts", "aif", "aifc", "aiff", "AMR", "au", "bwf", "caf", "cdda", "m3u",
- "m3u8", "m4a", "m4b", "m4p", "m4r", "m4v", "mov", "mp3", "mp3", "mp4", "mpeg", "mpg", "mqv", "pls", "qt",
- "snd", "swa", "ts", "ulw", "wav"
- };
- static NeverDestroyed<HashSet<String>> extensionHash;
- if (!extensionHash.get().size()) {
- for (size_t i = 0; i < WTF_ARRAY_LENGTH(extensions); ++i)
- extensionHash.get().add(extensions[i]);
- }
-
- return extensionHash.get().contains(extension);
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> extensionSet = []() {
+ static const char* const extensions[] = {
+ "3g2", "3gp", "3gp2", "3gpp", "aac", "adts", "aif", "aifc", "aiff", "AMR", "au", "bwf", "caf", "cdda", "m3u",
+ "m3u8", "m4a", "m4b", "m4p", "m4r", "m4v", "mov", "mp3", "mp3", "mp4", "mpeg", "mpg", "mqv", "pls", "qt",
+ "snd", "swa", "ts", "ulw", "wav"
+ };
+ HashSet<String, ASCIICaseInsensitiveHash> set;
+ for (auto& extension : extensions)
+ set.add(extension);
+ return set;
+ }();
+ return extensionSet.get().contains(extension);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> QuickTimePluginReplacement::QuickTimePluginReplacement(HTMLPlugInElement& plugin, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsYouTubePluginReplacementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> // Save the key and the value.
</span><span class="cx"> if (keyLength && valueLength) {
</span><del>- const String& key = queryString.substring(keyLocation, keyLength).lower();
</del><ins>+ String key = queryString.substring(keyLocation, keyLength).convertToASCIILowercase();
</ins><span class="cx"> String value = queryString.substring(valueLocation, valueLength);
</span><span class="cx"> value.replace('+', ' ');
</span><span class="cx">
</span><span class="lines">@@ -181,14 +181,13 @@
</span><span class="cx">
</span><span class="cx"> static bool isYouTubeURL(const URL& url)
</span><span class="cx"> {
</span><del>- const String& hostName = url.host().lower();
-
- return hostName == "m.youtube.com"
- || hostName == "youtu.be"
- || hostName == "www.youtube.com"
- || hostName == "youtube.com"
- || hostName == "www.youtube-nocookie.com"
- || hostName == "youtube-nocookie.com";
</del><ins>+ String hostName = url.host();
+ return equalLettersIgnoringASCIICase(hostName, "m.youtube.com")
+ || equalLettersIgnoringASCIICase(hostName, "youtu.be")
+ || equalLettersIgnoringASCIICase(hostName, "www.youtube.com")
+ || equalLettersIgnoringASCIICase(hostName, "youtube.com")
+ || equalLettersIgnoringASCIICase(hostName, "www.youtube-nocookie.com")
+ || equalLettersIgnoringASCIICase(hostName, "youtube-nocookie.com");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const String& valueForKey(const YouTubePluginReplacement::KeyValueMap& dictionary, const String& key)
</span><span class="lines">@@ -202,24 +201,22 @@
</span><span class="cx">
</span><span class="cx"> static URL processAndCreateYouTubeURL(const URL& url, bool& isYouTubeShortenedURL)
</span><span class="cx"> {
</span><del>- if (!url.protocolIs("http") && !url.protocolIs("https"))
</del><ins>+ if (!url.protocolIsInHTTPFamily())
</ins><span class="cx"> return URL();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Bail out early if we aren't even on www.youtube.com or youtube.com.
</span><span class="cx"> if (!isYouTubeURL(url))
</span><span class="cx"> return URL();
</span><del>-
- const String& hostName = url.host().lower();
-
- bool isYouTubeMobileWebAppURL = hostName == "m.youtube.com";
- isYouTubeShortenedURL = hostName == "youtu.be";
-
</del><ins>+
+ String hostName = url.host();
+ bool isYouTubeMobileWebAppURL = equalLettersIgnoringASCIICase(hostName, "m.youtube.com");
+ isYouTubeShortenedURL = equalLettersIgnoringASCIICase(hostName, "youtu.be");
+
</ins><span class="cx"> // Short URL of the form: http://youtu.be/v1d301D
</span><span class="cx"> if (isYouTubeShortenedURL) {
</span><del>- const String& videoID = url.lastPathComponent();
</del><ins>+ String videoID = url.lastPathComponent();
</ins><span class="cx"> if (videoID.isEmpty() || videoID == "/")
</span><span class="cx"> return URL();
</span><del>-
</del><span class="cx"> return createYouTubeURL(videoID, emptyString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,7 +238,7 @@
</span><span class="cx"> fragment = emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (path.lower() == "/watch") {
</del><ins>+ if (equalLettersIgnoringASCIICase(path, "/watch")) {
</ins><span class="cx"> if (!query.isEmpty()) {
</span><span class="cx"> const auto& queryDictionary = queryKeysAndValues(query);
</span><span class="cx"> String videoID = valueForKey(queryDictionary, "v");
</span><span class="lines">@@ -303,8 +300,9 @@
</span><span class="cx">
</span><span class="cx"> // From the original URL, we need to get the part before /path/VideoId.
</span><span class="cx"> locationOfPathBeforeVideoID = srcString.find(srcPath.substring(0, locationOfVideoIDInPath));
</span><del>- } else if (srcPath.lower() == "/watch") {
</del><ins>+ } else if (equalLettersIgnoringASCIICase(srcPath, "/watch")) {
</ins><span class="cx"> // From the original URL, we need to get the part before /watch/#!v=VideoID
</span><ins>+ // FIXME: Shouldn't this be ASCII case-insensitive?
</ins><span class="cx"> locationOfPathBeforeVideoID = srcString.find("/watch");
</span><span class="cx"> } else
</span><span class="cx"> return srcString;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(url.protocolIs("wss") == secure);
</span><span class="cx"> StringBuilder builder;
</span><del>- builder.append(url.host().lower());
</del><ins>+ builder.append(url.host().convertToASCIILowercase());
</ins><span class="cx"> if (url.port() && ((!secure && url.port() != 80) || (secure && url.port() != 443))) {
</span><span class="cx"> builder.append(':');
</span><span class="cx"> builder.appendNumber(url.port());
</span><span class="lines">@@ -143,9 +143,10 @@
</span><span class="cx"> m_url = url.isolatedCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Return type should just be String, not const String.
</ins><span class="cx"> const String WebSocketHandshake::host() const
</span><span class="cx"> {
</span><del>- return m_url.host().lower();
</del><ins>+ return m_url.host().convertToASCIILowercase();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& WebSocketHandshake::clientProtocol() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> if (element) {
</span><span class="cx"> String tagName = element->tagName();
</span><span class="cx"> if (!tagName.isEmpty())
</span><del>- attributeSet = addToAtkAttributeSet(attributeSet, "tag", tagName.lower().utf8().data());
</del><ins>+ attributeSet = addToAtkAttributeSet(attributeSet, "tag", tagName.convertToASCIILowercase().utf8().data());
</ins><span class="cx"> String id = element->getIdAttribute().string();
</span><span class="cx"> if (!id.isEmpty())
</span><span class="cx"> attributeSet = addToAtkAttributeSet(attributeSet, "html-id", id.utf8().data());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx">
</span><span class="cx"> base_media_query_exp: '(' maybe_space IDENT maybe_space maybe_media_value ')' {
</span><span class="cx"> std::unique_ptr<CSSParserValueList> mediaValue($5);
</span><del>- $3.lower();
</del><ins>+ $3.convertToASCIILowercaseInPlace();
</ins><span class="cx"> $$ = new MediaQueryExp($3, mediaValue.get());
</span><span class="cx"> }
</span><span class="cx"> ;
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> }
</span><span class="cx"> |
</span><span class="cx"> maybe_media_restrictor maybe_space IDENT maybe_space maybe_and_media_query_exp_list {
</span><del>- $3.lower();
</del><ins>+ $3.convertToASCIILowercaseInPlace();
</ins><span class="cx"> $$ = new MediaQuery($1, $3, std::unique_ptr<Vector<std::unique_ptr<MediaQueryExp>>>($5));
</span><span class="cx"> }
</span><span class="cx"> ;
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> $$ = new CSSParserSelector;
</span><span class="cx"> $$->setMatch(CSSSelector::Id);
</span><span class="cx"> if (parser->m_context.mode == CSSQuirksMode)
</span><del>- $1.lower();
</del><ins>+ $1.convertToASCIILowercaseInPlace();
</ins><span class="cx"> $$->setValue($1);
</span><span class="cx"> }
</span><span class="cx"> | HEX {
</span><span class="lines">@@ -1244,7 +1244,7 @@
</span><span class="cx"> $$ = new CSSParserSelector;
</span><span class="cx"> $$->setMatch(CSSSelector::Id);
</span><span class="cx"> if (parser->m_context.mode == CSSQuirksMode)
</span><del>- $1.lower();
</del><ins>+ $1.convertToASCIILowercaseInPlace();
</ins><span class="cx"> $$->setValue($1);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> $$ = new CSSParserSelector;
</span><span class="cx"> $$->setMatch(CSSSelector::Class);
</span><span class="cx"> if (parser->m_context.mode == CSSQuirksMode)
</span><del>- $2.lower();
</del><ins>+ $2.convertToASCIILowercaseInPlace();
</ins><span class="cx"> $$->setValue($2);
</span><span class="cx"> }
</span><span class="cx"> ;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -340,34 +340,18 @@
</span><span class="cx"> clearProperties();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename CharacterType>
-ALWAYS_INLINE static void makeLower(const CharacterType* input, CharacterType* output, unsigned length)
</del><ins>+template<typename CharacterType> ALWAYS_INLINE static void convertToASCIILowercaseInPlace(CharacterType* characters, unsigned length)
</ins><span class="cx"> {
</span><del>- // FIXME: If we need Unicode lowercasing here, then we probably want the real kind
- // that can potentially change the length of the string rather than the character
- // by character kind. If we don't need Unicode lowercasing, it would be good to
- // simplify this function.
-
- if (charactersAreAllASCII(input, length)) {
- // Fast case for all-ASCII.
- for (unsigned i = 0; i < length; ++i)
- output[i] = toASCIILower(input[i]);
- } else {
- for (unsigned i = 0; i < length; ++i) {
- ASSERT(u_tolower(input[i]) <= 0xFFFF);
- output[i] = u_tolower(input[i]);
- }
- }
</del><ins>+ for (unsigned i = 0; i < length; ++i)
+ characters[i] = toASCIILower(characters[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParserString::lower()
</del><ins>+void CSSParserString::convertToASCIILowercaseInPlace()
</ins><span class="cx"> {
</span><del>- if (is8Bit()) {
- makeLower(characters8(), characters8(), length());
- return;
- }
-
- makeLower(characters16(), characters16(), length());
</del><ins>+ if (is8Bit())
+ WebCore::convertToASCIILowercaseInPlace(characters8(), length());
+ else
+ WebCore::convertToASCIILowercaseInPlace(characters16(), length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSParser::setupParser(const char* prefix, unsigned prefixLength, StringView string, const char* suffix, unsigned suffixLength)
</span><span class="lines">@@ -1198,17 +1182,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isUniversalKeyword(const String& string)
+{
+ // These keywords can be used for all properties.
+ return equalLettersIgnoringASCIICase(string, "initial")
+ || equalLettersIgnoringASCIICase(string, "inherit")
+ || equalLettersIgnoringASCIICase(string, "unset")
+ || equalLettersIgnoringASCIICase(string, "revert");
+}
+
</ins><span class="cx"> static CSSParser::ParseResult parseKeywordValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext, StyleSheetContents* styleSheetContents)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="cx">
</span><span class="cx"> if (!isKeywordPropertyID(propertyId)) {
</span><del>- // All properties accept the values of "initial" and "inherit".
- String lowerCaseString = string.lower();
- if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset" && lowerCaseString != "revert")
</del><ins>+ if (!isUniversalKeyword(string))
</ins><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx">
</span><del>- // Parse initial/inherit/unset/revert shorthands using the CSSParser.
</del><ins>+ // Don't try to parse initial/inherit/unset/revert shorthands; return an error so the caller will use the full CSS parser.
</ins><span class="cx"> if (shorthandForProperty(propertyId).length())
</span><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx"> }
</span><span class="lines">@@ -4342,17 +4333,19 @@
</span><span class="cx"> if (argument.unit != CSSPrimitiveValue::CSS_IDENT)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- String attrName = argument.string;
</del><ins>+ ASSERT(argument.string.length());
+
</ins><span class="cx"> // CSS allows identifiers with "-" at the start, like "-webkit-mask-image".
</span><span class="cx"> // But HTML attribute names can't have those characters, and we should not
</span><span class="cx"> // even parse them inside attr().
</span><del>- if (attrName[0] == '-')
</del><ins>+ if (argument.string[0] == '-')
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (m_context.isHTMLDocument)
</span><del>- attrName = attrName.lower();
</del><ins>+ argument.string.convertToASCIILowercaseInPlace();
</ins><span class="cx">
</span><del>- return CSSValuePool::singleton().createValue(attrName, CSSPrimitiveValue::CSS_ATTR);
</del><ins>+ // FIXME: Is there some small benefit to creating an AtomicString here instead of a String?
+ return CSSValuePool::singleton().createValue(String(argument.string), CSSPrimitiveValue::CSS_ATTR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> CSSParser::parseBackgroundColor()
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx"> CSSParserSelector* CSSParserSelector::parsePseudoElementSelector(CSSParserString& pseudoTypeString)
</span><span class="cx"> {
</span><del>- pseudoTypeString.lower();
</del><ins>+ pseudoTypeString.convertToASCIILowercaseInPlace();
</ins><span class="cx"> AtomicString name = pseudoTypeString;
</span><span class="cx">
</span><span class="cx"> CSSSelector::PseudoElementType pseudoType = CSSSelector::parsePseudoElementType(name);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -33,9 +33,7 @@
</span><span class="cx"> class CSSValue;
</span><span class="cx"> class QualifiedName;
</span><span class="cx">
</span><del>-// This can't be a StringView for 2 reasons:
-// 1. lower() clobbers the data we point to.
-// 2. We are an element of a union (in CSSParserValue) so we need to have a trivial destructor.
</del><ins>+// This should be a StringView but currently it can't because it's used as an element of a union in CSSParserValue.
</ins><span class="cx"> struct CSSParserString {
</span><span class="cx"> void init(LChar* characters, unsigned length)
</span><span class="cx"> {
</span><span class="lines">@@ -73,13 +71,12 @@
</span><span class="cx"> bool is8Bit() const { return m_is8Bit; }
</span><span class="cx"> LChar* characters8() const { ASSERT(is8Bit()); return m_data.characters8; }
</span><span class="cx"> UChar* characters16() const { ASSERT(!is8Bit()); return m_data.characters16; }
</span><del>- template <typename CharacterType>
- CharacterType* characters() const;
</del><ins>+ template<typename CharacterType> CharacterType* characters() const;
</ins><span class="cx">
</span><span class="cx"> unsigned length() const { return m_length; }
</span><span class="cx"> void setLength(unsigned length) { m_length = length; }
</span><span class="cx">
</span><del>- void lower();
</del><ins>+ void convertToASCIILowercaseInPlace();
</ins><span class="cx">
</span><span class="cx"> UChar operator[](unsigned i) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -805,28 +805,27 @@
</span><span class="cx"> // a helper function for parsing nth-arguments
</span><span class="cx"> bool CSSSelector::RareData::parseNth()
</span><span class="cx"> {
</span><del>- String argument = m_argument.lower();
-
- if (argument.isEmpty())
</del><ins>+ if (m_argument.isEmpty())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_a = 0;
- m_b = 0;
- if (argument == "odd") {
</del><ins>+ if (equalLettersIgnoringASCIICase(m_argument, "odd")) {
</ins><span class="cx"> m_a = 2;
</span><span class="cx"> m_b = 1;
</span><del>- } else if (argument == "even") {
</del><ins>+ } else if (equalLettersIgnoringASCIICase(m_argument, "even")) {
</ins><span class="cx"> m_a = 2;
</span><span class="cx"> m_b = 0;
</span><span class="cx"> } else {
</span><del>- size_t n = argument.find('n');
</del><ins>+ m_a = 0;
+ m_b = 0;
+
+ size_t n = std::min(m_argument.find('n'), m_argument.find('N'));
</ins><span class="cx"> if (n != notFound) {
</span><del>- if (argument[0] == '-') {
</del><ins>+ if (m_argument[0] == '-') {
</ins><span class="cx"> if (n == 1)
</span><span class="cx"> m_a = -1; // -n == -1n
</span><span class="cx"> else {
</span><span class="cx"> bool ok;
</span><del>- m_a = argument.substringSharingImpl(0, n).toIntStrict(&ok);
</del><ins>+ m_a = StringView(m_argument).substring(0, n).toIntStrict(ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -834,29 +833,29 @@
</span><span class="cx"> m_a = 1; // n == 1n
</span><span class="cx"> else {
</span><span class="cx"> bool ok;
</span><del>- m_a = argument.substringSharingImpl(0, n).toIntStrict(&ok);
</del><ins>+ m_a = StringView(m_argument).substring(0, n).toIntStrict(ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- size_t p = argument.find('+', n);
</del><ins>+ size_t p = m_argument.find('+', n);
</ins><span class="cx"> if (p != notFound) {
</span><span class="cx"> bool ok;
</span><del>- m_b = argument.substringSharingImpl(p + 1, argument.length() - p - 1).toIntStrict(&ok);
</del><ins>+ m_b = StringView(m_argument).substring(p + 1).toIntStrict(ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><span class="cx"> } else {
</span><del>- p = argument.find('-', n);
</del><ins>+ p = m_argument.find('-', n);
</ins><span class="cx"> if (p != notFound) {
</span><span class="cx"> bool ok;
</span><del>- m_b = -argument.substringSharingImpl(p + 1, argument.length() - p - 1).toIntStrict(&ok);
</del><ins>+ m_b = -StringView(m_argument).substring(p + 1).toIntStrict(ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> bool ok;
</span><del>- m_b = argument.toIntStrict(&ok);
</del><ins>+ m_b = m_argument.string().toIntStrict(&ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQuery.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQuery.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/MediaQuery.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> MediaQuery::MediaQuery(Restrictor r, const String& mediaType, std::unique_ptr<ExpressionVector> exprs)
</span><span class="cx"> : m_restrictor(r)
</span><del>- , m_mediaType(mediaType.lower())
</del><ins>+ , m_mediaType(mediaType.convertToASCIILowercase())
</ins><span class="cx"> , m_expressions(WTFMove(exprs))
</span><span class="cx"> , m_ignored(false)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryExp.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> result.append('(');
</span><del>- result.append(m_mediaFeature.lower());
</del><ins>+ result.append(m_mediaFeature.convertToASCIILowercase());
</ins><span class="cx"> if (m_value) {
</span><span class="cx"> result.appendLiteral(": ");
</span><span class="cx"> result.append(m_value->cssText());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -3278,59 +3278,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Though isspace() considers \t and \v to be whitespace, Win IE doesn't.
-static bool isSeparator(UChar c)
</del><ins>+static bool isSeparator(UChar character)
</ins><span class="cx"> {
</span><del>- return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '=' || c == ',' || c == '\0';
</del><ins>+ return character == ' ' || character == '\t' || character == '\n' || character == '\r' || character == '=' || character == ',';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::processArguments(const String& features, void* data, ArgumentsCallback callback)
</del><ins>+static void processArguments(StringView features, std::function<void(StringView type, StringView value)> callback)
</ins><span class="cx"> {
</span><del>- // Tread lightly in this code -- it was specifically designed to mimic Win IE's parsing behavior.
- unsigned keyBegin, keyEnd;
- unsigned valueBegin, valueEnd;
-
- String buffer = features.lower();
- unsigned length = buffer.length();
</del><ins>+ unsigned length = features.length();
</ins><span class="cx"> for (unsigned i = 0; i < length; ) {
</span><del>- // skip to first non-separator, but don't skip past the end of the string
- while (isSeparator(buffer[i])) {
- if (i >= length)
- break;
- i++;
- }
- keyBegin = i;
</del><ins>+ // skip to first non-separator
+ while (i < length && isSeparator(features[i]))
+ ++i;
+ unsigned keyBegin = i;
</ins><span class="cx">
</span><span class="cx"> // skip to first separator
</span><del>- while (!isSeparator(buffer[i]))
</del><ins>+ while (i < length && !isSeparator(features[i]))
</ins><span class="cx"> i++;
</span><del>- keyEnd = i;
</del><ins>+ unsigned keyEnd = i;
</ins><span class="cx">
</span><del>- // skip to first '=', but don't skip past a ',' or the end of the string
- while (buffer[i] != '=') {
- if (buffer[i] == ',' || i >= length)
- break;
- i++;
- }
</del><ins>+ // skip to first '=', but don't skip past a ','
+ while (i < length && features[i] != '=' && features[i] != ',')
+ ++i;
</ins><span class="cx">
</span><del>- // skip to first non-separator, but don't skip past a ',' or the end of the string
- while (isSeparator(buffer[i])) {
- if (buffer[i] == ',' || i >= length)
- break;
- i++;
- }
- valueBegin = i;
</del><ins>+ // skip to first non-separator, but don't skip past a ','
+ while (i < length && isSeparator(features[i]) && features[i] != ',')
+ ++i;
+ unsigned valueBegin = i;
</ins><span class="cx">
</span><span class="cx"> // skip to first separator
</span><del>- while (!isSeparator(buffer[i]))
- i++;
- valueEnd = i;
</del><ins>+ while (i < length && !isSeparator(features[i]))
+ ++i;
+ unsigned valueEnd = i;
</ins><span class="cx">
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(i <= length);
-
- String keyString = buffer.substring(keyBegin, keyEnd - keyBegin);
- String valueString = buffer.substring(valueBegin, valueEnd - valueBegin);
- callback(keyString, valueString, this, data);
</del><ins>+ callback(features.substring(keyBegin, keyEnd - keyBegin), features.substring(valueBegin, valueEnd - valueBegin));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3342,8 +3323,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_viewportArguments = ViewportArguments(origin);
</span><del>- processArguments(features, (void*)&m_viewportArguments, setViewportFeature);
</del><span class="cx">
</span><ins>+ processArguments(features, [this](StringView key, StringView value) {
+ setViewportFeature(m_viewportArguments, *this, key, value);
+ });
+
</ins><span class="cx"> updateViewportArguments();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3362,17 +3346,13 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-// FIXME: Find a better place for this functionality.
-void setParserFeature(const String& key, const String& value, Document* document, void*)
-{
- if (key == "telephone" && equalLettersIgnoringASCIICase(value, "no"))
- document->setIsTelephoneNumberParsingAllowed(false);
-}
-
</del><span class="cx"> void Document::processFormatDetection(const String& features)
</span><span class="cx"> {
</span><del>- ASSERT(!features.isNull());
- processArguments(features, nullptr, setParserFeature);
</del><ins>+ // FIXME: Find a better place for this function.
+ processArguments(features, [this](StringView key, StringView value) {
+ if (equalLettersIgnoringASCIICase(key, "telephone") && equalLettersIgnoringASCIICase(value, "no"))
+ setIsTelephoneNumberParsingAllowed(false);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::processWebAppOrientations()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/Document.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1344,9 +1344,6 @@
</span><span class="cx"> void createRenderTree();
</span><span class="cx"> void detachParser();
</span><span class="cx">
</span><del>- typedef void (*ArgumentsCallback)(const String& keyString, const String& valueString, Document*, void* data);
- void processArguments(const String& features, void* data, ArgumentsCallback);
-
</del><span class="cx"> // FontSelectorClient
</span><span class="cx"> virtual void fontsNeedUpdate(FontSelector&) override final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1201,7 +1201,7 @@
</span><span class="cx"> static inline AtomicString makeIdForStyleResolution(const AtomicString& value, bool inQuirksMode)
</span><span class="cx"> {
</span><span class="cx"> if (inQuirksMode)
</span><del>- return value.lower();
</del><ins>+ return value.convertToASCIILowercase();
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -149,17 +149,21 @@
</span><span class="cx"> // FIXME: isLegacySupportedJavaScriptLanguage() is not valid HTML5. It is used here to maintain backwards compatibility with existing layout tests. The specific violations are:
</span><span class="cx"> // - Allowing type=javascript. type= should only support MIME types, such as text/javascript.
</span><span class="cx"> // - Allowing a different set of languages for language= and type=. language= supports Javascript 1.1 and 1.4-1.6, but type= does not.
</span><del>-
</del><span class="cx"> String type = typeAttributeValue();
</span><span class="cx"> String language = languageAttributeValue();
</span><del>- if (type.isEmpty() && language.isEmpty())
- return true; // Assume text/javascript.
</del><span class="cx"> if (type.isEmpty()) {
</span><del>- type = "text/" + language.lower();
- if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type) || isLegacySupportedJavaScriptLanguage(language))
</del><ins>+ if (language.isEmpty())
+ return true; // Assume text/javascript.
+ if (MIMETypeRegistry::isSupportedJavaScriptMIMEType("text/" + language))
</ins><span class="cx"> return true;
</span><del>- } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace().lower()) || (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type)))
</del><ins>+ if (isLegacySupportedJavaScriptLanguage(language))
+ return true;
+ return false;
+ }
+ if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace()))
</ins><span class="cx"> return true;
</span><ins>+ if (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type))
+ return true;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -286,28 +286,30 @@
</span><span class="cx"> result.maximumScale = result.minimumScale = result.initialScale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float numericPrefix(const String& keyString, const String& valueString, Document* document, bool* ok = nullptr)
</del><ins>+static void reportViewportWarning(Document&, ViewportErrorCode, StringView replacement1 = { }, StringView replacement2 = { });
+
+static float numericPrefix(Document& document, StringView key, StringView value, bool* ok = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> size_t parsedLength;
</span><del>- float value;
- if (valueString.is8Bit())
- value = charactersToFloat(valueString.characters8(), valueString.length(), parsedLength);
</del><ins>+ float numericValue;
+ if (value.is8Bit())
+ numericValue = charactersToFloat(value.characters8(), value.length(), parsedLength);
</ins><span class="cx"> else
</span><del>- value = charactersToFloat(valueString.characters16(), valueString.length(), parsedLength);
</del><ins>+ numericValue = charactersToFloat(value.characters16(), value.length(), parsedLength);
</ins><span class="cx"> if (!parsedLength) {
</span><del>- reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
</del><ins>+ reportViewportWarning(document, UnrecognizedViewportArgumentValueError, value, key);
</ins><span class="cx"> if (ok)
</span><span class="cx"> *ok = false;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- if (parsedLength < valueString.length())
- reportViewportWarning(document, TruncatedViewportArgumentValueError, valueString, keyString);
</del><ins>+ if (parsedLength < value.length())
+ reportViewportWarning(document, TruncatedViewportArgumentValueError, value, key);
</ins><span class="cx"> if (ok)
</span><span class="cx"> *ok = true;
</span><del>- return value;
</del><ins>+ return numericValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static float findSizeValue(const String& keyString, const String& valueString, Document* document, bool* valueWasExplicit = nullptr)
</del><ins>+static float findSizeValue(Document& document, StringView key, StringView value, bool* valueWasExplicit = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> // 1) Non-negative number values are translated to px lengths.
</span><span class="cx"> // 2) Negative number values are translated to auto.
</span><span class="lines">@@ -317,13 +319,13 @@
</span><span class="cx"> if (valueWasExplicit)
</span><span class="cx"> *valueWasExplicit = true;
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-width"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-width"))
</ins><span class="cx"> return ViewportArguments::ValueDeviceWidth;
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-height"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-height"))
</ins><span class="cx"> return ViewportArguments::ValueDeviceHeight;
</span><span class="cx">
</span><del>- float sizeValue = numericPrefix(keyString, valueString, document);
</del><ins>+ float sizeValue = numericPrefix(document, key, value);
</ins><span class="cx">
</span><span class="cx"> if (sizeValue < 0) {
</span><span class="cx"> if (valueWasExplicit)
</span><span class="lines">@@ -334,7 +336,7 @@
</span><span class="cx"> return sizeValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float findScaleValue(const String& keyString, const String& valueString, Document* document)
</del><ins>+static float findScaleValue(Document& document, StringView key, StringView value)
</ins><span class="cx"> {
</span><span class="cx"> // 1) Non-negative number values are translated to <number> values.
</span><span class="cx"> // 2) Negative number values are translated to auto.
</span><span class="lines">@@ -342,74 +344,68 @@
</span><span class="cx"> // 4) device-width and device-height are translated to 10.0.
</span><span class="cx"> // 5) no and unknown values are translated to 0.0
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "yes"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "yes"))
</ins><span class="cx"> return 1;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "no"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "no"))
</ins><span class="cx"> return 0;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-width"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-width"))
</ins><span class="cx"> return 10;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-height"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-height"))
</ins><span class="cx"> return 10;
</span><span class="cx">
</span><del>- float value = numericPrefix(keyString, valueString, document);
</del><ins>+ float numericValue = numericPrefix(document, key, value);
</ins><span class="cx">
</span><del>- if (value < 0)
</del><ins>+ if (numericValue < 0)
</ins><span class="cx"> return ViewportArguments::ValueAuto;
</span><span class="cx">
</span><del>- if (value > 10.0)
- reportViewportWarning(document, MaximumScaleTooLargeError, String(), String());
</del><ins>+ if (numericValue > 10.0)
+ reportViewportWarning(document, MaximumScaleTooLargeError);
</ins><span class="cx">
</span><del>- return value;
</del><ins>+ return numericValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static float findBooleanValue(const String& keyString, const String& valueString, Document* document)
</del><ins>+// FIXME: It's kind of bizarre to use floating point values of 1 and 0 to represent true and false.
+static float findBooleanValue(Document& document, StringView key, StringView value)
</ins><span class="cx"> {
</span><span class="cx"> // yes and no are used as keywords.
</span><span class="cx"> // Numbers >= 1, numbers <= -1, device-width and device-height are mapped to yes.
</span><span class="cx"> // Numbers in the range <-1, 1>, and unknown values, are mapped to no.
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "yes"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "yes"))
</ins><span class="cx"> return 1;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "no"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "no"))
</ins><span class="cx"> return 0;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-width"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-width"))
</ins><span class="cx"> return 1;
</span><del>- if (equalLettersIgnoringASCIICase(valueString, "device-height"))
</del><ins>+ if (equalLettersIgnoringASCIICase(value, "device-height"))
</ins><span class="cx"> return 1;
</span><del>-
- float value = numericPrefix(keyString, valueString, document);
-
- if (fabs(value) < 1)
- return 0;
-
- return 1;
</del><ins>+ return std::abs(numericPrefix(document, key, value)) >= 1 ? 1 : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void setViewportFeature(const String& keyString, const String& valueString, Document* document, void* data)
</del><ins>+void setViewportFeature(ViewportArguments& arguments, Document& document, StringView key, StringView value)
</ins><span class="cx"> {
</span><del>- ViewportArguments* arguments = static_cast<ViewportArguments*>(data);
-
- if (keyString == "width")
- arguments->width = findSizeValue(keyString, valueString, document, &arguments->widthWasExplicit);
- else if (keyString == "height")
- arguments->height = findSizeValue(keyString, valueString, document);
- else if (keyString == "initial-scale")
- arguments->zoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "minimum-scale")
- arguments->minZoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "maximum-scale")
- arguments->maxZoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "user-scalable")
- arguments->userZoom = findBooleanValue(keyString, valueString, document);
</del><ins>+ if (equalLettersIgnoringASCIICase(key, "width"))
+ arguments.width = findSizeValue(document, key, value, &arguments.widthWasExplicit);
+ else if (equalLettersIgnoringASCIICase(key, "height"))
+ arguments.height = findSizeValue(document, key, value);
+ else if (equalLettersIgnoringASCIICase(key, "initial-scale"))
+ arguments.zoom = findScaleValue(document, key, value);
+ else if (equalLettersIgnoringASCIICase(key, "minimum-scale"))
+ arguments.minZoom = findScaleValue(document, key, value);
+ else if (equalLettersIgnoringASCIICase(key, "maximum-scale"))
+ arguments.maxZoom = findScaleValue(document, key, value);
+ else if (equalLettersIgnoringASCIICase(key, "user-scalable"))
+ arguments.userZoom = findBooleanValue(document, key, value);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- else if (keyString == "minimal-ui")
- // FIXME: Ignore silently for now. This should eventually fall back to the warning.
- { }
</del><ins>+ else if (equalLettersIgnoringASCIICase(key, "minimal-ui")) {
+ // FIXME: Ignore silently for now. This code should eventually be removed
+ // so we start giving the warning in the web inspector as for other unimplemented keys.
+ }
</ins><span class="cx"> #endif
</span><del>- else if (keyString == "shrink-to-fit")
- arguments->shrinkToFit = findBooleanValue(keyString, valueString, document);
</del><ins>+ else if (equalLettersIgnoringASCIICase(key, "shrink-to-fit"))
+ arguments.shrinkToFit = findBooleanValue(document, key, value);
</ins><span class="cx"> else
</span><del>- reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
</del><ins>+ reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const char* viewportErrorMessageTemplate(ViewportErrorCode errorCode)
</span><span class="lines">@@ -439,23 +435,24 @@
</span><span class="cx"> return MessageLevel::Error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void reportViewportWarning(Document* document, ViewportErrorCode errorCode, const String& replacement1, const String& replacement2)
</del><ins>+void reportViewportWarning(Document& document, ViewportErrorCode errorCode, StringView replacement1, StringView replacement2)
</ins><span class="cx"> {
</span><del>- Frame* frame = document->frame();
- if (!frame)
</del><ins>+ // FIXME: Why is this null check needed? Can't addConsoleMessage deal with this?
+ if (!document.frame())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String message = viewportErrorMessageTemplate(errorCode);
</span><span class="cx"> if (!replacement1.isNull())
</span><del>- message.replace("%replacement1", replacement1);
</del><ins>+ message.replace("%replacement1", replacement1.toStringWithoutCopying());
+ // FIXME: This will do the wrong thing if replacement1 contains the substring "%replacement2".
</ins><span class="cx"> if (!replacement2.isNull())
</span><del>- message.replace("%replacement2", replacement2);
</del><ins>+ message.replace("%replacement2", replacement2.toStringWithoutCopying());
</ins><span class="cx">
</span><del>- if ((errorCode == UnrecognizedViewportArgumentValueError || errorCode == TruncatedViewportArgumentValueError) && replacement1.find(';') != WTF::notFound)
</del><ins>+ if ((errorCode == UnrecognizedViewportArgumentValueError || errorCode == TruncatedViewportArgumentValueError) && replacement1.contains(';'))
</ins><span class="cx"> message.append(" Note that ';' is not a separator in viewport values. The list should be comma-separated.");
</span><span class="cx">
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><del>- document->addConsoleMessage(MessageSource::Rendering, viewportErrorMessageLevel(errorCode), message);
</del><ins>+ document.addConsoleMessage(MessageSource::Rendering, viewportErrorMessageLevel(errorCode), message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextStream& operator<<(TextStream& ts, const ViewportArguments& viewportArguments)
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -134,8 +134,7 @@
</span><span class="cx"> WEBCORE_EXPORT void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
</span><span class="cx"> float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);
</span><span class="cx">
</span><del>-void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
-void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
</del><ins>+void setViewportFeature(ViewportArguments&, Document&, StringView key, StringView value);
</ins><span class="cx">
</span><span class="cx"> TextStream& operator<<(TextStream&, const ViewportArguments&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeFormatBlock(Frame& frame, Event*, EditorCommandSource, const String& value)
</span><span class="cx"> {
</span><del>- String tagName = value.lower();
</del><ins>+ String tagName = value.convertToASCIILowercase();
</ins><span class="cx"> if (tagName[0] == '<' && tagName[tagName.length() - 1] == '>')
</span><span class="cx"> tagName = tagName.substring(1, tagName.length() - 2);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Blob::Blob(DeserializationContructor, const URL& srcURL, const String& type, long long size)
</span><del>- : m_type(Blob::normalizedContentType(type))
</del><ins>+ : m_type(normalizedContentType(type))
</ins><span class="cx"> , m_size(size)
</span><span class="cx"> {
</span><span class="cx"> m_internalURL = BlobURL::createInternalURL();
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Blob::Blob(const URL& srcURL, long long start, long long end, const String& type)
</span><del>- : m_type(Blob::normalizedContentType(type))
</del><ins>+ : m_type(normalizedContentType(type))
</ins><span class="cx"> , m_size(-1) // size is not necessarily equal to end - start.
</span><span class="cx"> {
</span><span class="cx"> m_internalURL = BlobURL::createInternalURL();
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> // FIXME: JavaScript cannot represent sizes as large as unsigned long long, we need to
</span><span class="cx"> // come up with an exception to throw if file size is not representable.
</span><span class="cx"> unsigned long long actualSize = ThreadableBlobRegistry::blobSize(m_internalURL);
</span><del>- m_size = (WTF::isInBounds<long long>(actualSize)) ? static_cast<long long>(actualSize) : 0;
</del><ins>+ m_size = WTF::isInBounds<long long>(actualSize) ? static_cast<long long>(actualSize) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return static_cast<unsigned long long>(m_size);
</span><span class="lines">@@ -130,61 +130,38 @@
</span><span class="cx">
</span><span class="cx"> bool Blob::isValidContentType(const String& contentType)
</span><span class="cx"> {
</span><del>- if (contentType.isNull())
- return true;
-
- size_t length = contentType.length();
- if (contentType.is8Bit()) {
- const LChar* characters = contentType.characters8();
- for (size_t i = 0; i < length; ++i) {
- if (characters[i] < 0x20 || characters[i] > 0x7e)
- return false;
- }
- } else {
- const UChar* characters = contentType.characters16();
- for (size_t i = 0; i < length; ++i) {
- if (characters[i] < 0x20 || characters[i] > 0x7e)
- return false;
- }
</del><ins>+ // FIXME: Do we really want to treat the empty string and null string as valid content types?
+ unsigned length = contentType.length();
+ for (unsigned i = 0; i < length; ++i) {
+ if (contentType[i] < 0x20 || contentType[i] > 0x7e)
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Blob::normalizedContentType(const String& contentType)
</span><span class="cx"> {
</span><del>- if (Blob::isValidContentType(contentType))
- return contentType.lower();
- return emptyString();
</del><ins>+ if (!isValidContentType(contentType))
+ return emptyString();
+ return contentType.convertToASCIILowercase();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Blob::isNormalizedContentType(const String& contentType)
</span><span class="cx"> {
</span><del>- if (contentType.isNull())
- return true;
-
- size_t length = contentType.length();
- if (contentType.is8Bit()) {
- const LChar* characters = contentType.characters8();
- for (size_t i = 0; i < length; ++i) {
- if (characters[i] < 0x20 || characters[i] > 0x7e)
- return false;
- if (isASCIIUpper(characters[i]))
- return false;
- }
- } else {
- const UChar* characters = contentType.characters16();
- for (size_t i = 0; i < length; ++i) {
- if (characters[i] < 0x20 || characters[i] > 0x7e)
- return false;
- if (isASCIIUpper(characters[i]))
- return false;
- }
</del><ins>+ // FIXME: Do we really want to treat the empty string and null string as valid content types?
+ unsigned length = contentType.length();
+ for (size_t i = 0; i < length; ++i) {
+ if (contentType[i] < 0x20 || contentType[i] > 0x7e)
+ return false;
+ if (isASCIIUpper(contentType[i]))
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Blob::isNormalizedContentType(const CString& contentType)
</span><span class="cx"> {
</span><ins>+ // FIXME: Do we really want to treat the empty string and null string as valid content types?
</ins><span class="cx"> size_t length = contentType.length();
</span><span class="cx"> const char* characters = contentType.data();
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx">
</span><span class="cx"> #include "Decimal.h"
</span><ins>+#include "QualifiedName.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/text/AtomicString.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -25,18 +25,21 @@
</span><span class="cx"> #ifndef HTMLParserIdioms_h
</span><span class="cx"> #define HTMLParserIdioms_h
</span><span class="cx">
</span><del>-#include "QualifiedName.h"
</del><ins>+#include <unicode/uchar.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Decimal;
</span><ins>+class QualifiedName;
</ins><span class="cx">
</span><span class="cx"> // Space characters as defined by the HTML specification.
</span><ins>+template<typename CharacterType> bool isHTMLSpace(CharacterType);
+template<typename CharacterType> bool isComma(CharacterType);
+template<typename CharacterType> bool isHTMLSpaceOrComma(CharacterType);
</ins><span class="cx"> bool isHTMLLineBreak(UChar);
</span><span class="cx"> bool isNotHTMLSpace(UChar);
</span><del>-bool isHTMLSpaceButNotLineBreak(UChar character);
</del><ins>+bool isHTMLSpaceButNotLineBreak(UChar);
</ins><span class="cx">
</span><span class="cx"> // Strip leading and trailing whitespace as defined by the HTML specification.
</span><span class="cx"> WEBCORE_EXPORT String stripLeadingAndTrailingHTMLSpaces(const String&);
</span><span class="lines">@@ -59,9 +62,11 @@
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#rules-for-parsing-non-negative-integers
</span><span class="cx"> bool parseHTMLNonNegativeInteger(const String&, unsigned int&);
</span><span class="cx">
</span><ins>+bool threadSafeMatch(const QualifiedName&, const QualifiedName&);
+
</ins><span class="cx"> // Inline implementations of some of the functions declared above.
</span><del>-template<typename CharType>
-inline bool isHTMLSpace(CharType character)
</del><ins>+
+template<typename CharacterType> inline bool isHTMLSpace(CharacterType character)
</ins><span class="cx"> {
</span><span class="cx"> // Histogram from Apple's page load test combined with some ad hoc browsing some other test suites.
</span><span class="cx"> //
</span><span class="lines">@@ -81,16 +86,14 @@
</span><span class="cx"> return character <= '\r' && (character == '\n' || character == '\r');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename CharType>
-inline bool isComma(CharType character)
</del><ins>+template<typename CharacterType> inline bool isComma(CharacterType character)
</ins><span class="cx"> {
</span><span class="cx"> return character == ',';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename CharType>
-inline bool isHTMLSpaceOrComma(CharType character)
</del><ins>+template<typename CharacterType> inline bool isHTMLSpaceOrComma(CharacterType character)
</ins><span class="cx"> {
</span><del>- return isComma(character) || isHTMLSpace<CharType>(character);
</del><ins>+ return isComma(character) || isHTMLSpace(character);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool isNotHTMLSpace(UChar character)
</span><span class="lines">@@ -103,8 +106,6 @@
</span><span class="cx"> return isHTMLSpace(character) && !isHTMLLineBreak(character);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool threadSafeMatch(const QualifiedName&, const QualifiedName&);
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -91,9 +91,8 @@
</span><span class="cx">
</span><span class="cx"> void ArchiveFactory::registerKnownArchiveMIMETypes()
</span><span class="cx"> {
</span><del>- HashSet<String>& mimeTypes = MIMETypeRegistry::getSupportedNonImageMIMETypes();
-
- for (const auto& mimeType : archiveMIMETypes().keys())
</del><ins>+ auto& mimeTypes = MIMETypeRegistry::getSupportedNonImageMIMETypes();
+ for (auto& mimeType : archiveMIMETypes().keys())
</ins><span class="cx"> mimeTypes.add(mimeType);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -140,15 +140,15 @@
</span><span class="cx"> { "audio/x-wav", "wav" }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static HashSet<String>* supportedImageResourceMIMETypes;
-static HashSet<String>* supportedImageMIMETypes;
-static HashSet<String>* supportedImageMIMETypesForEncoding;
-static HashSet<String>* supportedJavaScriptMIMETypes;
-static HashSet<String>* supportedNonImageMIMETypes;
-static HashSet<String>* supportedMediaMIMETypes;
-static HashSet<String>* pdfMIMETypes;
-static HashSet<String>* pdfAndPostScriptMIMETypes;
-static HashSet<String>* unsupportedTextMIMETypes;
</del><ins>+static HashSet<String, ASCIICaseInsensitiveHash>* supportedImageResourceMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* supportedImageMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* supportedImageMIMETypesForEncoding;
+static HashSet<String, ASCIICaseInsensitiveHash>* supportedJavaScriptMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* supportedNonImageMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* supportedMediaMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* pdfMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* pdfAndPostScriptMIMETypes;
+static HashSet<String, ASCIICaseInsensitiveHash>* unsupportedTextMIMETypes;
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<String, Vector<String>*, ASCIICaseInsensitiveHash> MediaMIMETypeMap;
</span><span class="cx">
</span><span class="lines">@@ -210,9 +210,9 @@
</span><span class="cx"> "image/x-bmp", "image/x-win-bitmap", "image/x-windows-bmp", "image/ms-bmp", "image/x-ms-bmp",
</span><span class="cx"> "application/bmp", "application/x-bmp", "application/x-win-bitmap",
</span><span class="cx"> };
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(malformedMIMETypes); ++i) {
- supportedImageMIMETypes->add(malformedMIMETypes[i]);
- supportedImageResourceMIMETypes->add(malformedMIMETypes[i]);
</del><ins>+ for (auto& type : malformedMIMETypes) {
+ supportedImageMIMETypes->add(type);
+ supportedImageResourceMIMETypes->add(type);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -228,9 +228,9 @@
</span><span class="cx"> "image/x-icon", // ico
</span><span class="cx"> "image/x-xbitmap" // xbm
</span><span class="cx"> };
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) {
- supportedImageMIMETypes->add(types[i]);
- supportedImageResourceMIMETypes->add(types[i]);
</del><ins>+ for (auto& type : types) {
+ supportedImageMIMETypes->add(type);
+ supportedImageResourceMIMETypes->add(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(WEBP)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> static void initializeSupportedImageMIMETypesForEncoding()
</span><span class="cx"> {
</span><del>- supportedImageMIMETypesForEncoding = new HashSet<String>;
</del><ins>+ supportedImageMIMETypesForEncoding = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -307,8 +307,8 @@
</span><span class="cx"> "application/pdf",
</span><span class="cx"> "text/pdf"
</span><span class="cx"> };
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i)
- pdfMIMETypes->add(types[i]);
</del><ins>+ for (auto& type : types)
+ pdfMIMETypes->add(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializePostScriptMIMETypes()
</span><span class="lines">@@ -337,14 +337,12 @@
</span><span class="cx"> "application/x-ftp-directory",
</span><span class="cx"> #endif
</span><span class="cx"> "multipart/x-mixed-replace"
</span><del>- // Note: ADDING a new type here will probably render it as HTML. This can
- // result in cross-site scripting.
</del><ins>+ // Note: Adding a new type here will probably render it as HTML.
+ // This can result in cross-site scripting vulnerabilities.
</ins><span class="cx"> };
</span><del>- COMPILE_ASSERT(sizeof(types) / sizeof(types[0]) <= 16,
- nonimage_mime_types_must_be_less_than_or_equal_to_16);
</del><span class="cx">
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i)
- supportedNonImageMIMETypes->add(types[i]);
</del><ins>+ for (auto& type : types)
+ supportedNonImageMIMETypes->add(type);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><span class="cx"> ArchiveFactory::registerKnownArchiveMIMETypes();
</span><span class="lines">@@ -414,7 +412,7 @@
</span><span class="cx">
</span><span class="cx"> static void initializeSupportedMediaMIMETypes()
</span><span class="cx"> {
</span><del>- supportedMediaMIMETypes = new HashSet<String>;
</del><ins>+ supportedMediaMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> MediaPlayer::getSupportedTypes(*supportedMediaMIMETypes);
</span><span class="cx"> #endif
</span><span class="lines">@@ -441,29 +439,29 @@
</span><span class="cx"> "text/vnd.sun.j2me.app-descriptor",
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i)
- unsupportedTextMIMETypes->add(types[i]);
</del><ins>+ for (auto& type : types)
+ unsupportedTextMIMETypes->add(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializeMIMETypeRegistry()
</span><span class="cx"> {
</span><del>- supportedJavaScriptMIMETypes = new HashSet<String>;
</del><ins>+ supportedJavaScriptMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx"> initializeSupportedJavaScriptMIMETypes();
</span><span class="cx">
</span><del>- supportedNonImageMIMETypes = new HashSet<String>(*supportedJavaScriptMIMETypes);
</del><ins>+ supportedNonImageMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>(*supportedJavaScriptMIMETypes);
</ins><span class="cx"> initializeSupportedNonImageMimeTypes();
</span><span class="cx">
</span><del>- supportedImageResourceMIMETypes = new HashSet<String>;
- supportedImageMIMETypes = new HashSet<String>;
</del><ins>+ supportedImageResourceMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
+ supportedImageMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx"> initializeSupportedImageMIMETypes();
</span><span class="cx">
</span><del>- pdfMIMETypes = new HashSet<String>;
</del><ins>+ pdfMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx"> initializePDFMIMETypes();
</span><span class="cx">
</span><del>- pdfAndPostScriptMIMETypes = new HashSet<String>(*pdfMIMETypes);
</del><ins>+ pdfAndPostScriptMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>(*pdfMIMETypes);
</ins><span class="cx"> initializePostScriptMIMETypes();
</span><span class="cx">
</span><del>- unsupportedTextMIMETypes = new HashSet<String>;
</del><ins>+ unsupportedTextMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</ins><span class="cx"> initializeUnsupportedTextMIMETypes();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -584,35 +582,35 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getSupportedImageMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSupportedImageMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!supportedImageMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="cx"> return *supportedImageMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getSupportedImageResourceMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSupportedImageResourceMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!supportedImageResourceMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="cx"> return *supportedImageResourceMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getSupportedImageMIMETypesForEncoding()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSupportedImageMIMETypesForEncoding()
</ins><span class="cx"> {
</span><span class="cx"> if (!supportedImageMIMETypesForEncoding)
</span><span class="cx"> initializeSupportedImageMIMETypesForEncoding();
</span><span class="cx"> return *supportedImageMIMETypesForEncoding;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getSupportedNonImageMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSupportedNonImageMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!supportedNonImageMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="cx"> return *supportedNonImageMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getSupportedMediaMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSupportedMediaMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!supportedMediaMIMETypes)
</span><span class="cx"> initializeSupportedMediaMIMETypes();
</span><span class="lines">@@ -620,21 +618,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getPDFMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getPDFMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!pdfMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="cx"> return *pdfMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getPDFAndPostScriptMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getPDFAndPostScriptMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!pdfAndPostScriptMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="cx"> return *pdfAndPostScriptMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<String>& MIMETypeRegistry::getUnsupportedTextMIMETypes()
</del><ins>+HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getUnsupportedTextMIMETypes()
</ins><span class="cx"> {
</span><span class="cx"> if (!unsupportedTextMIMETypes)
</span><span class="cx"> initializeMIMETypeRegistry();
</span><span class="lines">@@ -648,23 +646,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(CURL)
</span><ins>+
+// FIXME: Not sure why it makes sense to have a cross-platform function when only CURL has the concept
+// of a "normalized" MIME type.
</ins><span class="cx"> String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> return mimeType;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if USE(CURL)
-typedef HashMap<String, String> MIMETypeAssociationMap;
</del><ins>+#else
</ins><span class="cx">
</span><ins>+typedef HashMap<String, String, ASCIICaseInsensitiveHash> MIMETypeAssociationMap;
+
</ins><span class="cx"> static const MIMETypeAssociationMap& mimeTypeAssociationMap()
</span><span class="cx"> {
</span><span class="cx"> static MIMETypeAssociationMap* mimeTypeMap = 0;
</span><span class="cx"> if (mimeTypeMap)
</span><span class="cx"> return *mimeTypeMap;
</span><span class="cx">
</span><ins>+ // FIXME: Should not allocate this on the heap; use NeverDestroyed instead.
</ins><span class="cx"> mimeTypeMap = new MIMETypeAssociationMap;
</span><span class="cx">
</span><ins>+ // FIXME: Writing the function out like this will create a giant function.
+ // Should use a loop instead.
</ins><span class="cx"> mimeTypeMap->add(ASCIILiteral("image/x-ms-bmp"), ASCIILiteral("image/bmp"));
</span><span class="cx"> mimeTypeMap->add(ASCIILiteral("image/x-windows-bmp"), ASCIILiteral("image/bmp"));
</span><span class="cx"> mimeTypeMap->add(ASCIILiteral("image/x-bmp"), ASCIILiteral("image/bmp"));
</span><span class="lines">@@ -716,13 +720,12 @@
</span><span class="cx">
</span><span class="cx"> String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><del>- MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType);
-
</del><ins>+ auto it = mimeTypeAssociationMap().find(mimeType);
</ins><span class="cx"> if (it != mimeTypeAssociationMap().end())
</span><span class="cx"> return it->value;
</span><del>-
</del><span class="cx"> return mimeType;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static String getMIMETypeForExtension(const String& extension);
</span><span class="cx">
</span><ins>+ // FIXME: WebKit coding style says we should not have the word "get" in the names of these functions.
</ins><span class="cx"> static Vector<String> getExtensionsForMIMEType(const String& type);
</span><span class="cx"> WEBCORE_EXPORT static String getPreferredExtensionForMIMEType(const String& type);
</span><span class="cx"> static String getMediaMIMETypeForExtension(const String& extension);
</span><span class="lines">@@ -44,57 +45,60 @@
</span><span class="cx">
</span><span class="cx"> static String getMIMETypeForPath(const String& path);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being loaded inline as an
</del><ins>+ // Check to see if a MIME type is suitable for being loaded inline as an
</ins><span class="cx"> // image (e.g., <img> tags).
</span><span class="cx"> WEBCORE_EXPORT static bool isSupportedImageMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being loaded as an image
</del><ins>+ // Check to see if a MIME type is suitable for being loaded as an image
</ins><span class="cx"> // document in a frame.
</span><span class="cx"> WEBCORE_EXPORT static bool isSupportedImageResourceMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being encoded.
</del><ins>+ // Check to see if a MIME type is suitable for being encoded.
</ins><span class="cx"> static bool isSupportedImageMIMETypeForEncoding(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being loaded as a JavaScript
- // resource.
</del><ins>+ // Check to see if a MIME type is suitable for being loaded as a JavaScript resource.
</ins><span class="cx"> static bool isSupportedJavaScriptMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a non-image mime type is suitable for being loaded as a
</del><ins>+ // Check to see if a non-image MIME type is suitable for being loaded as a
</ins><span class="cx"> // document in a frame. Includes supported JavaScript MIME types.
</span><span class="cx"> WEBCORE_EXPORT static bool isSupportedNonImageMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being loaded using <video> and <audio>
</del><ins>+ // Check to see if a MIME type is suitable for being loaded using <video> and <audio>.
</ins><span class="cx"> WEBCORE_EXPORT static bool isSupportedMediaMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if the mime type is not suitable for being loaded as a text
- // document in a frame. Only valid for mime types begining with "text/".
</del><ins>+ // Check to see if the MIME type is not suitable for being loaded as a text
+ // document in a frame. Only valid for MIME types begining with "text/".
</ins><span class="cx"> static bool isUnsupportedTextMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is a valid Java applet mime type
</del><ins>+ // Check to see if a MIME type is a valid Java applet mime type.
</ins><span class="cx"> WEBCORE_EXPORT static bool isJavaAppletMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is a plugin implemented by the
- // browser (e.g. a Qt Plugin).
</del><ins>+ // Check to see if a MIME type is a plugin implemented by the browser.
</ins><span class="cx"> static bool isApplicationPluginMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is one of the common PDF/PS types.
</del><ins>+ // Check to see if a MIME type is one of the common PDF/PS types.
</ins><span class="cx"> WEBCORE_EXPORT static bool isPDFOrPostScriptMIMEType(const String& mimeType);
</span><span class="cx"> static bool isPDFMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if a mime type is suitable for being shown inside a page.
- // Returns true if any of isSupportedImageMIMEType(), isSupportedNonImageMIMEType(), isSupportedMediaMIMEType() returns true
- // or if given mime type begins with "text/" and isUnsupportedTextMIMEType() returns false.
</del><ins>+ // Check to see if a MIME type is suitable for being shown inside a page.
+ // Returns true if any of isSupportedImageMIMEType(), isSupportedNonImageMIMEType(), or
+ // isSupportedMediaMIMEType() returns true or if the given MIME type begins with
+ // "text/" and isUnsupportedTextMIMEType() returns false.
</ins><span class="cx"> WEBCORE_EXPORT static bool canShowMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static HashSet<String>& getSupportedImageMIMETypes();
- static HashSet<String>& getSupportedImageResourceMIMETypes();
- static HashSet<String>& getSupportedImageMIMETypesForEncoding();
- WEBCORE_EXPORT static HashSet<String>& getSupportedNonImageMIMETypes();
- WEBCORE_EXPORT static HashSet<String>& getSupportedMediaMIMETypes();
- WEBCORE_EXPORT static HashSet<String>& getPDFMIMETypes();
- static HashSet<String>& getPDFAndPostScriptMIMETypes();
- WEBCORE_EXPORT static HashSet<String>& getUnsupportedTextMIMETypes();
</del><ins>+ // FIXME: WebKit coding style says we should not have the word "get" in the names of these functions.
+ // FIXME: Would be nice to find a way to avoid exposing these sets, even worse exposing non-const references.
+ WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedImageMIMETypes();
+ static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedImageResourceMIMETypes();
+ static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedImageMIMETypesForEncoding();
+ WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedNonImageMIMETypes();
+ WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedMediaMIMETypes();
+ WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getPDFMIMETypes();
+ static HashSet<String, ASCIICaseInsensitiveHash>& getPDFAndPostScriptMIMETypes();
+ WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getUnsupportedTextMIMETypes();
</ins><span class="cx">
</span><ins>+ // FIXME: WebKit coding style says we should not have the word "get" in the name of this function.
+ // FIXME: Unclear what the concept of a normalized MIME type is; currently it's a platform-specific notion.
</ins><span class="cx"> static String getNormalizedMIMEType(const String&);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -96,9 +96,9 @@
</span><span class="cx"> return emptyDocumentSchemes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String>& schemesForbiddenFromDomainRelaxation()
</del><ins>+static HashSet<String, ASCIICaseInsensitiveHash>& schemesForbiddenFromDomainRelaxation()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> schemes;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> schemes;
</ins><span class="cx"> return schemes;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -2121,15 +2121,19 @@
</span><span class="cx"> String mimeTypeFromDataURL(const String& url)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(protocolIs(url, "data"));
</span><del>- size_t index = url.find(';');
</del><ins>+
+ // FIXME: What's the right behavior when the URL has a comma first, but a semicolon later?
+ // Currently this code will break at the semicolon in that case. Not sure that's correct.
+ auto index = url.find(';', 5);
</ins><span class="cx"> if (index == notFound)
</span><del>- index = url.find(',');
- if (index != notFound) {
- if (index > 5)
- return url.substring(5, index - 5).lower();
- return "text/plain"; // Data URLs with no MIME type are considered text/plain.
</del><ins>+ index = url.find(',', 5);
+ if (index == notFound) {
+ // FIXME: There was an old comment here that made it sound like this should be returning text/plain.
+ // But we have been returning empty string here for some time, so not changing its behavior at this time.
+ return emptyString();
</ins><span class="cx"> }
</span><del>- return "";
</del><ins>+ ASSERT(index >= 5);
+ return url.substring(5, index - 5).convertToASCIILowercase();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String mimeTypeFromURL(const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -865,10 +865,10 @@
</span><span class="cx"> return engine->supportsTypeAndCodecs(parameters);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::getSupportedTypes(HashSet<String>& types)
</del><ins>+void MediaPlayer::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& engine : installedMediaEngines()) {
</span><del>- HashSet<String> engineTypes;
</del><ins>+ HashSet<String, ASCIICaseInsensitiveHash> engineTypes;
</ins><span class="cx"> engine.getSupportedTypes(engineTypes);
</span><span class="cx"> types.add(engineTypes.begin(), engineTypes.end());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> // Media engine support.
</span><span class="cx"> enum SupportsType { IsNotSupported, IsSupported, MayBeSupported };
</span><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&, const MediaPlayerSupportsTypeClient*);
</span><del>- static void getSupportedTypes(HashSet<String>&);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
</ins><span class="cx"> static bool isAvailable();
</span><span class="cx"> static void getSitesInMediaCache(Vector<String>&);
</span><span class="cx"> static void clearMediaCache();
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef std::function<std::unique_ptr<MediaPlayerPrivateInterface> (MediaPlayer*)> CreateMediaEnginePlayer;
</span><del>-typedef void (*MediaEngineSupportedTypes)(HashSet<String>& types);
</del><ins>+typedef void (*MediaEngineSupportedTypes)(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const MediaEngineSupportParameters& parameters);
</span><span class="cx"> typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&);
</span><span class="cx"> typedef void (*MediaEngineClearMediaCache)();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1111,12 +1111,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const HashSet<String>& MediaPlayerPrivateAVFoundation::staticMIMETypeList()
</del><ins>+const HashSet<String, ASCIICaseInsensitiveHash>& MediaPlayerPrivateAVFoundation::staticMIMETypeList()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache = []() {
- HashSet<String> types;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
+ HashSet<String, ASCIICaseInsensitiveHash> types;
</ins><span class="cx">
</span><del>- static const char* typeNames[] = {
</del><ins>+ static const char* const typeNames[] = {
</ins><span class="cx"> "application/vnd.apple.mpegurl",
</span><span class="cx"> "application/x-mpegurl",
</span><span class="cx"> "audio/3gpp",
</span><span class="lines">@@ -1148,8 +1148,8 @@
</span><span class="cx"> "video/x-mpeg",
</span><span class="cx"> "video/x-mpg",
</span><span class="cx"> };
</span><del>- for (size_t i = 0; i < WTF_ARRAY_LENGTH(typeNames); ++i)
- types.add(typeNames[i]);
</del><ins>+ for (auto& type : typeNames)
+ types.add(type);
</ins><span class="cx">
</span><span class="cx"> return types;
</span><span class="cx"> }();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> virtual void updateVideoLayerGravity() = 0;
</span><span class="cx">
</span><span class="cx"> static bool isUnsupportedMIMEType(const String&);
</span><del>- static const HashSet<String>& staticMIMETypeList();
</del><ins>+ static const HashSet<String, ASCIICaseInsensitiveHash>& staticMIMETypeList();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void updateStates();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -882,25 +882,21 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static const HashSet<String>& avfMIMETypes()
</del><ins>+static const HashSet<String, ASCIICaseInsensitiveHash>& avfMIMETypes()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache = []() {
- HashSet<String> types;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
+ HashSet<String, ASCIICaseInsensitiveHash> types;
</ins><span class="cx"> RetainPtr<CFArrayRef> avTypes = adoptCF(AVCFURLAssetCopyAudiovisualMIMETypes());
</span><del>-
</del><span class="cx"> CFIndex typeCount = CFArrayGetCount(avTypes.get());
</span><del>- for (CFIndex i = 0; i < typeCount; ++i) {
- String mimeType = (CFStringRef)(CFArrayGetValueAtIndex(avTypes.get(), i));
- types.add(mimeType.lower());
- }
-
</del><ins>+ for (CFIndex i = 0; i < typeCount; ++i)
+ types.add((CFStringRef)CFArrayGetValueAtIndex(avTypes.get(), i));
</ins><span class="cx"> return types;
</span><span class="cx"> }();
</span><span class="cx">
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateAVFoundationCF::getSupportedTypes(HashSet<String>& supportedTypes)
</del><ins>+void MediaPlayerPrivateAVFoundationCF::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& supportedTypes)
</ins><span class="cx"> {
</span><span class="cx"> supportedTypes = avfMIMETypes();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx"> static bool supportsKeySystem(const String& keySystem, const String& mimeType);
</span><span class="cx"> static bool isAvailable();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // engine support
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx"> static bool supportsKeySystem(const String& keySystem, const String& mimeType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1505,22 +1505,17 @@
</span><span class="cx"> context.setImageInterpolationQuality(InterpolationLow);
</span><span class="cx"> IntRect paintRect(IntPoint(0, 0), IntSize(rect.width(), rect.height()));
</span><span class="cx"> CGContextDrawImage(context.platformContext(), CGRectMake(0, 0, paintRect.width(), paintRect.height()), image.get());
</span><del>- image = 0;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<String>& avfMIMETypes()
</del><ins>+static const HashSet<String, ASCIICaseInsensitiveHash>& avfMIMETypes()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache = [] () {
- HashSet<String> types;
-
- NSArray *nsTypes = [AVURLAsset audiovisualMIMETypes];
- for (NSString *mimeType in nsTypes)
- types.add([mimeType lowercaseString]);
-
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
+ HashSet<String, ASCIICaseInsensitiveHash> types;
+ for (NSString *type in [AVURLAsset audiovisualMIMETypes])
+ types.add(type);
</ins><span class="cx"> return types;
</span><span class="cx"> }();
</span><del>-
</del><span class="cx">
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="lines">@@ -1547,7 +1542,7 @@
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateAVFoundationObjC::getSupportedTypes(HashSet<String>& supportedTypes)
</del><ins>+void MediaPlayerPrivateAVFoundationObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& supportedTypes)
</ins><span class="cx"> {
</span><span class="cx"> supportedTypes = avfMIMETypes();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> // MediaPlayer Factory Methods
</span><span class="cx"> static bool isAvailable();
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><span class="cx"> void addDisplayLayer(AVSampleBufferDisplayLayer*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -218,9 +218,9 @@
</span><span class="cx"> && class_getInstanceMethod(getAVSampleBufferAudioRendererClass(), @selector(setMuted:));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<String>& mimeTypeCache()
</del><ins>+static const HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
</ins><span class="cx"> static bool typeListInitialized = false;
</span><span class="cx">
</span><span class="cx"> if (typeListInitialized)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes(HashSet<String>& types)
</del><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</ins><span class="cx"> {
</span><span class="cx"> types = mimeTypeCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> // MediaPlayer Factory Methods
</span><span class="cx"> static bool isAvailable();
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><span class="cx"> MediaPlayer::NetworkState networkState() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> return AVFoundationLibrary() && isCoreMediaFrameworkAvailable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes(HashSet<String>& types)
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
</ins><span class="cx"> types = cache;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -1659,116 +1660,111 @@
</span><span class="cx"> m_readyTimerHandler.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String> mimeTypeCache()
</del><ins>+// FIXME: In what sense is this a "cache"?
+static HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
</ins><span class="cx"> {
</span><del>- initializeGStreamerAndRegisterWebKitElements();
-
- DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<String>, cache, ());
- static bool typeListInitialized = false;
-
- if (typeListInitialized)
- return cache;
-
- const char* mimeTypes[] = {
- "application/ogg",
- "application/vnd.apple.mpegurl",
- "application/vnd.rn-realmedia",
- "application/x-3gp",
- "application/x-pn-realaudio",
- "application/x-mpegurl",
- "audio/3gpp",
- "audio/aac",
- "audio/flac",
- "audio/iLBC-sh",
- "audio/midi",
- "audio/mobile-xmf",
- "audio/mp1",
- "audio/mp2",
- "audio/mp3",
- "audio/mp4",
- "audio/mpeg",
- "audio/ogg",
- "audio/opus",
- "audio/qcelp",
- "audio/riff-midi",
- "audio/speex",
- "audio/wav",
- "audio/webm",
- "audio/x-ac3",
- "audio/x-aiff",
- "audio/x-amr-nb-sh",
- "audio/x-amr-wb-sh",
- "audio/x-au",
- "audio/x-ay",
- "audio/x-celt",
- "audio/x-dts",
- "audio/x-flac",
- "audio/x-gbs",
- "audio/x-gsm",
- "audio/x-gym",
- "audio/x-imelody",
- "audio/x-ircam",
- "audio/x-kss",
- "audio/x-m4a",
- "audio/x-mod",
- "audio/x-mp3",
- "audio/x-mpeg",
- "audio/x-musepack",
- "audio/x-nist",
- "audio/x-nsf",
- "audio/x-paris",
- "audio/x-sap",
- "audio/x-sbc",
- "audio/x-sds",
- "audio/x-shorten",
- "audio/x-sid",
- "audio/x-spc",
- "audio/x-speex",
- "audio/x-svx",
- "audio/x-ttafile",
- "audio/x-vgm",
- "audio/x-voc",
- "audio/x-vorbis+ogg",
- "audio/x-w64",
- "audio/x-wav",
- "audio/x-wavpack",
- "audio/x-wavpack-correction",
- "video/3gpp",
- "video/flv",
- "video/mj2",
- "video/mp2t",
- "video/mp4",
- "video/mpeg",
- "video/mpegts",
- "video/ogg",
- "video/quicktime",
- "video/vivo",
- "video/webm",
- "video/x-cdxa",
- "video/x-dirac",
- "video/x-dv",
- "video/x-fli",
- "video/x-flv",
- "video/x-h263",
- "video/x-ivf",
- "video/x-m4v",
- "video/x-matroska",
- "video/x-mng",
- "video/x-ms-asf",
- "video/x-msvideo",
- "video/x-mve",
- "video/x-nuv",
- "video/x-vcd"
- };
-
- for (unsigned i = 0; i < (sizeof(mimeTypes) / sizeof(*mimeTypes)); ++i)
- cache.add(String(mimeTypes[i]));
-
- typeListInitialized = true;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
+ initializeGStreamerAndRegisterWebKitElements();
+ HashSet<String, ASCIICaseInsensitiveHash> set;
+ const char* mimeTypes[] = {
+ "application/ogg",
+ "application/vnd.apple.mpegurl",
+ "application/vnd.rn-realmedia",
+ "application/x-3gp",
+ "application/x-pn-realaudio",
+ "application/x-mpegurl",
+ "audio/3gpp",
+ "audio/aac",
+ "audio/flac",
+ "audio/iLBC-sh",
+ "audio/midi",
+ "audio/mobile-xmf",
+ "audio/mp1",
+ "audio/mp2",
+ "audio/mp3",
+ "audio/mp4",
+ "audio/mpeg",
+ "audio/ogg",
+ "audio/opus",
+ "audio/qcelp",
+ "audio/riff-midi",
+ "audio/speex",
+ "audio/wav",
+ "audio/webm",
+ "audio/x-ac3",
+ "audio/x-aiff",
+ "audio/x-amr-nb-sh",
+ "audio/x-amr-wb-sh",
+ "audio/x-au",
+ "audio/x-ay",
+ "audio/x-celt",
+ "audio/x-dts",
+ "audio/x-flac",
+ "audio/x-gbs",
+ "audio/x-gsm",
+ "audio/x-gym",
+ "audio/x-imelody",
+ "audio/x-ircam",
+ "audio/x-kss",
+ "audio/x-m4a",
+ "audio/x-mod",
+ "audio/x-mp3",
+ "audio/x-mpeg",
+ "audio/x-musepack",
+ "audio/x-nist",
+ "audio/x-nsf",
+ "audio/x-paris",
+ "audio/x-sap",
+ "audio/x-sbc",
+ "audio/x-sds",
+ "audio/x-shorten",
+ "audio/x-sid",
+ "audio/x-spc",
+ "audio/x-speex",
+ "audio/x-svx",
+ "audio/x-ttafile",
+ "audio/x-vgm",
+ "audio/x-voc",
+ "audio/x-vorbis+ogg",
+ "audio/x-w64",
+ "audio/x-wav",
+ "audio/x-wavpack",
+ "audio/x-wavpack-correction",
+ "video/3gpp",
+ "video/flv",
+ "video/mj2",
+ "video/mp2t",
+ "video/mp4",
+ "video/mpeg",
+ "video/mpegts",
+ "video/ogg",
+ "video/quicktime",
+ "video/vivo",
+ "video/webm",
+ "video/x-cdxa",
+ "video/x-dirac",
+ "video/x-dv",
+ "video/x-fli",
+ "video/x-flv",
+ "video/x-h263",
+ "video/x-ivf",
+ "video/x-m4v",
+ "video/x-matroska",
+ "video/x-mng",
+ "video/x-ms-asf",
+ "video/x-msvideo",
+ "video/x-mve",
+ "video/x-nuv",
+ "video/x-vcd"
+ };
+ for (auto& type : mimeTypes)
+ set.add(type);
+ return set;
+ }();
</ins><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::getSupportedTypes(HashSet<String>& types)
</del><ins>+void MediaPlayerPrivateGStreamer::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</ins><span class="cx"> {
</span><span class="cx"> types = mimeTypeCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static void getSupportedTypes(HashSet<String>&);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><span class="cx"> static bool isAvailable();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // engine support
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><span class="cx"> static void getSitesInMediaCache(Vector<String>&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1232,14 +1232,13 @@
</span><span class="cx"> {
</span><span class="cx"> // QTKit will return non-video MIME types which it claims to support, but which we
</span><span class="cx"> // do not support in the <video> element. Disclaim all non video/ or audio/ types.
</span><del>- return !type.startsWith("video/") && !type.startsWith("audio/");
</del><ins>+ return !type.startsWith("video/", false) && !type.startsWith("audio/", false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void addFileTypesToCache(NSArray * fileTypes, HashSet<String> &cache)
</del><ins>+static void addFileTypesToCache(NSArray *fileTypes, HashSet<String, ASCIICaseInsensitiveHash> &cache)
</ins><span class="cx"> {
</span><del>- int count = [fileTypes count];
- for (int n = 0; n < count; n++) {
- CFStringRef ext = reinterpret_cast<CFStringRef>([fileTypes objectAtIndex:n]);
</del><ins>+ for (NSString *fileType : fileTypes) {
+ CFStringRef ext = reinterpret_cast<CFStringRef>(fileType);
</ins><span class="cx"> RetainPtr<CFStringRef> uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, ext, NULL));
</span><span class="cx"> if (!uti)
</span><span class="cx"> continue;
</span><span class="lines">@@ -1254,25 +1253,18 @@
</span><span class="cx"> if (CFStringGetCharacterAtIndex(ext, 0) != '\'') {
</span><span class="cx"> // UTI is missing many media related MIME types supported by QTKit (see rdar://6434168), and not all
</span><span class="cx"> // web servers use the MIME type UTI returns for an extension (see rdar://7875393), so even if UTI
</span><del>- // has a type for this extension add any types in hard coded table in the MIME type regsitry.
- Vector<String> typesForExtension = MIMETypeRegistry::getMediaMIMETypesForExtension(ext);
- unsigned count = typesForExtension.size();
- for (unsigned ndx = 0; ndx < count; ++ndx) {
- String type = typesForExtension[ndx].lower();
-
- if (shouldRejectMIMEType(type))
- continue;
-
- if (!cache.contains(type))
</del><ins>+ // has a type for this extension add any types in hard coded table in the MIME type registry.
+ for (auto& type : MIMETypeRegistry::getMediaMIMETypesForExtension(ext)) {
+ if (!shouldRejectMIMEType(type))
</ins><span class="cx"> cache.add(type);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String> mimeCommonTypesCache()
</del><ins>+static HashSet<String, ASCIICaseInsensitiveHash> mimeCommonTypesCache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
</ins><span class="cx"> static bool typeListInitialized = false;
</span><span class="cx">
</span><span class="cx"> if (!typeListInitialized) {
</span><span class="lines">@@ -1284,9 +1276,9 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String> mimeModernTypesCache()
</del><ins>+static HashSet<String, ASCIICaseInsensitiveHash> mimeModernTypesCache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
</ins><span class="cx"> static bool typeListInitialized = false;
</span><span class="cx">
</span><span class="cx"> if (!typeListInitialized) {
</span><span class="lines">@@ -1298,15 +1290,13 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void concatenateHashSets(HashSet<String>& destination, const HashSet<String>& source)
</del><ins>+static void concatenateHashSets(HashSet<String, ASCIICaseInsensitiveHash>& destination, const HashSet<String, ASCIICaseInsensitiveHash>& source)
</ins><span class="cx"> {
</span><del>- HashSet<String>::const_iterator it = source.begin();
- HashSet<String>::const_iterator end = source.end();
- for (; it != end; ++it)
- destination.add(*it);
</del><ins>+ for (auto& type : source)
+ destination.add(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::getSupportedTypes(HashSet<String>& supportedTypes)
</del><ins>+void MediaPlayerPrivateQTKit::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& supportedTypes)
</ins><span class="cx"> {
</span><span class="cx"> concatenateHashSets(supportedTypes, mimeModernTypesCache());
</span><span class="cx">
</span><span class="lines">@@ -1378,22 +1368,26 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static HashSet<String>* allowedTrackTypes = 0;
- if (!allowedTrackTypes) {
- allowedTrackTypes = new HashSet<String>;
- allowedTrackTypes->add(QTMediaTypeVideo);
- allowedTrackTypes->add(QTMediaTypeSound);
- allowedTrackTypes->add(QTMediaTypeText);
- allowedTrackTypes->add(QTMediaTypeBase);
- allowedTrackTypes->add(QTMediaTypeMPEG);
- allowedTrackTypes->add("clcp"); // Closed caption
- allowedTrackTypes->add("sbtl"); // Subtitle
- allowedTrackTypes->add("odsm"); // MPEG-4 object descriptor stream
- allowedTrackTypes->add("sdsm"); // MPEG-4 scene description stream
- allowedTrackTypes->add("tmcd"); // timecode
- allowedTrackTypes->add("tc64"); // timcode-64
- allowedTrackTypes->add("tmet"); // timed metadata
- }
</del><ins>+ static NeverDestroyed<HashSet<String>> allowedTrackTypes = []() {
+ NSString *types[] = {
+ QTMediaTypeVideo,
+ QTMediaTypeSound,
+ QTMediaTypeText,
+ QTMediaTypeBase,
+ QTMediaTypeMPEG,
+ @"clcp", // Closed caption
+ @"sbtl", // Subtitle
+ @"odsm", // MPEG-4 object descriptor stream
+ @"sdsm", // MPEG-4 scene description stream
+ @"tmcd", // timecode
+ @"tc64", // timcode-64
+ @"tmet", // timed metadata
+ };
+ HashSet<String> set;
+ for (auto& type : types)
+ set.add(type);
+ return set;
+ }();
</ins><span class="cx">
</span><span class="cx"> NSArray *tracks = [m_qtMovie.get() tracks];
</span><span class="cx">
</span><span class="lines">@@ -1419,7 +1413,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Test whether the media type is in our white list.
</span><del>- if (!allowedTrackTypes->contains(mediaType)) {
</del><ins>+ if (!allowedTrackTypes.get().contains(mediaType)) {
</ins><span class="cx"> // If this track type is not allowed, then we need to disable it.
</span><span class="cx"> [track setEnabled:NO];
</span><span class="cx"> --m_enabledTrackCount;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -120,9 +120,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<String>& mimeTypeCache()
</del><ins>+static const HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cachedTypes;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cachedTypes;
</ins><span class="cx">
</span><span class="cx"> if (cachedTypes.get().size() > 0)
</span><span class="cx"> return cachedTypes;
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> return cachedTypes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaFoundation::getSupportedTypes(HashSet<String>& types)
</del><ins>+void MediaPlayerPrivateMediaFoundation::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</ins><span class="cx"> {
</span><span class="cx"> types = mimeTypeCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> ~MediaPlayerPrivateMediaFoundation();
</span><span class="cx"> static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx">
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> supportsType, 0, 0, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<String>& mimeTypeCache()
</del><ins>+static const HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
</ins><span class="cx"> static bool isInitialized = false;
</span><span class="cx">
</span><span class="cx"> if (!isInitialized) {
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MockMediaPlayerMediaSource::getSupportedTypes(HashSet<String>& supportedTypes)
</del><ins>+void MockMediaPlayerMediaSource::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& supportedTypes)
</ins><span class="cx"> {
</span><span class="cx"> supportedTypes = mimeTypeCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> // MediaPlayer Engine Support
</span><span class="cx"> WEBCORE_EXPORT static void registerMediaEngine(MediaEngineRegistrar);
</span><del>- static void getSupportedTypes(HashSet<String>& types);
</del><ins>+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</ins><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><span class="cx"> virtual ~MockMediaPlayerMediaSource();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-31 Darin Adler <darin@apple.com>
+
+ Cut down on calls to String::lower; mostly replace with convertToASCIILowercase
+ https://bugs.webkit.org/show_bug.cgi?id=153732
+
+ Reviewed by Dean Jackson.
+
+ * WebView/WebHTMLRepresentation.mm:
+ (newArrayWithStrings): Updated to use HashSet<String, ASCIICaseInsensitiveHash>
+ and also to use a modern for loop.
+
</ins><span class="cx"> 2016-01-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Remove __has_include guards around use of WebKitAdditions
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (195950 => 195951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2016-02-01 04:44:07 UTC (rev 195950)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2016-02-01 05:46:20 UTC (rev 195951)
</span><span class="lines">@@ -87,13 +87,12 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebHTMLRepresentation
</span><span class="cx">
</span><del>-static NSMutableArray *newArrayWithStrings(const HashSet<String>& set) NS_RETURNS_RETAINED;
-static NSMutableArray *newArrayWithStrings(const HashSet<String>& set)
</del><ins>+static NSMutableArray *newArrayWithStrings(const HashSet<String, ASCIICaseInsensitiveHash>&) NS_RETURNS_RETAINED;
+static NSMutableArray *newArrayWithStrings(const HashSet<String, ASCIICaseInsensitiveHash>& set)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:set.size()];
</span><del>- HashSet<String>::const_iterator end = set.end();
- for (HashSet<String>::const_iterator it = set.begin(); it != end; ++it)
- [array addObject:(NSString *)(*it)];
</del><ins>+ for (auto& string : set)
+ [array addObject:(NSString *)string];
</ins><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>