<!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>[161851] 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/161851">161851</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 18:29:47 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add deprecatedCharacters as a synonym for characters and convert most call sites
https://bugs.webkit.org/show_bug.cgi?id=126858
Reviewed by Anders Carlsson.
Source/JavaScriptCore:
* API/JSStringRef.cpp:
(JSStringGetCharactersPtr):
(JSStringGetUTF8CString):
(JSStringIsEqual):
* API/JSStringRefCF.cpp:
(JSStringCopyCFString):
* API/OpaqueJSString.h:
(OpaqueJSString::characters):
(OpaqueJSString::deprecatedCharacters):
(OpaqueJSString::length):
(OpaqueJSString::OpaqueJSString):
* inspector/InspectorValues.cpp:
(Inspector::InspectorValue::parseJSON):
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::parseInt):
* runtime/StringPrototype.cpp:
(JSC::localeCompare):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncLink):
Use deprecatedCharacters instead of characters.
Source/WebCore:
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::IDBKeyPathLexer::IDBKeyPathLexer):
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
(WebCore::ThreadableWebSocketChannelClientWrapper::setExtensions):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::hasMisspelling):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:]):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::serialize):
(WebCore::CloneSerializer::write):
* dom/CharacterData.cpp:
(WebCore::CharacterData::parserAppendData):
* dom/Document.cpp:
(WebCore::Document::parseQualifiedName):
* editing/Editor.cpp:
(WebCore::Editor::misspelledWordAtCaretOrRange):
(WebCore::Editor::misspelledSelectionString):
(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
* editing/TextCheckingHelper.cpp:
(WebCore::TextCheckingHelper::findFirstMisspellingOrBadGrammar):
(WebCore::TextCheckingHelper::findFirstBadGrammar):
(WebCore::TextCheckingHelper::guessesForMisspelledOrUngrammaticalRange):
* editing/TextCheckingHelper.h:
(WebCore::TextCheckingParagraph::textDeprecatedCharacters):
* editing/TextIterator.cpp:
(WebCore::collapsedSpaceLength):
(WebCore::SimplifiedBackwardsTextIterator::handleTextNode):
(WebCore::containsKanaLetters):
(WebCore::SearchBuffer::SearchBuffer):
* editing/TextIterator.h:
(WebCore::TextIterator::characters):
* editing/VisiblePosition.cpp:
(WebCore::VisiblePosition::characterAfter):
* editing/VisibleUnits.cpp:
(WebCore::wordBreakIteratorForMinOffsetBoundary):
(WebCore::wordBreakIteratorForMaxOffsetBoundary):
(WebCore::visualWordPosition):
(WebCore::previousBoundary):
(WebCore::nextBoundary):
* fileapi/WebKitBlobBuilder.cpp:
(WebCore::BlobBuilder::append):
* html/FormDataList.cpp:
(WebCore::FormDataList::appendString):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::normalizeSpaces):
* html/parser/HTMLParserIdioms.cpp:
(WebCore::parseImagesWithScaleFromSrcsetAttribute):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
* loader/appcache/ManifestParser.cpp:
(WebCore::parseManifest):
* page/ContentSecurityPolicy.cpp:
(WebCore::isSourceListNone):
(WebCore::CSPSourceList::parse):
(WebCore::NonceDirective::parse):
(WebCore::MediaListDirective::parse):
(WebCore::CSPDirectiveList::parse):
(WebCore::CSPDirectiveList::parseReportURI):
(WebCore::CSPDirectiveList::parseReflectedXSS):
(WebCore::ContentSecurityPolicy::didReceiveHeader):
* page/PageSerializer.cpp:
(WebCore::PageSerializer::serializeFrame):
(WebCore::PageSerializer::serializeCSSStyleSheet):
* platform/Length.cpp:
(WebCore::newCoordsArray):
(WebCore::newLengthArray):
* platform/LinkHash.cpp:
(WebCore::visitedURL):
(WebCore::visitedLinkHash):
* platform/SharedBuffer.cpp:
(WebCore::utf8Buffer):
* platform/URL.cpp:
(WebCore::URL::port):
(WebCore::encodeHostnames):
* platform/graphics/StringTruncator.cpp:
(WebCore::centerTruncateToBuffer):
(WebCore::rightTruncateToBuffer):
(WebCore::rightClipToCharacterBuffer):
(WebCore::rightClipToWordBuffer):
(WebCore::leftTruncateToBuffer):
(WebCore::truncateString):
(WebCore::StringTruncator::width):
* platform/graphics/TextRun.h:
(WebCore::TextRun::TextRun):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
* platform/network/FormDataBuilder.cpp:
(WebCore::FormDataBuilder::addFilenameToMultiPartHeader):
* platform/sql/SQLiteStatement.cpp:
(WebCore::SQLiteStatement::bindBlob):
(WebCore::SQLiteStatement::bindText):
* platform/text/DecodeEscapeSequences.h:
(WebCore::decodeEscapeSequences):
* platform/text/TextBreakIterator.cpp:
(WebCore::numGraphemeClusters):
(WebCore::numCharactersInGraphemeClusters):
* platform/text/TextBreakIteratorICU.cpp:
(WebCore::setUpIteratorWithRules):
* platform/text/TextCodecICU.cpp:
(WebCore::TextCodecICU::encode):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::constructTextRun):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
* rendering/RenderText.cpp:
(WebCore::maxWordFragmentWidth):
(WebCore::RenderText::computePreferredLogicalWidths):
(WebCore::RenderText::computeCanUseSimpleFontCodePath):
* rendering/RenderText.h:
(WebCore::RenderText::characters):
(WebCore::RenderText::deprecatedCharacters):
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::tryHyphenating):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::constructTextRun):
* rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
(WebCore::processRenderSVGInlineText):
* rendering/svg/SVGTextLayoutEngine.cpp:
(WebCore::SVGTextLayoutEngine::layoutTextOnLineOrPath):
* rendering/svg/SVGTextMetrics.cpp:
(WebCore::SVGTextMetrics::measureCharacterRange):
(WebCore::SVGTextMetrics::SVGTextMetrics):
* rendering/svg/SVGTextMetricsBuilder.cpp:
(WebCore::SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer):
* svg/SVGAngle.cpp:
(WebCore::SVGAngle::setValueAsString):
* svg/SVGAnimateMotionElement.cpp:
(WebCore::parsePoint):
* svg/SVGAnimationElement.cpp:
(WebCore::parseKeySplines):
* svg/SVGFitToViewBox.cpp:
(WebCore::SVGFitToViewBox::parseViewBox):
* svg/SVGFontData.cpp:
(WebCore::SVGFontData::applySVGGlyphSelection):
* svg/SVGGlyphMap.h:
(WebCore::SVGGlyphMap::addGlyph):
(WebCore::SVGGlyphMap::collectGlyphsForString):
* svg/SVGGlyphRefElement.cpp:
(WebCore::SVGGlyphRefElement::parseAttribute):
* svg/SVGLength.cpp:
(WebCore::SVGLength::setValueAsString):
* svg/SVGLengthList.cpp:
(WebCore::SVGLengthList::parse):
* svg/SVGNumberList.cpp:
(WebCore::SVGNumberList::parse):
* svg/SVGParserUtilities.cpp:
(WebCore::parseNumberFromString):
(WebCore::parseNumberOptionalNumber):
(WebCore::parseRect):
(WebCore::pointsListFromSVGData):
(WebCore::parseGlyphName):
(WebCore::parseKerningUnicodeString):
(WebCore::parseDelimitedString):
* svg/SVGPreserveAspectRatio.cpp:
(WebCore::SVGPreserveAspectRatio::parse):
* svg/SVGStringList.cpp:
(WebCore::SVGStringList::parse):
* svg/SVGTransformList.cpp:
(WebCore::SVGTransformList::parse):
* svg/SVGTransformable.cpp:
(WebCore::SVGTransformable::parseTransformType):
* svg/SVGViewSpec.cpp:
(WebCore::SVGViewSpec::parseViewSpec):
* svg/SVGZoomAndPan.h:
(WebCore::SVGZoomAndPan::parseAttribute):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):
* xml/XSLStyleSheetLibxslt.cpp:
(WebCore::XSLStyleSheet::parseString):
* xml/XSLTUnicodeSort.cpp:
(WebCore::xsltUnicodeSortFunction):
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::doWrite):
(WebCore::parseAttributes):
Use deprecatedCharacters instead of characters.
Source/WebKit/mac:
* History/BinaryPropertyList.cpp:
(BinaryPropertyListSerializer::appendStringObject):
Use deprecatedCharacters instead of characters.
Source/WebKit2:
* Shared/APIString.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::checkTextOfParagraph):
(WebKit::WebPageProxy::checkSpellingOfString):
(WebKit::WebPageProxy::checkGrammarOfString):
* WebProcess/WebPage/EncoderAdapter.cpp:
(WebKit::EncoderAdapter::encodeString):
Use deprecatedCharacters instead of characters.
Source/WTF:
* wtf/text/AtomicString.cpp:
(WTF::HashAndUTF8CharactersTranslator::equal):
(WTF::SubstringTranslator::hash):
(WTF::SubstringTranslator::equal):
* wtf/text/AtomicString.h:
(WTF::AtomicString::characters):
* wtf/text/Base64.cpp:
(WTF::base64Decode):
(WTF::base64URLDecode):
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::characters):
(WTF::StringBuilder::deprecatedCharacters):
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::getData16SlowCase):
(WTF::StringImpl::upper):
(WTF::StringImpl::lower):
(WTF::StringImpl::find):
(WTF::StringImpl::findIgnoringCase):
* wtf/text/StringImpl.h:
(WTF::StringImpl::characters):
(WTF::StringImpl::deprecatedCharacters):
(WTF::StringImpl::getCharacters<UChar>):
(WTF::equalIgnoringNullity):
* wtf/text/WTFString.cpp:
(WTF::String::append):
(WTF::String::appendInternal):
(WTF::String::insert):
(WTF::String::truncate):
(WTF::String::percentage):
* wtf/text/WTFString.h:
(WTF::String::characters):
(WTF::String::deprecatedCharacters):
(WTF::String::getCharactersWithUpconvert<UChar>):
(WTF::append):
Use deprecatedCharacters instead of characters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefcpp">trunk/Source/JavaScriptCore/API/JSStringRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefCFcpp">trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringh">trunk/Source/JavaScriptCore/API/OpaqueJSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuescpp">trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringcpp">trunk/Source/WTF/wtf/text/AtomicString.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWTFwtftextBase64cpp">trunk/Source/WTF/wtf/text/Base64.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuilderh">trunk/Source/WTF/wtf/text/StringBuilder.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringcpp">trunk/Source/WTF/wtf/text/WTFString.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelpercpp">trunk/Source/WebCore/editing/TextCheckingHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextCheckingHelperh">trunk/Source/WebCore/editing/TextCheckingHelper.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorh">trunk/Source/WebCore/editing/TextIterator.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositioncpp">trunk/Source/WebCore/editing/VisiblePosition.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiWebKitBlobBuildercpp">trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFormDataListcpp">trunk/Source/WebCore/html/FormDataList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheManifestParsercpp">trunk/Source/WebCore/loader/appcache/ManifestParser.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthcpp">trunk/Source/WebCore/platform/Length.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLinkHashcpp">trunk/Source/WebCore/platform/LinkHash.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsStringTruncatorcpp">trunk/Source/WebCore/platform/graphics/StringTruncator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTextRunh">trunk/Source/WebCore/platform/graphics/TextRun.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDataBuildercpp">trunk/Source/WebCore/platform/network/FormDataBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteStatementcpp">trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextDecodeEscapeSequencesh">trunk/Source/WebCore/platform/text/DecodeEscapeSequences.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorICUcpp">trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextCodecICUcpp">trunk/Source/WebCore/platform/text/TextCodecICU.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuildercpp">trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutEnginecpp">trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricscpp">trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricsBuildercpp">trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnglecpp">trunk/Source/WebCore/svg/SVGAngle.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimateMotionElementcpp">trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimationElementcpp">trunk/Source/WebCore/svg/SVGAnimationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFitToViewBoxcpp">trunk/Source/WebCore/svg/SVGFitToViewBox.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontDatacpp">trunk/Source/WebCore/svg/SVGFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGGlyphMaph">trunk/Source/WebCore/svg/SVGGlyphMap.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGGlyphRefElementcpp">trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGLengthcpp">trunk/Source/WebCore/svg/SVGLength.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGLengthListcpp">trunk/Source/WebCore/svg/SVGLengthList.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGNumberListcpp">trunk/Source/WebCore/svg/SVGNumberList.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGParserUtilitiescpp">trunk/Source/WebCore/svg/SVGParserUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPreserveAspectRatiocpp">trunk/Source/WebCore/svg/SVGPreserveAspectRatio.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGStringListcpp">trunk/Source/WebCore/svg/SVGStringList.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTransformListcpp">trunk/Source/WebCore/svg/SVGTransformList.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTransformablecpp">trunk/Source/WebCore/svg/SVGTransformable.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGViewSpeccpp">trunk/Source/WebCore/svg/SVGViewSpec.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGZoomAndPanh">trunk/Source/WebCore/svg/SVGZoomAndPan.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp">trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTUnicodeSortcpp">trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryBinaryPropertyListcpp">trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIStringh">trunk/Source/WebKit2/Shared/APIString.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEncoderAdaptercpp">trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRef.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> const JSChar* JSStringGetCharactersPtr(JSStringRef string)
</span><span class="cx"> {
</span><del>- return string->characters();
</del><ins>+ return string->deprecatedCharacters();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> char* p = buffer;
</span><del>- const UChar* d = string->characters();
</del><ins>+ const UChar* d = string->deprecatedCharacters();
</ins><span class="cx"> ConversionResult result = convertUTF16ToUTF8(&d, d + string->length(), &p, p + bufferSize - 1, true);
</span><span class="cx"> *p++ = '\0';
</span><span class="cx"> if (result != conversionOK && result != targetExhausted)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> bool JSStringIsEqual(JSStringRef a, JSStringRef b)
</span><span class="cx"> {
</span><span class="cx"> unsigned len = a->length();
</span><del>- return len == b->length() && 0 == memcmp(a->characters(), b->characters(), len * sizeof(UChar));
</del><ins>+ return len == b->length() && 0 == memcmp(a->deprecatedCharacters(), b->deprecatedCharacters(), len * sizeof(UChar));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSStringIsEqualToUTF8CString(JSStringRef a, const char* b)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -61,5 +61,5 @@
</span><span class="cx"> if (!string->length())
</span><span class="cx"> return CFSTR("");
</span><span class="cx">
</span><del>- return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->characters()), string->length());
</del><ins>+ return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->deprecatedCharacters()), string->length());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -53,8 +53,9 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
</span><span class="cx">
</span><del>- const UChar* characters() { return !!this ? m_string.characters() : 0; }
- unsigned length() { return !!this ? m_string.length() : 0; }
</del><ins>+ const UChar* characters() { return deprecatedCharacters(); } // FIXME: Delete this.
+ const UChar* deprecatedCharacters() { return this ? m_string.deprecatedCharacters() : nullptr; }
+ unsigned length() { return this ? m_string.length() : 0; }
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String string() const;
</span><span class="cx"> JSC::Identifier identifier(JSC::VM*) const;
</span><span class="lines">@@ -72,13 +73,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OpaqueJSString(const LChar* characters, unsigned length)
</span><ins>+ : m_string(characters, length)
</ins><span class="cx"> {
</span><del>- m_string = String(characters, length);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OpaqueJSString(const UChar* characters, unsigned length)
</span><ins>+ : m_string(characters, length)
</ins><span class="cx"> {
</span><del>- m_string = String(characters, length);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String m_string;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Add deprecatedCharacters as a synonym for characters and convert most call sites
+ https://bugs.webkit.org/show_bug.cgi?id=126858
+
+ Reviewed by Anders Carlsson.
+
+ * API/JSStringRef.cpp:
+ (JSStringGetCharactersPtr):
+ (JSStringGetUTF8CString):
+ (JSStringIsEqual):
+ * API/JSStringRefCF.cpp:
+ (JSStringCopyCFString):
+ * API/OpaqueJSString.h:
+ (OpaqueJSString::characters):
+ (OpaqueJSString::deprecatedCharacters):
+ (OpaqueJSString::length):
+ (OpaqueJSString::OpaqueJSString):
+ * inspector/InspectorValues.cpp:
+ (Inspector::InspectorValue::parseJSON):
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::parseInt):
+ * runtime/StringPrototype.cpp:
+ (JSC::localeCompare):
+ (JSC::stringProtoFuncFontsize):
+ (JSC::stringProtoFuncLink):
+ Use deprecatedCharacters instead of characters.
+
+2014-01-12 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Reduce use of String::characters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126854
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -546,8 +546,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorValue> InspectorValue::parseJSON(const String& json)
</span><span class="cx"> {
</span><del>- const UChar* start = json.characters();
- const UChar* end = json.characters() + json.length();
</del><ins>+ const UChar* start = json.deprecatedCharacters();
+ const UChar* end = json.deprecatedCharacters() + json.length();
</ins><span class="cx"> const UChar *tokenEnd;
</span><span class="cx"> RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, 0);
</span><span class="cx"> if (!value || tokenEnd != end)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> if (number >= mantissaOverflowLowerBound) {
</span><span class="cx"> if (radix == 10) {
</span><span class="cx"> size_t parsedLength;
</span><del>- number = parseDouble(s.characters() + firstDigitPosition, p - firstDigitPosition, parsedLength);
</del><ins>+ number = parseDouble(s.deprecatedCharacters() + firstDigitPosition, p - firstDigitPosition, parsedLength);
</ins><span class="cx"> } else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
</span><span class="cx"> number = parseIntOverflow(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), p - firstDigitPosition, radix);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> static inline int localeCompare(const String& a, const String& b)
</span><span class="cx"> {
</span><del>- return Collator::userDefault()->collate(reinterpret_cast<const ::UChar*>(a.characters()), a.length(), reinterpret_cast<const ::UChar*>(b.characters()), b.length());
</del><ins>+ return Collator::userDefault()->collate(reinterpret_cast<const ::UChar*>(a.deprecatedCharacters()), a.length(), reinterpret_cast<const ::UChar*>(b.deprecatedCharacters()), b.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct StringRange {
</span><span class="lines">@@ -1427,7 +1427,7 @@
</span><span class="cx"> buffer[12] = '0' + smallInteger;
</span><span class="cx"> buffer[13] = '"';
</span><span class="cx"> buffer[14] = '>';
</span><del>- memcpy(&buffer[15], s.characters(), stringSize * sizeof(UChar));
</del><ins>+ memcpy(&buffer[15], s.deprecatedCharacters(), stringSize * sizeof(UChar));
</ins><span class="cx"> buffer[15 + stringSize] = '<';
</span><span class="cx"> buffer[16 + stringSize] = '/';
</span><span class="cx"> buffer[17 + stringSize] = 'f';
</span><span class="lines">@@ -1483,10 +1483,10 @@
</span><span class="cx"> buffer[6] = 'f';
</span><span class="cx"> buffer[7] = '=';
</span><span class="cx"> buffer[8] = '"';
</span><del>- memcpy(&buffer[9], linkText.characters(), linkTextSize * sizeof(UChar));
</del><ins>+ memcpy(&buffer[9], linkText.deprecatedCharacters(), linkTextSize * sizeof(UChar));
</ins><span class="cx"> buffer[9 + linkTextSize] = '"';
</span><span class="cx"> buffer[10 + linkTextSize] = '>';
</span><del>- memcpy(&buffer[11 + linkTextSize], s.characters(), stringSize * sizeof(UChar));
</del><ins>+ memcpy(&buffer[11 + linkTextSize], s.deprecatedCharacters(), stringSize * sizeof(UChar));
</ins><span class="cx"> buffer[11 + linkTextSize + stringSize] = '<';
</span><span class="cx"> buffer[12 + linkTextSize + stringSize] = '/';
</span><span class="cx"> buffer[13 + linkTextSize + stringSize] = 'a';
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/ChangeLog 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-01-12 Darin Adler <darin@apple.com>
+
+ Add deprecatedCharacters as a synonym for characters and convert most call sites
+ https://bugs.webkit.org/show_bug.cgi?id=126858
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/text/AtomicString.cpp:
+ (WTF::HashAndUTF8CharactersTranslator::equal):
+ (WTF::SubstringTranslator::hash):
+ (WTF::SubstringTranslator::equal):
+ * wtf/text/AtomicString.h:
+ (WTF::AtomicString::characters):
+ * wtf/text/Base64.cpp:
+ (WTF::base64Decode):
+ (WTF::base64URLDecode):
+ * wtf/text/StringBuilder.h:
+ (WTF::StringBuilder::characters):
+ (WTF::StringBuilder::deprecatedCharacters):
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::getData16SlowCase):
+ (WTF::StringImpl::upper):
+ (WTF::StringImpl::lower):
+ (WTF::StringImpl::find):
+ (WTF::StringImpl::findIgnoringCase):
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::characters):
+ (WTF::StringImpl::deprecatedCharacters):
+ (WTF::StringImpl::getCharacters<UChar>):
+ (WTF::equalIgnoringNullity):
+ * wtf/text/WTFString.cpp:
+ (WTF::String::append):
+ (WTF::String::appendInternal):
+ (WTF::String::insert):
+ (WTF::String::truncate):
+ (WTF::String::percentage):
+ * wtf/text/WTFString.h:
+ (WTF::String::characters):
+ (WTF::String::deprecatedCharacters):
+ (WTF::String::getCharactersWithUpconvert<UChar>):
+ (WTF::append):
+ Use deprecatedCharacters instead of characters.
+
</ins><span class="cx"> 2014-01-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the last remaining uses of AtomicallyInitializedStatic
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> // If buffer contains only ASCII characters UTF-8 and UTF16 length are the same.
</span><span class="cx"> if (buffer.utf16Length != buffer.length) {
</span><del>- const UChar* stringCharacters = string->characters();
</del><ins>+ const UChar* stringCharacters = string->deprecatedCharacters();
</ins><span class="cx">
</span><span class="cx"> return equalUTF16WithUTF8(stringCharacters, stringCharacters + string->length(), buffer.characters, buffer.characters + buffer.length);
</span><span class="cx"> }
</span><span class="lines">@@ -283,12 +283,12 @@
</span><span class="cx"> struct SubstringTranslator {
</span><span class="cx"> static unsigned hash(const SubstringLocation& buffer)
</span><span class="cx"> {
</span><del>- return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters() + buffer.start, buffer.length);
</del><ins>+ return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->deprecatedCharacters() + buffer.start, buffer.length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool equal(StringImpl* const& string, const SubstringLocation& buffer)
</span><span class="cx"> {
</span><del>- return WTF::equal(string, buffer.baseString->characters() + buffer.start, buffer.length);
</del><ins>+ return WTF::equal(string, buffer.baseString->deprecatedCharacters() + buffer.start, buffer.length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void translate(StringImpl*& location, const SubstringLocation& buffer, unsigned hash)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl *>(m_string.impl()); }
</span><span class="cx">
</span><span class="cx"> bool is8Bit() const { return m_string.is8Bit(); }
</span><del>- const UChar* characters() const { return m_string.characters(); }
</del><ins>+ const UChar* characters() const { return m_string.deprecatedCharacters(); } // FIXME: Delete this.
</ins><span class="cx"> const LChar* characters8() const { return m_string.characters8(); }
</span><span class="cx"> const UChar* characters16() const { return m_string.characters16(); }
</span><span class="cx"> unsigned length() const { return m_string.length(); }
</span></span></pre></div>
<a id="trunkSourceWTFwtftextBase64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/Base64.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/Base64.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/Base64.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx">
</span><span class="cx"> bool base64Decode(const String& in, SignedOrUnsignedCharVectorAdapter out, Base64DecodePolicy policy)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<UChar>(in.characters(), in.length(), out, policy, base64DecMap);
</del><ins>+ return base64DecodeInternal<UChar>(in.deprecatedCharacters(), in.length(), out, policy, base64DecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64Decode(const Vector<char>& in, SignedOrUnsignedCharVectorAdapter out, Base64DecodePolicy policy)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> bool base64URLDecode(const String& in, SignedOrUnsignedCharVectorAdapter out)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<UChar>(in.characters(), in.length(), out, Base64FailOnInvalidCharacter, base64URLDecMap);
</del><ins>+ return base64DecodeInternal<UChar>(in.deprecatedCharacters(), in.length(), out, Base64FailOnInvalidCharacter, base64URLDecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64URLDecode(const Vector<char>& in, SignedOrUnsignedCharVectorAdapter out)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -248,21 +248,22 @@
</span><span class="cx"> return m_buffer->characters16();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* characters() const
</del><ins>+ const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
+ const UChar* deprecatedCharacters() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_length)
</span><span class="cx"> return 0;
</span><span class="cx"> if (!m_string.isNull())
</span><del>- return m_string.characters();
</del><ins>+ return m_string.deprecatedCharacters();
</ins><span class="cx"> ASSERT(m_buffer);
</span><span class="cx"> if (m_buffer->has16BitShadow() && m_valid16BitShadowLength < m_length)
</span><span class="cx"> m_buffer->upconvertCharacters(m_valid16BitShadowLength, m_length);
</span><span class="cx">
</span><span class="cx"> m_valid16BitShadowLength = m_length;
</span><span class="cx">
</span><del>- return m_buffer->characters();
</del><ins>+ return m_buffer->deprecatedCharacters();
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> bool is8Bit() const { return m_is8Bit; }
</span><span class="cx">
</span><span class="cx"> void clear()
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> // If this is a substring, return a pointer into the parent string.
</span><span class="cx"> // TODO: Consider severing this string from the parent string
</span><span class="cx"> unsigned offset = m_data8 - m_substringBuffer->characters8();
</span><del>- return m_substringBuffer->characters() + offset;
</del><ins>+ return m_substringBuffer->deprecatedCharacters() + offset;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> STRING_STATS_ADD_UPCONVERTED_STRING(m_length);
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> upconvert:
</span><del>- const UChar* source16 = characters();
</del><ins>+ const UChar* source16 = deprecatedCharacters();
</ins><span class="cx">
</span><span class="cx"> UChar* data16;
</span><span class="cx"> RefPtr<StringImpl> newImpl = createUninitialized(m_length, data16);
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx"> // Below, we pass in the hardcoded locale "tr". Passing that is more efficient than
</span><span class="cx"> // allocating memory just to turn localeIdentifier into a C string, and we assume
</span><span class="cx"> // there is no difference between the uppercasing for "tr" and "az" locales.
</span><del>- const UChar* source16 = characters();
</del><ins>+ const UChar* source16 = deprecatedCharacters();
</ins><span class="cx"> UChar* data16;
</span><span class="cx"> RefPtr<StringImpl> newString = createUninitialized(length, data16);
</span><span class="cx"> UErrorCode status = U_ZERO_ERROR;
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> // Below, we pass in the hardcoded locale "tr". Passing that is more efficient than
</span><span class="cx"> // allocating memory just to turn localeIdentifier into a C string, and we assume
</span><span class="cx"> // there is no difference between the uppercasing for "tr" and "az" locales.
</span><del>- const UChar* source16 = characters();
</del><ins>+ const UChar* source16 = deprecatedCharacters();
</ins><span class="cx"> UChar* data16;
</span><span class="cx"> RefPtr<StringImpl> newString = createUninitialized(length, data16);
</span><span class="cx"> UErrorCode status = U_ZERO_ERROR;
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> // delta is the number of additional times to test; delta == 0 means test only once.
</span><span class="cx"> unsigned delta = searchLength - matchLength;
</span><span class="cx">
</span><del>- const UChar* searchCharacters = characters() + index;
</del><ins>+ const UChar* searchCharacters = deprecatedCharacters() + index;
</ins><span class="cx">
</span><span class="cx"> // Optimization 2: keep a running hash of the strings,
</span><span class="cx"> // only call equal if the hashes match.
</span><span class="lines">@@ -1042,7 +1042,7 @@
</span><span class="cx"> // delta is the number of additional times to test; delta == 0 means test only once.
</span><span class="cx"> unsigned delta = searchLength - matchLength;
</span><span class="cx">
</span><del>- const UChar* searchCharacters = characters() + index;
</del><ins>+ const UChar* searchCharacters = deprecatedCharacters() + index;
</ins><span class="cx">
</span><span class="cx"> unsigned i = 0;
</span><span class="cx"> // keep looping until we match
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -450,10 +450,10 @@
</span><span class="cx"> unsigned length() const { return m_length; }
</span><span class="cx"> bool is8Bit() const { return m_hashAndFlags & s_hashFlag8BitBuffer; }
</span><span class="cx">
</span><del>- // FIXME: Remove all unnecessary usages of characters()
</del><span class="cx"> ALWAYS_INLINE const LChar* characters8() const { ASSERT(is8Bit()); return m_data8; }
</span><span class="cx"> ALWAYS_INLINE const UChar* characters16() const { ASSERT(!is8Bit()); return m_data16; }
</span><del>- ALWAYS_INLINE const UChar* characters() const
</del><ins>+ const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
+ ALWAYS_INLINE const UChar* deprecatedCharacters() const
</ins><span class="cx"> {
</span><span class="cx"> if (!is8Bit())
</span><span class="cx"> return m_data16;
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> ALWAYS_INLINE const LChar* StringImpl::getCharacters<LChar>() const { return characters8(); }
</span><span class="cx">
</span><span class="cx"> template <>
</span><del>-ALWAYS_INLINE const UChar* StringImpl::getCharacters<UChar>() const { return characters(); }
</del><ins>+ALWAYS_INLINE const UChar* StringImpl::getCharacters<UChar>() const { return deprecatedCharacters(); }
</ins><span class="cx">
</span><span class="cx"> WTF_EXPORT_STRING_API bool equal(const StringImpl*, const StringImpl*);
</span><span class="cx"> WTF_EXPORT_STRING_API bool equal(const StringImpl*, const LChar*);
</span><span class="lines">@@ -1255,7 +1255,7 @@
</span><span class="cx"> return !a.size();
</span><span class="cx"> if (a.size() != b->length())
</span><span class="cx"> return false;
</span><del>- return !memcmp(a.data(), b->characters(), b->length() * sizeof(UChar));
</del><ins>+ return !memcmp(a.data(), b->deprecatedCharacters(), b->length() * sizeof(UChar));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType1, typename CharacterType2>
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/WTFString.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> if (str.length() > std::numeric_limits<unsigned>::max() - m_impl->length())
</span><span class="cx"> CRASH();
</span><span class="cx"> RefPtr<StringImpl> newImpl = StringImpl::createUninitialized(m_impl->length() + str.length(), data);
</span><del>- memcpy(data, m_impl->characters(), m_impl->length() * sizeof(UChar));
- memcpy(data + m_impl->length(), str.characters(), str.length() * sizeof(UChar));
</del><ins>+ memcpy(data, m_impl->deprecatedCharacters(), m_impl->length() * sizeof(UChar));
+ memcpy(data + m_impl->length(), str.deprecatedCharacters(), str.length() * sizeof(UChar));
</ins><span class="cx"> m_impl = newImpl.release();
</span><span class="cx"> } else
</span><span class="cx"> m_impl = str.m_impl;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (m_impl->length() >= std::numeric_limits<unsigned>::max())
</span><span class="cx"> CRASH();
</span><span class="cx"> RefPtr<StringImpl> newImpl = StringImpl::createUninitialized(m_impl->length() + 1, data);
</span><del>- memcpy(data, m_impl->characters(), m_impl->length() * sizeof(UChar));
</del><ins>+ memcpy(data, m_impl->deprecatedCharacters(), m_impl->length() * sizeof(UChar));
</ins><span class="cx"> data[m_impl->length()] = c;
</span><span class="cx"> m_impl = newImpl.release();
</span><span class="cx"> } else
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> m_impl = str.impl();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- insert(str.characters(), str.length(), pos);
</del><ins>+ insert(str.deprecatedCharacters(), str.length(), pos);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void String::append(const LChar* charactersToAppend, unsigned lengthToAppend)
</span><span class="lines">@@ -248,9 +248,9 @@
</span><span class="cx"> if (lengthToInsert > std::numeric_limits<unsigned>::max() - length())
</span><span class="cx"> CRASH();
</span><span class="cx"> RefPtr<StringImpl> newImpl = StringImpl::createUninitialized(length() + lengthToInsert, data);
</span><del>- memcpy(data, characters(), position * sizeof(UChar));
</del><ins>+ memcpy(data, deprecatedCharacters(), position * sizeof(UChar));
</ins><span class="cx"> memcpy(data + position, charactersToInsert, lengthToInsert * sizeof(UChar));
</span><del>- memcpy(data + position + lengthToInsert, characters() + position, (length() - position) * sizeof(UChar));
</del><ins>+ memcpy(data + position + lengthToInsert, deprecatedCharacters() + position, (length() - position) * sizeof(UChar));
</ins><span class="cx"> m_impl = newImpl.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> return;
</span><span class="cx"> UChar* data;
</span><span class="cx"> RefPtr<StringImpl> newImpl = StringImpl::createUninitialized(position, data);
</span><del>- memcpy(data, characters(), position * sizeof(UChar));
</del><ins>+ memcpy(data, deprecatedCharacters(), position * sizeof(UChar));
</ins><span class="cx"> m_impl = newImpl.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> if ((*m_impl)[m_impl->length() - 1] != '%')
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result = charactersToIntStrict(m_impl->characters(), m_impl->length() - 1);
</del><ins>+ result = charactersToIntStrict(m_impl->deprecatedCharacters(), m_impl->length() - 1);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -156,13 +156,14 @@
</span><span class="cx"> return m_impl->length();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* characters() const
</del><ins>+ const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
+ const UChar* deprecatedCharacters() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_impl)
</span><span class="cx"> return 0;
</span><del>- return m_impl->characters();
</del><ins>+ return m_impl->deprecatedCharacters();
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> const LChar* characters8() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_impl)
</span><span class="lines">@@ -540,7 +541,7 @@
</span><span class="cx"> template<>
</span><span class="cx"> inline const UChar* String::getCharactersWithUpconvert<UChar>() const
</span><span class="cx"> {
</span><del>- return characters();
</del><ins>+ return deprecatedCharacters();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool String::containsOnlyLatin1() const
</span><span class="lines">@@ -587,7 +588,7 @@
</span><span class="cx"> template<size_t inlineCapacity>
</span><span class="cx"> inline void append(Vector<UChar, inlineCapacity>& vector, const String& string)
</span><span class="cx"> {
</span><del>- vector.append(string.characters(), string.length());
</del><ins>+ vector.append(string.deprecatedCharacters(), string.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1,5 +1,190 @@
</span><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Add deprecatedCharacters as a synonym for characters and convert most call sites
+ https://bugs.webkit.org/show_bug.cgi?id=126858
+
+ Reviewed by Anders Carlsson.
+
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPathLexer::IDBKeyPathLexer):
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::setExtensions):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::hasMisspelling):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:]):
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::serialize):
+ (WebCore::CloneSerializer::write):
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::parserAppendData):
+ * dom/Document.cpp:
+ (WebCore::Document::parseQualifiedName):
+ * editing/Editor.cpp:
+ (WebCore::Editor::misspelledWordAtCaretOrRange):
+ (WebCore::Editor::misspelledSelectionString):
+ (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
+ * editing/TextCheckingHelper.cpp:
+ (WebCore::TextCheckingHelper::findFirstMisspellingOrBadGrammar):
+ (WebCore::TextCheckingHelper::findFirstBadGrammar):
+ (WebCore::TextCheckingHelper::guessesForMisspelledOrUngrammaticalRange):
+ * editing/TextCheckingHelper.h:
+ (WebCore::TextCheckingParagraph::textDeprecatedCharacters):
+ * editing/TextIterator.cpp:
+ (WebCore::collapsedSpaceLength):
+ (WebCore::SimplifiedBackwardsTextIterator::handleTextNode):
+ (WebCore::containsKanaLetters):
+ (WebCore::SearchBuffer::SearchBuffer):
+ * editing/TextIterator.h:
+ (WebCore::TextIterator::characters):
+ * editing/VisiblePosition.cpp:
+ (WebCore::VisiblePosition::characterAfter):
+ * editing/VisibleUnits.cpp:
+ (WebCore::wordBreakIteratorForMinOffsetBoundary):
+ (WebCore::wordBreakIteratorForMaxOffsetBoundary):
+ (WebCore::visualWordPosition):
+ (WebCore::previousBoundary):
+ (WebCore::nextBoundary):
+ * fileapi/WebKitBlobBuilder.cpp:
+ (WebCore::BlobBuilder::append):
+ * html/FormDataList.cpp:
+ (WebCore::FormDataList::appendString):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::normalizeSpaces):
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::parseImagesWithScaleFromSrcsetAttribute):
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
+ * loader/appcache/ManifestParser.cpp:
+ (WebCore::parseManifest):
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::isSourceListNone):
+ (WebCore::CSPSourceList::parse):
+ (WebCore::NonceDirective::parse):
+ (WebCore::MediaListDirective::parse):
+ (WebCore::CSPDirectiveList::parse):
+ (WebCore::CSPDirectiveList::parseReportURI):
+ (WebCore::CSPDirectiveList::parseReflectedXSS):
+ (WebCore::ContentSecurityPolicy::didReceiveHeader):
+ * page/PageSerializer.cpp:
+ (WebCore::PageSerializer::serializeFrame):
+ (WebCore::PageSerializer::serializeCSSStyleSheet):
+ * platform/Length.cpp:
+ (WebCore::newCoordsArray):
+ (WebCore::newLengthArray):
+ * platform/LinkHash.cpp:
+ (WebCore::visitedURL):
+ (WebCore::visitedLinkHash):
+ * platform/SharedBuffer.cpp:
+ (WebCore::utf8Buffer):
+ * platform/URL.cpp:
+ (WebCore::URL::port):
+ (WebCore::encodeHostnames):
+ * platform/graphics/StringTruncator.cpp:
+ (WebCore::centerTruncateToBuffer):
+ (WebCore::rightTruncateToBuffer):
+ (WebCore::rightClipToCharacterBuffer):
+ (WebCore::rightClipToWordBuffer):
+ (WebCore::leftTruncateToBuffer):
+ (WebCore::truncateString):
+ (WebCore::StringTruncator::width):
+ * platform/graphics/TextRun.h:
+ (WebCore::TextRun::TextRun):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
+ * platform/network/FormDataBuilder.cpp:
+ (WebCore::FormDataBuilder::addFilenameToMultiPartHeader):
+ * platform/sql/SQLiteStatement.cpp:
+ (WebCore::SQLiteStatement::bindBlob):
+ (WebCore::SQLiteStatement::bindText):
+ * platform/text/DecodeEscapeSequences.h:
+ (WebCore::decodeEscapeSequences):
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::numGraphemeClusters):
+ (WebCore::numCharactersInGraphemeClusters):
+ * platform/text/TextBreakIteratorICU.cpp:
+ (WebCore::setUpIteratorWithRules):
+ * platform/text/TextCodecICU.cpp:
+ (WebCore::TextCodecICU::encode):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::constructTextRun):
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint):
+ * rendering/RenderText.cpp:
+ (WebCore::maxWordFragmentWidth):
+ (WebCore::RenderText::computePreferredLogicalWidths):
+ (WebCore::RenderText::computeCanUseSimpleFontCodePath):
+ * rendering/RenderText.h:
+ (WebCore::RenderText::characters):
+ (WebCore::RenderText::deprecatedCharacters):
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::tryHyphenating):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::constructTextRun):
+ * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
+ (WebCore::processRenderSVGInlineText):
+ * rendering/svg/SVGTextLayoutEngine.cpp:
+ (WebCore::SVGTextLayoutEngine::layoutTextOnLineOrPath):
+ * rendering/svg/SVGTextMetrics.cpp:
+ (WebCore::SVGTextMetrics::measureCharacterRange):
+ (WebCore::SVGTextMetrics::SVGTextMetrics):
+ * rendering/svg/SVGTextMetricsBuilder.cpp:
+ (WebCore::SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer):
+ * svg/SVGAngle.cpp:
+ (WebCore::SVGAngle::setValueAsString):
+ * svg/SVGAnimateMotionElement.cpp:
+ (WebCore::parsePoint):
+ * svg/SVGAnimationElement.cpp:
+ (WebCore::parseKeySplines):
+ * svg/SVGFitToViewBox.cpp:
+ (WebCore::SVGFitToViewBox::parseViewBox):
+ * svg/SVGFontData.cpp:
+ (WebCore::SVGFontData::applySVGGlyphSelection):
+ * svg/SVGGlyphMap.h:
+ (WebCore::SVGGlyphMap::addGlyph):
+ (WebCore::SVGGlyphMap::collectGlyphsForString):
+ * svg/SVGGlyphRefElement.cpp:
+ (WebCore::SVGGlyphRefElement::parseAttribute):
+ * svg/SVGLength.cpp:
+ (WebCore::SVGLength::setValueAsString):
+ * svg/SVGLengthList.cpp:
+ (WebCore::SVGLengthList::parse):
+ * svg/SVGNumberList.cpp:
+ (WebCore::SVGNumberList::parse):
+ * svg/SVGParserUtilities.cpp:
+ (WebCore::parseNumberFromString):
+ (WebCore::parseNumberOptionalNumber):
+ (WebCore::parseRect):
+ (WebCore::pointsListFromSVGData):
+ (WebCore::parseGlyphName):
+ (WebCore::parseKerningUnicodeString):
+ (WebCore::parseDelimitedString):
+ * svg/SVGPreserveAspectRatio.cpp:
+ (WebCore::SVGPreserveAspectRatio::parse):
+ * svg/SVGStringList.cpp:
+ (WebCore::SVGStringList::parse):
+ * svg/SVGTransformList.cpp:
+ (WebCore::SVGTransformList::parse):
+ * svg/SVGTransformable.cpp:
+ (WebCore::SVGTransformable::parseTransformType):
+ * svg/SVGViewSpec.cpp:
+ (WebCore::SVGViewSpec::parseViewSpec):
+ * svg/SVGZoomAndPan.h:
+ (WebCore::SVGZoomAndPan::parseAttribute):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send):
+ * xml/XSLStyleSheetLibxslt.cpp:
+ (WebCore::XSLStyleSheet::parseString):
+ * xml/XSLTUnicodeSort.cpp:
+ (WebCore::xsltUnicodeSortFunction):
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::doWrite):
+ (WebCore::parseAttributes):
+ Use deprecatedCharacters instead of characters.
+
+2014-01-12 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Add type checking to isEqual methods
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126862
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx">
</span><span class="cx"> explicit IDBKeyPathLexer(const String& s)
</span><span class="cx"> : m_string(s)
</span><del>- , m_ptr(s.characters())
- , m_end(s.characters() + s.length())
</del><ins>+ , m_ptr(s.deprecatedCharacters())
+ , m_end(s.deprecatedCharacters() + s.length())
</ins><span class="cx"> , m_currentTokenType(TokenError)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> unsigned length = subprotocol.length();
</span><span class="cx"> m_subprotocol.resize(length);
</span><span class="cx"> if (length)
</span><del>- memcpy(m_subprotocol.data(), subprotocol.characters(), sizeof(UChar) * length);
</del><ins>+ memcpy(m_subprotocol.data(), subprotocol.deprecatedCharacters(), sizeof(UChar) * length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String ThreadableWebSocketChannelClientWrapper::extensions() const
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> unsigned length = extensions.length();
</span><span class="cx"> m_extensions.resize(length);
</span><span class="cx"> if (length)
</span><del>- memcpy(m_extensions.data(), extensions.characters(), sizeof(UChar) * length);
</del><ins>+ memcpy(m_extensions.data(), extensions.deprecatedCharacters(), sizeof(UChar) * length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ThreadableWebSocketChannel::SendResult ThreadableWebSocketChannelClientWrapper::sendRequestResult() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> if (!textChecker)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const UChar* chars = stringValue().characters();
</del><ins>+ const UChar* chars = stringValue().deprecatedCharacters();
</ins><span class="cx"> int charsLength = stringValue().length();
</span><span class="cx"> bool isMisspelled = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> // Add the text of the list marker item if necessary.
</span><span class="cx"> String listMarkerText = m_object->listMarkerTextForNodeAndPosition(node, VisiblePosition(it.range()->startPosition()));
</span><span class="cx"> if (!listMarkerText.isEmpty())
</span><del>- AXAttributedStringAppendText(attrString, node, listMarkerText.characters(), listMarkerText.length());
</del><ins>+ AXAttributedStringAppendText(attrString, node, listMarkerText.deprecatedCharacters(), listMarkerText.length());
</ins><span class="cx">
</span><span class="cx"> AXAttributedStringAppendText(attrString, node, it.characters(), it.length());
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> }
</span><span class="cx"> writeLittleEndian<uint8_t>(out, StringTag);
</span><span class="cx"> writeLittleEndian(out, s.length());
</span><del>- return writeLittleEndian(out, s.impl()->characters(), s.length());
</del><ins>+ return writeLittleEndian(out, s.impl()->deprecatedCharacters(), s.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void serializeUndefined(Vector<uint8_t>& out)
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> writeLittleEndian<uint32_t>(m_buffer, str.length());
</span><del>- if (!writeLittleEndian<uint16_t>(m_buffer, reinterpret_cast<const uint16_t*>(str.characters()), str.length()))
</del><ins>+ if (!writeLittleEndian<uint16_t>(m_buffer, reinterpret_cast<const uint16_t*>(str.deprecatedCharacters()), str.length()))
</ins><span class="cx"> fail();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> // see <https://bugs.webkit.org/show_bug.cgi?id=29092>.
</span><span class="cx"> // We need at least two characters look-ahead to account for UTF-16 surrogates.
</span><span class="cx"> if (characterLengthLimit < characterLength) {
</span><del>- NonSharedCharacterBreakIterator it(string.characters() + offset, (characterLengthLimit + 2 > characterLength) ? characterLength : characterLengthLimit + 2);
</del><ins>+ NonSharedCharacterBreakIterator it(string.deprecatedCharacters() + offset, (characterLengthLimit + 2 > characterLength) ? characterLength : characterLengthLimit + 2);
</ins><span class="cx"> if (!isTextBreak(it, characterLengthLimit))
</span><span class="cx"> characterLengthLimit = textBreakPreceding(it, characterLengthLimit);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -3965,7 +3965,7 @@
</span><span class="cx"> bool sawColon = false;
</span><span class="cx"> int colonPos = 0;
</span><span class="cx">
</span><del>- const UChar* s = qualifiedName.characters();
</del><ins>+ const UChar* s = qualifiedName.deprecatedCharacters();
</ins><span class="cx"> for (unsigned i = 0; i < length;) {
</span><span class="cx"> UChar32 c;
</span><span class="cx"> U16_NEXT(s, i, length, c)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -2106,7 +2106,7 @@
</span><span class="cx"> int wordLength = word.length();
</span><span class="cx"> int misspellingLocation = -1;
</span><span class="cx"> int misspellingLength = 0;
</span><del>- textChecker()->checkSpellingOfString(word.characters(), wordLength, &misspellingLocation, &misspellingLength);
</del><ins>+ textChecker()->checkSpellingOfString(word.deprecatedCharacters(), wordLength, &misspellingLocation, &misspellingLength);
</ins><span class="cx">
</span><span class="cx"> return misspellingLength == wordLength ? word : String();
</span><span class="cx"> }
</span><span class="lines">@@ -2120,7 +2120,7 @@
</span><span class="cx">
</span><span class="cx"> int misspellingLocation = -1;
</span><span class="cx"> int misspellingLength = 0;
</span><del>- textChecker()->checkSpellingOfString(selectedString.characters(), length, &misspellingLocation, &misspellingLength);
</del><ins>+ textChecker()->checkSpellingOfString(selectedString.deprecatedCharacters(), length, &misspellingLocation, &misspellingLength);
</ins><span class="cx">
</span><span class="cx"> // The selection only counts as misspelled if the selected text is exactly one misspelled word
</span><span class="cx"> if (misspellingLength != length)
</span><span class="lines">@@ -2427,7 +2427,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<TextCheckingResult> results;
</span><del>- checkTextOfParagraph(textChecker(), paragraphToCheck.textCharacters(), paragraphToCheck.textLength(),
</del><ins>+ checkTextOfParagraph(textChecker(), paragraphToCheck.textDeprecatedCharacters(), paragraphToCheck.textLength(),
</ins><span class="cx"> resolveTextCheckingTypeMask(textCheckingOptions), results);
</span><span class="cx"> markAndReplaceFor(request, results);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<TextCheckingResult> results;
</span><span class="cx"> TextCheckingTypeMask checkingTypes = checkGrammar ? (TextCheckingTypeSpelling | TextCheckingTypeGrammar) : TextCheckingTypeSpelling;
</span><del>- checkTextOfParagraph(m_client->textChecker(), paragraphString.characters(), paragraphString.length(), checkingTypes, results);
</del><ins>+ checkTextOfParagraph(m_client->textChecker(), paragraphString.deprecatedCharacters(), paragraphString.length(), checkingTypes, results);
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < results.size(); i++) {
</span><span class="cx"> const TextCheckingResult* result = &results[i];
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> Vector<GrammarDetail> grammarDetails;
</span><span class="cx"> int badGrammarPhraseLocation = -1;
</span><span class="cx"> int badGrammarPhraseLength = 0;
</span><del>- m_client->textChecker()->checkGrammarOfString(paragraph.textCharacters() + startOffset, paragraph.textLength() - startOffset, grammarDetails, &badGrammarPhraseLocation, &badGrammarPhraseLength);
</del><ins>+ m_client->textChecker()->checkGrammarOfString(paragraph.textDeprecatedCharacters() + startOffset, paragraph.textLength() - startOffset, grammarDetails, &badGrammarPhraseLocation, &badGrammarPhraseLength);
</ins><span class="cx">
</span><span class="cx"> if (!badGrammarPhraseLength) {
</span><span class="cx"> ASSERT(badGrammarPhraseLocation == -1);
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<TextCheckingResult> results;
</span><span class="cx"> TextCheckingTypeMask checkingTypes = checkGrammar ? (TextCheckingTypeSpelling | TextCheckingTypeGrammar) : TextCheckingTypeSpelling;
</span><del>- checkTextOfParagraph(m_client->textChecker(), paragraph.textCharacters(), paragraph.textLength(), checkingTypes, results);
</del><ins>+ checkTextOfParagraph(m_client->textChecker(), paragraph.textDeprecatedCharacters(), paragraph.textLength(), checkingTypes, results);
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < results.size(); i++) {
</span><span class="cx"> const TextCheckingResult* result = &results[i];
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextCheckingHelperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextCheckingHelper.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextCheckingHelper.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> int textLength() const { return text().length(); }
</span><span class="cx"> String textSubstring(unsigned pos, unsigned len = UINT_MAX) const { return text().substring(pos, len); }
</span><del>- const UChar* textCharacters() const { return text().characters(); }
</del><ins>+ const UChar* textDeprecatedCharacters() const { return text().deprecatedCharacters(); }
</ins><span class="cx"> UChar textCharAt(int index) const { return text()[static_cast<unsigned>(index)]; }
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx">
</span><span class="cx"> static int collapsedSpaceLength(RenderText* renderer, int textEnd)
</span><span class="cx"> {
</span><del>- const UChar* characters = renderer->text()->characters();
</del><ins>+ const UChar* characters = renderer->text()->deprecatedCharacters();
</ins><span class="cx"> int length = renderer->text()->length();
</span><span class="cx"> for (int i = textEnd; i < length; ++i) {
</span><span class="cx"> if (!renderer->style().isCollapsibleWhiteSpace(characters[i]))
</span><span class="lines">@@ -1309,9 +1309,9 @@
</span><span class="cx"> ASSERT(m_positionStartOffset <= m_positionEndOffset);
</span><span class="cx">
</span><span class="cx"> m_textLength = m_positionEndOffset - m_positionStartOffset;
</span><del>- m_textCharacters = text.characters() + (m_positionStartOffset - offsetInNode);
- ASSERT(m_textCharacters >= text.characters());
- ASSERT(m_textCharacters + m_textLength <= text.characters() + static_cast<int>(text.length()));
</del><ins>+ m_textCharacters = text.deprecatedCharacters() + (m_positionStartOffset - offsetInNode);
+ ASSERT(m_textCharacters >= text.deprecatedCharacters());
+ ASSERT(m_textCharacters + m_textLength <= text.deprecatedCharacters() + static_cast<int>(text.length()));
</ins><span class="cx">
</span><span class="cx"> m_lastCharacter = text[m_positionEndOffset - 1];
</span><span class="cx">
</span><span class="lines">@@ -1922,7 +1922,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool containsKanaLetters(const String& pattern)
</span><span class="cx"> {
</span><del>- const UChar* characters = pattern.characters();
</del><ins>+ const UChar* characters = pattern.deprecatedCharacters();
</ins><span class="cx"> unsigned length = pattern.length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (isKanaLetter(characters[i]))
</span><span class="lines">@@ -2007,7 +2007,7 @@
</span><span class="cx">
</span><span class="cx"> if ((m_options & AtWordStarts) && targetLength) {
</span><span class="cx"> UChar32 targetFirstCharacter;
</span><del>- U16_GET(m_target.characters(), 0, 0, targetLength, targetFirstCharacter);
</del><ins>+ U16_GET(m_target.deprecatedCharacters(), 0, 0, targetLength, targetFirstCharacter);
</ins><span class="cx"> // Characters in the separator category never really occur at the beginning of a word,
</span><span class="cx"> // so if the target begins with such a character, we just ignore the AtWordStart option.
</span><span class="cx"> if (isSeparator(targetFirstCharacter)) {
</span><span class="lines">@@ -2044,12 +2044,12 @@
</span><span class="cx"> usearch_setAttribute(searcher, USEARCH_ELEMENT_COMPARISON, comparator, &status);
</span><span class="cx"> ASSERT(status == U_ZERO_ERROR);
</span><span class="cx">
</span><del>- usearch_setPattern(searcher, m_target.characters(), targetLength, &status);
</del><ins>+ usearch_setPattern(searcher, m_target.deprecatedCharacters(), targetLength, &status);
</ins><span class="cx"> ASSERT(status == U_ZERO_ERROR);
</span><span class="cx">
</span><span class="cx"> // The kana workaround requires a normalized copy of the target string.
</span><span class="cx"> if (m_targetRequiresKanaWorkaround)
</span><del>- normalizeCharacters(m_target.characters(), m_target.length(), m_normalizedTarget);
</del><ins>+ normalizeCharacters(m_target.deprecatedCharacters(), m_target.length(), m_normalizedTarget);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline SearchBuffer::~SearchBuffer()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/TextIterator.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> void advance();
</span><span class="cx">
</span><span class="cx"> int length() const { return m_textLength; }
</span><del>- const UChar* characters() const { return m_textCharacters ? m_textCharacters : m_text.characters() + startOffset(); }
</del><ins>+ const UChar* characters() const { return m_textCharacters ? m_textCharacters : m_text.deprecatedCharacters() + startOffset(); }
</ins><span class="cx"> UChar characterAt(unsigned index) const;
</span><span class="cx"> void appendTextToStringBuilder(StringBuilder&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> UChar32 ch;
</span><del>- const UChar* characters = textNode->data().characters();
</del><ins>+ const UChar* characters = textNode->data().deprecatedCharacters();
</ins><span class="cx"> U16_NEXT(characters, offset, length, ch);
</span><span class="cx"> return ch;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -295,10 +295,10 @@
</span><span class="cx"> if (previousBox && previousBox->isInlineTextBox()) {
</span><span class="cx"> const InlineTextBox* previousTextBox = toInlineTextBox(previousBox);
</span><span class="cx"> previousBoxLength = previousTextBox->len();
</span><del>- string.append(previousTextBox->renderer().text()->characters() + previousTextBox->start(), previousBoxLength);
</del><ins>+ string.append(previousTextBox->renderer().text()->deprecatedCharacters() + previousTextBox->start(), previousBoxLength);
</ins><span class="cx"> len += previousBoxLength;
</span><span class="cx"> }
</span><del>- string.append(textBox->renderer().text()->characters() + textBox->start(), textBox->len());
</del><ins>+ string.append(textBox->renderer().text()->deprecatedCharacters() + textBox->start(), textBox->len());
</ins><span class="cx"> len += textBox->len();
</span><span class="cx">
</span><span class="cx"> return wordBreakIterator(string.data(), len);
</span><span class="lines">@@ -314,11 +314,11 @@
</span><span class="cx">
</span><span class="cx"> int len = 0;
</span><span class="cx"> string.clear();
</span><del>- string.append(textBox->renderer().text()->characters() + textBox->start(), textBox->len());
</del><ins>+ string.append(textBox->renderer().text()->deprecatedCharacters() + textBox->start(), textBox->len());
</ins><span class="cx"> len += textBox->len();
</span><span class="cx"> if (nextBox && nextBox->isInlineTextBox()) {
</span><span class="cx"> const InlineTextBox* nextTextBox = toInlineTextBox(nextBox);
</span><del>- string.append(nextTextBox->renderer().text()->characters() + nextTextBox->start(), nextTextBox->len());
</del><ins>+ string.append(nextTextBox->renderer().text()->deprecatedCharacters() + nextTextBox->start(), nextTextBox->len());
</ins><span class="cx"> len += nextTextBox->len();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> else if (offsetInBox == box->caretMaxOffset())
</span><span class="cx"> iter = wordBreakIteratorForMaxOffsetBoundary(visiblePosition, textBox, nextBoxInDifferentBlock, string, leafBoxes);
</span><span class="cx"> else if (movingIntoNewBox) {
</span><del>- iter = wordBreakIterator(textBox->renderer().text()->characters() + textBox->start(), textBox->len());
</del><ins>+ iter = wordBreakIterator(textBox->renderer().text()->deprecatedCharacters() + textBox->start(), textBox->len());
</ins><span class="cx"> previouslyVisitedBox = box;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> #else
</span><span class="cx"> iteratorString.fill('x');
</span><span class="cx"> #endif
</span><del>- string.insert(0, iteratorString.characters(), iteratorString.length());
</del><ins>+ string.insert(0, iteratorString.deprecatedCharacters(), iteratorString.length());
</ins><span class="cx"> }
</span><span class="cx"> next = searchFunction(string.data(), string.size(), string.size() - suffixLength, MayHaveMoreContext, needMoreContext);
</span><span class="cx"> if (next > 1) // FIXME: This is a work around for https://webkit.org/b/115070. We need to provide more contexts in general case.
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> #else
</span><span class="cx"> iteratorString.fill('x');
</span><span class="cx"> #endif
</span><del>- string.append(iteratorString.characters(), iteratorString.length());
</del><ins>+ string.append(iteratorString.deprecatedCharacters(), iteratorString.length());
</ins><span class="cx"> }
</span><span class="cx"> next = searchFunction(string.data(), string.size(), prefixLength, MayHaveMoreContext, needMoreContext);
</span><span class="cx"> if (next != string.size())
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiWebKitBlobBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void BlobBuilder::append(const String& text, const String& endingType)
</span><span class="cx"> {
</span><del>- CString utf8Text = UTF8Encoding().encode(text.characters(), text.length(), EntitiesForUnencodables);
</del><ins>+ CString utf8Text = UTF8Encoding().encode(text.deprecatedCharacters(), text.length(), EntitiesForUnencodables);
</ins><span class="cx">
</span><span class="cx"> Vector<char>& buffer = getBuffer();
</span><span class="cx"> size_t oldSize = buffer.size();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFormDataListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormDataList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormDataList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/html/FormDataList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> void FormDataList::appendString(const String& s)
</span><span class="cx"> {
</span><del>- CString cstr = m_encoding.encode(s.characters(), s.length(), EntitiesForUnencodables);
</del><ins>+ CString cstr = m_encoding.encode(s.deprecatedCharacters(), s.length(), EntitiesForUnencodables);
</ins><span class="cx"> m_items.append(normalizeLineEndingsToCRLF(cstr));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -2143,7 +2143,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned textLength = text.length();
</span><span class="cx"> Vector<UChar> charVector(textLength);
</span><del>- memcpy(charVector.data(), text.characters(), textLength * sizeof(UChar));
</del><ins>+ memcpy(charVector.data(), text.deprecatedCharacters(), textLength * sizeof(UChar));
</ins><span class="cx">
</span><span class="cx"> charVector[i++] = ' ';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> }
</span><span class="cx"> bool validScaleFactor = false;
</span><span class="cx"> size_t scaleFactorLengthWithoutUnit = imageScaleEnd - imageScaleStart - 1;
</span><del>- imageScaleFactor = charactersToFloat(srcsetAttribute.characters() + imageScaleStart, scaleFactorLengthWithoutUnit, &validScaleFactor);
</del><ins>+ imageScaleFactor = charactersToFloat(srcsetAttribute.deprecatedCharacters() + imageScaleStart, scaleFactorLengthWithoutUnit, &validScaleFactor);
</ins><span class="cx">
</span><span class="cx"> if (!validScaleFactor) {
</span><span class="cx"> imageCandidateStart = separator + 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit ExternalCharacterTokenBuffer(const String& string)
</span><del>- : m_current(string.characters())
</del><ins>+ : m_current(string.deprecatedCharacters())
</ins><span class="cx"> , m_end(m_current + string.length())
</span><span class="cx"> , m_isAll8BitData(string.length() && string.is8Bit())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheManifestParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ManifestParser.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ManifestParser.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/loader/appcache/ManifestParser.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> if (!s.startsWith("CACHE MANIFEST"))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const UChar* end = s.characters() + s.length();
- const UChar* p = s.characters() + 14; // "CACHE MANIFEST" is 14 characters.
</del><ins>+ const UChar* end = s.deprecatedCharacters() + s.length();
+ const UChar* p = s.deprecatedCharacters() + 14; // "CACHE MANIFEST" is 14 characters.
</ins><span class="cx">
</span><span class="cx"> if (p < end && *p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')
</span><span class="cx"> return false;
</span><span class="lines">@@ -99,20 +99,20 @@
</span><span class="cx"> else if (mode == Unknown)
</span><span class="cx"> continue;
</span><span class="cx"> else if (mode == Explicit || mode == OnlineWhitelist) {
</span><del>- const UChar* p = line.characters();
</del><ins>+ const UChar* p = line.deprecatedCharacters();
</ins><span class="cx"> const UChar* lineEnd = p + line.length();
</span><span class="cx">
</span><span class="cx"> // Look for whitespace separating the URL from subsequent ignored tokens.
</span><span class="cx"> while (p < lineEnd && *p != '\t' && *p != ' ')
</span><span class="cx"> p++;
</span><span class="cx">
</span><del>- if (mode == OnlineWhitelist && p - line.characters() == 1 && *line.characters() == '*') {
</del><ins>+ if (mode == OnlineWhitelist && p - line.deprecatedCharacters() == 1 && *line.deprecatedCharacters() == '*') {
</ins><span class="cx"> // Wildcard was found.
</span><span class="cx"> manifest.allowAllNetworkRequests = true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- URL url(manifestURL, String(line.characters(), p - line.characters()));
</del><ins>+ URL url(manifestURL, String(line.deprecatedCharacters(), p - line.deprecatedCharacters()));
</ins><span class="cx">
</span><span class="cx"> if (!url.isValid())
</span><span class="cx"> continue;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> manifest.onlineWhitelistedURLs.append(url);
</span><span class="cx">
</span><span class="cx"> } else if (mode == Fallback) {
</span><del>- const UChar* p = line.characters();
</del><ins>+ const UChar* p = line.deprecatedCharacters();
</ins><span class="cx"> const UChar* lineEnd = p + line.length();
</span><span class="cx">
</span><span class="cx"> // Look for whitespace separating the two URLs
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- URL namespaceURL(manifestURL, String(line.characters(), p - line.characters()));
</del><ins>+ URL namespaceURL(manifestURL, String(line.deprecatedCharacters(), p - line.deprecatedCharacters()));
</ins><span class="cx"> if (!namespaceURL.isValid())
</span><span class="cx"> continue;
</span><span class="cx"> if (namespaceURL.hasFragmentIdentifier())
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -215,8 +215,8 @@
</span><span class="cx">
</span><span class="cx"> static bool isSourceListNone(const String& value)
</span><span class="cx"> {
</span><del>- const UChar* begin = value.characters();
- const UChar* end = value.characters() + value.length();
</del><ins>+ const UChar* begin = value.deprecatedCharacters();
+ const UChar* end = value.deprecatedCharacters() + value.length();
</ins><span class="cx"> skipWhile<isASCIISpace>(begin, end);
</span><span class="cx">
</span><span class="cx"> const UChar* position = begin;
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> // We represent 'none' as an empty m_list.
</span><span class="cx"> if (isSourceListNone(value))
</span><span class="cx"> return;
</span><del>- parse(value.characters(), value.characters() + value.length());
</del><ins>+ parse(value.deprecatedCharacters(), value.deprecatedCharacters() + value.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPSourceList::matches(const URL& url)
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> void parse(const String& value)
</span><span class="cx"> {
</span><span class="cx"> String nonce;
</span><del>- const UChar* position = value.characters();
</del><ins>+ const UChar* position = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = position + value.length();
</span><span class="cx">
</span><span class="cx"> skipWhile<isASCIISpace>(position, end);
</span><span class="lines">@@ -749,7 +749,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void parse(const String& value)
</span><span class="cx"> {
</span><del>- const UChar* begin = value.characters();
</del><ins>+ const UChar* begin = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* position = begin;
</span><span class="cx"> const UChar* end = begin + value.length();
</span><span class="cx">
</span><span class="lines">@@ -1237,7 +1237,7 @@
</span><span class="cx"> if (policy.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const UChar* position = policy.characters();
</del><ins>+ const UChar* position = policy.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = position + policy.length();
</span><span class="cx">
</span><span class="cx"> while (position < end) {
</span><span class="lines">@@ -1316,7 +1316,7 @@
</span><span class="cx"> m_policy->reportDuplicateDirective(name);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- const UChar* position = value.characters();
</del><ins>+ const UChar* position = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = position + value.length();
</span><span class="cx">
</span><span class="cx"> while (position < end) {
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* position = value.characters();
</del><ins>+ const UChar* position = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = position + value.length();
</span><span class="cx">
</span><span class="cx"> skipWhile<isASCIISpace>(position, end);
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx"> // RFC2616, section 4.2 specifies that headers appearing multiple times can
</span><span class="cx"> // be combined with a comma. Walk the header string, and parse each comma
</span><span class="cx"> // separated chunk as a separate header.
</span><del>- const UChar* begin = header.characters();
</del><ins>+ const UChar* begin = header.deprecatedCharacters();
</ins><span class="cx"> const UChar* position = begin;
</span><span class="cx"> const UChar* end = begin + header.length();
</span><span class="cx"> while (position < end) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> String text = accumulator.serializeNodes(*document->documentElement(), 0, IncludeNode);
</span><del>- CString frameHTML = textEncoding.encode(text.characters(), text.length(), EntitiesForUnencodables);
</del><ins>+ CString frameHTML = textEncoding.encode(text.deprecatedCharacters(), text.length(), EntitiesForUnencodables);
</ins><span class="cx"> m_resources->append(Resource(url, document->suggestedMIMEType(), SharedBuffer::create(frameHTML.data(), frameHTML.length())));
</span><span class="cx"> m_resourceURLs.add(url);
</span><span class="cx">
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> TextEncoding textEncoding(styleSheet->contents().charset());
</span><span class="cx"> ASSERT(textEncoding.isValid());
</span><span class="cx"> String textString = cssText.toString();
</span><del>- CString text = textEncoding.encode(textString.characters(), textString.length(), EntitiesForUnencodables);
</del><ins>+ CString text = textEncoding.encode(textString.deprecatedCharacters(), textString.length(), EntitiesForUnencodables);
</ins><span class="cx"> m_resources->append(Resource(url, String("text/css"), SharedBuffer::create(text.data(), text.length())));
</span><span class="cx"> m_resourceURLs.add(url);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/Length.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> str = str->simplifyWhiteSpace();
</span><span class="cx">
</span><del>- len = countCharacter(str->characters(), str->length(), ' ') + 1;
</del><ins>+ len = countCharacter(str->deprecatedCharacters(), str->length(), ' ') + 1;
</ins><span class="cx"> auto r = std::make_unique<Length[]>(len);
</span><span class="cx">
</span><span class="cx"> int i = 0;
</span><span class="lines">@@ -108,10 +108,10 @@
</span><span class="cx"> size_t pos2;
</span><span class="cx">
</span><span class="cx"> while ((pos2 = str->find(' ', pos)) != notFound) {
</span><del>- r[i++] = parseLength(str->characters() + pos, pos2 - pos);
</del><ins>+ r[i++] = parseLength(str->deprecatedCharacters() + pos, pos2 - pos);
</ins><span class="cx"> pos = pos2+1;
</span><span class="cx"> }
</span><del>- r[i] = parseLength(str->characters() + pos, str->length() - pos);
</del><ins>+ r[i] = parseLength(str->deprecatedCharacters() + pos, str->length() - pos);
</ins><span class="cx">
</span><span class="cx"> ASSERT(i == len - 1);
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- len = countCharacter(str->characters(), str->length(), ',') + 1;
</del><ins>+ len = countCharacter(str->deprecatedCharacters(), str->length(), ',') + 1;
</ins><span class="cx"> auto r = std::make_unique<Length[]>(len);
</span><span class="cx">
</span><span class="cx"> int i = 0;
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> size_t pos2;
</span><span class="cx">
</span><span class="cx"> while ((pos2 = str->find(',', pos)) != notFound) {
</span><del>- r[i++] = parseLength(str->characters() + pos, pos2 - pos);
</del><ins>+ r[i++] = parseLength(str->deprecatedCharacters() + pos, pos2 - pos);
</ins><span class="cx"> pos = pos2+1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> // IE Quirk: If the last comma is the last char skip it and reduce len by one.
</span><span class="cx"> if (str->length()-pos > 0)
</span><del>- r[i] = parseLength(str->characters() + pos, str->length() - pos);
</del><ins>+ r[i] = parseLength(str->deprecatedCharacters() + pos, str->length() - pos);
</ins><span class="cx"> else
</span><span class="cx"> len--;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLinkHashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LinkHash.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LinkHash.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/LinkHash.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> void visitedURL(const URL& base, const AtomicString& attributeURL, Vector<UChar, 512>& buffer)
</span><span class="cx"> {
</span><del>- return visitedURLInline(base, attributeURL.characters(), attributeURL.length(), buffer);
</del><ins>+ return visitedURLInline(base, attributeURL.string().deprecatedCharacters(), attributeURL.length(), buffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LinkHash visitedLinkHash(const URL& base, const AtomicString& attributeURL)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<UChar, 512> url;
</span><del>- visitedURLInline(base, attributeURL.characters(), attributeURL.length(), url);
</del><ins>+ visitedURLInline(base, attributeURL.string().deprecatedCharacters(), attributeURL.length(), url);
</ins><span class="cx"> if (url.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert to runs of 8-bit characters.
</span><span class="cx"> char* p = buffer.data();
</span><del>- const UChar* d = string.characters();
</del><ins>+ const UChar* d = string.deprecatedCharacters();
</ins><span class="cx"> WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), true);
</span><span class="cx"> if (result != WTF::Unicode::conversionOK)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/URL.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -589,9 +589,8 @@
</span><span class="cx"> if (m_hostEnd == m_portEnd || m_hostEnd == m_portEnd - 1)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const UChar* stringData = m_string.characters();
</del><span class="cx"> bool ok = false;
</span><del>- unsigned number = charactersToUIntStrict(stringData + m_hostEnd + 1, m_portEnd - m_hostEnd - 1, &ok);
</del><ins>+ unsigned number = charactersToUIntStrict(m_string.deprecatedCharacters() + m_hostEnd + 1, m_portEnd - m_hostEnd - 1, &ok);
</ins><span class="cx"> if (!ok || number > maximumValidPortNumber)
</span><span class="cx"> return invalidPortNumber;
</span><span class="cx"> return number;
</span><span class="lines">@@ -1632,27 +1631,27 @@
</span><span class="cx">
</span><span class="cx"> if (protocolIs(str, "mailto")) {
</span><span class="cx"> Vector<std::pair<int, int>> hostnameRanges;
</span><del>- findHostnamesInMailToURL(str.characters(), str.length(), hostnameRanges);
</del><ins>+ findHostnamesInMailToURL(str.deprecatedCharacters(), str.length(), hostnameRanges);
</ins><span class="cx"> int n = hostnameRanges.size();
</span><span class="cx"> int p = 0;
</span><span class="cx"> for (int i = 0; i < n; ++i) {
</span><span class="cx"> const std::pair<int, int>& r = hostnameRanges[i];
</span><del>- output.append(&str.characters()[p], r.first - p);
- appendEncodedHostname(output, &str.characters()[r.first], r.second - r.first);
</del><ins>+ output.append(&str.deprecatedCharacters()[p], r.first - p);
+ appendEncodedHostname(output, &str.deprecatedCharacters()[r.first], r.second - r.first);
</ins><span class="cx"> p = r.second;
</span><span class="cx"> }
</span><span class="cx"> // This will copy either everything after the last hostname, or the
</span><span class="cx"> // whole thing if there is no hostname.
</span><del>- output.append(&str.characters()[p], str.length() - p);
</del><ins>+ output.append(&str.deprecatedCharacters()[p], str.length() - p);
</ins><span class="cx"> } else {
</span><span class="cx"> int hostStart, hostEnd;
</span><del>- if (findHostnameInHierarchicalURL(str.characters(), str.length(), hostStart, hostEnd)) {
- output.append(str.characters(), hostStart); // Before hostname.
- appendEncodedHostname(output, &str.characters()[hostStart], hostEnd - hostStart);
- output.append(&str.characters()[hostEnd], str.length() - hostEnd); // After hostname.
</del><ins>+ if (findHostnameInHierarchicalURL(str.deprecatedCharacters(), str.length(), hostStart, hostEnd)) {
+ output.append(str.deprecatedCharacters(), hostStart); // Before hostname.
+ appendEncodedHostname(output, &str.deprecatedCharacters()[hostStart], hostEnd - hostStart);
+ output.append(&str.deprecatedCharacters()[hostEnd], str.length() - hostEnd); // After hostname.
</ins><span class="cx"> } else {
</span><span class="cx"> // No hostname to encode, return the input.
</span><del>- output.append(str.characters(), str.length());
</del><ins>+ output.append(str.deprecatedCharacters(), str.length());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsStringTruncatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/StringTruncator.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/graphics/StringTruncator.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><span class="cx"> unsigned omitStart = (keepCount + 1) / 2;
</span><del>- NonSharedCharacterBreakIterator it(string.characters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</ins><span class="cx"> unsigned omitEnd = boundedTextBreakFollowing(it, omitStart + (length - keepCount) - 1, length);
</span><span class="cx"> omitStart = textBreakAtOrPreceding(it, omitStart);
</span><span class="cx">
</span><span class="lines">@@ -89,12 +89,12 @@
</span><span class="cx"> unsigned truncatedLength = shouldInsertEllipsis ? omitStart + 1 + (length - omitEnd) : length - (omitEnd - omitStart);
</span><span class="cx"> ASSERT(truncatedLength <= length);
</span><span class="cx">
</span><del>- memcpy(buffer, string.characters(), sizeof(UChar) * omitStart);
</del><ins>+ memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * omitStart);
</ins><span class="cx"> if (shouldInsertEllipsis) {
</span><span class="cx"> buffer[omitStart] = horizontalEllipsis;
</span><del>- memcpy(&buffer[omitStart + 1], &string.characters()[omitEnd], sizeof(UChar) * (length - omitEnd));
</del><ins>+ memcpy(&buffer[omitStart + 1], &string.deprecatedCharacters()[omitEnd], sizeof(UChar) * (length - omitEnd));
</ins><span class="cx"> } else
</span><del>- memcpy(&buffer[omitStart], &string.characters()[omitEnd], sizeof(UChar) * (length - omitEnd));
</del><ins>+ memcpy(&buffer[omitStart], &string.deprecatedCharacters()[omitEnd], sizeof(UChar) * (length - omitEnd));
</ins><span class="cx"> return truncatedLength;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,11 +115,11 @@
</span><span class="cx"> --keepCount;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.characters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><span class="cx"> unsigned truncatedLength = shouldInsertEllipsis ? keepLength + 1 : keepLength;
</span><span class="cx">
</span><del>- memcpy(buffer, string.characters(), sizeof(UChar) * keepLength);
</del><ins>+ memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * keepLength);
</ins><span class="cx"> if (shouldInsertEllipsis)
</span><span class="cx"> buffer[keepLength] = horizontalEllipsis;
</span><span class="cx">
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> ASSERT(keepCount < length);
</span><span class="cx"> ASSERT(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.characters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><del>- memcpy(buffer, string.characters(), sizeof(UChar) * keepLength);
</del><ins>+ memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * keepLength);
</ins><span class="cx">
</span><span class="cx"> return keepLength;
</span><span class="cx"> }
</span><span class="lines">@@ -143,9 +143,9 @@
</span><span class="cx"> ASSERT(keepCount < length);
</span><span class="cx"> ASSERT(keepCount < STRING_BUFFER_SIZE);
</span><span class="cx">
</span><del>- TextBreakIterator* it = wordBreakIterator(string.characters(), length);
</del><ins>+ TextBreakIterator* it = wordBreakIterator(string.deprecatedCharacters(), length);
</ins><span class="cx"> unsigned keepLength = textBreakAtOrPreceding(it, keepCount);
</span><del>- memcpy(buffer, string.characters(), sizeof(UChar) * keepLength);
</del><ins>+ memcpy(buffer, string.deprecatedCharacters(), sizeof(UChar) * keepLength);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: We should guard this code behind an editing behavior. Then we can remove the PLATFORM(IOS)-guard.
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned startIndex = length - keepCount;
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(string.characters(), length);
</del><ins>+ NonSharedCharacterBreakIterator it(string.deprecatedCharacters(), length);
</ins><span class="cx"> unsigned adjustedStartIndex = startIndex;
</span><span class="cx"> startIndex = boundedTextBreakFollowing(it, startIndex, length - startIndex);
</span><span class="cx">
</span><span class="lines">@@ -178,10 +178,10 @@
</span><span class="cx">
</span><span class="cx"> if (shouldInsertEllipsis) {
</span><span class="cx"> buffer[0] = horizontalEllipsis;
</span><del>- memcpy(&buffer[1], &string.characters()[adjustedStartIndex], sizeof(UChar) * (length - adjustedStartIndex + 1));
</del><ins>+ memcpy(&buffer[1], &string.deprecatedCharacters()[adjustedStartIndex], sizeof(UChar) * (length - adjustedStartIndex + 1));
</ins><span class="cx"> return length - adjustedStartIndex + 1;
</span><span class="cx"> }
</span><del>- memcpy(&buffer[0], &string.characters()[adjustedStartIndex], sizeof(UChar) * (length - adjustedStartIndex + 1));
</del><ins>+ memcpy(&buffer[0], &string.deprecatedCharacters()[adjustedStartIndex], sizeof(UChar) * (length - adjustedStartIndex + 1));
</ins><span class="cx"> return length - adjustedStartIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> truncatedLength = centerTruncateToBuffer(string, length, keepCount, stringBuffer, shouldInsertEllipsis);
</span><span class="cx"> } else {
</span><span class="cx"> keepCount = length;
</span><del>- memcpy(stringBuffer, string.characters(), sizeof(UChar) * length);
</del><ins>+ memcpy(stringBuffer, string.deprecatedCharacters(), sizeof(UChar) * length);
</ins><span class="cx"> truncatedLength = length;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> float StringTruncator::width(const String& string, const Font& font, EnableRoundingHacksOrNot enableRoundingHacks)
</span><span class="cx"> {
</span><del>- return stringWidth(font, string.characters(), string.length(), !enableRoundingHacks);
</del><ins>+ return stringWidth(font, string.deprecatedCharacters(), string.length(), !enableRoundingHacks);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String StringTruncator::centerTruncate(const String& string, float maxWidth, const Font& font, EnableRoundingHacksOrNot enableRoundingHacks, float& resultWidth, bool shouldInsertEllipsis, float customTruncationElementWidth)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> m_is8Bit = false;
</span><span class="cx"> }
</span><span class="cx"> #else
</span><del>- m_data.characters16 = s.characters();
</del><ins>+ m_data.characters16 = s.deprecatedCharacters();
</ins><span class="cx"> m_is8Bit = false;
</span><span class="cx"> #endif
</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 (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1015,7 +1015,7 @@
</span><span class="cx"> initDataView->set<uint32_t>(0, keyURISize, true);
</span><span class="cx">
</span><span class="cx"> RefPtr<Uint16Array> keyURIArray = Uint16Array::create(initDataBuffer, 4, keyURI.length());
</span><del>- keyURIArray->setRange(keyURI.characters(), keyURI.length() / sizeof(unsigned char), 0);
</del><ins>+ keyURIArray->setRange(keyURI.deprecatedCharacters(), keyURI.length() / sizeof(unsigned char), 0);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx"> if (!player()->keyNeeded("com.apple.lskd", emptyString(), static_cast<const unsigned char*>(initDataBuffer->data()), initDataBuffer->byteLength()))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDataBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormDataBuilder.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormDataBuilder.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/network/FormDataBuilder.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // FIXME: This loses data irreversibly if the filename includes characters you can't encode
</span><span class="cx"> // in the website's character set.
</span><span class="cx"> append(buffer, "; filename=\"");
</span><del>- appendQuotedString(buffer, encoding.encode(filename.characters(), filename.length(), QuestionMarksForUnencodables));
</del><ins>+ appendQuotedString(buffer, encoding.encode(filename.deprecatedCharacters(), filename.length(), QuestionMarksForUnencodables));
</ins><span class="cx"> append(buffer, '"');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteStatementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> if (text.isEmpty() && !text.isNull())
</span><span class="cx"> characters = &anyCharacter;
</span><span class="cx"> else
</span><del>- characters = text.characters();
</del><ins>+ characters = text.deprecatedCharacters();
</ins><span class="cx">
</span><span class="cx"> return bindBlob(index, characters, text.length() * sizeof(UChar));
</span><span class="cx"> }
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> if (text.isEmpty() && !text.isNull())
</span><span class="cx"> characters = &anyCharacter;
</span><span class="cx"> else
</span><del>- characters = text.characters();
</del><ins>+ characters = text.deprecatedCharacters();
</ins><span class="cx">
</span><span class="cx"> return sqlite3_bind_text16(m_statement, index, characters, sizeof(UChar) * text.length(), SQLITE_TRANSIENT);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextDecodeEscapeSequencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/DecodeEscapeSequences.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/DecodeEscapeSequences.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/text/DecodeEscapeSequences.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String decoded = EscapeSequence::decodeRun(string.characters() + encodedRunPosition, encodedRunEnd - encodedRunPosition, encoding);
</del><ins>+ String decoded = EscapeSequence::decodeRun(string.deprecatedCharacters() + encodedRunPosition, encodedRunEnd - encodedRunPosition, encoding);
</ins><span class="cx"> if (decoded.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> if (s.is8Bit() && !s.contains('\r'))
</span><span class="cx"> return stringLength;
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(s.characters(), stringLength);
</del><ins>+ NonSharedCharacterBreakIterator it(s.deprecatedCharacters(), stringLength);
</ins><span class="cx"> if (!it)
</span><span class="cx"> return stringLength;
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if (s.is8Bit() && !s.contains('\r'))
</span><span class="cx"> return std::min(stringLength, numGraphemeClusters);
</span><span class="cx">
</span><del>- NonSharedCharacterBreakIterator it(s.characters(), stringLength);
</del><ins>+ NonSharedCharacterBreakIterator it(s.deprecatedCharacters(), stringLength);
</ins><span class="cx"> if (!it)
</span><span class="cx"> return std::min(stringLength, numGraphemeClusters);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> UParseError parseStatus;
</span><span class="cx"> UErrorCode openStatus = U_ZERO_ERROR;
</span><span class="cx"> String rules(breakRules);
</span><del>- TextBreakIterator* iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
</del><ins>+ TextBreakIterator* iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.deprecatedCharacters(), rules.length(), 0, 0, &parseStatus, &openStatus));
</ins><span class="cx"> ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
</span><span class="cx"> return iterator;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextCodecICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextCodecICU.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> if (shouldShowBackslashAsCurrencySymbolIn(m_encodingName)) {
</span><span class="cx"> copy.append(characters, length);
</span><span class="cx"> copy.replace('\\', 0xA5);
</span><del>- source = copy.characters();
</del><ins>+ source = copy.deprecatedCharacters();
</ins><span class="cx"> sourceLimit = source + copy.length();
</span><span class="cx"> } else {
</span><span class="cx"> source = characters;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -5460,7 +5460,7 @@
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters8(), text->textLength(), style, expansion);
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters16(), text->textLength(), style, expansion);
</span><span class="cx"> #else
</span><del>- return constructTextRunInternal(context, font, text->characters(), text->textLength(), style, expansion);
</del><ins>+ return constructTextRunInternal(context, font, text->deprecatedCharacters(), text->textLength(), style, expansion);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5472,7 +5472,7 @@
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters8() + offset, length, style, expansion);
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters16() + offset, length, style, expansion);
</span><span class="cx"> #else
</span><del>- return constructTextRunInternal(context, font, text->characters() + offset, length, style, expansion);
</del><ins>+ return constructTextRunInternal(context, font, text->deprecatedCharacters() + offset, length, style, expansion);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5484,7 +5484,7 @@
</span><span class="cx"> return constructTextRunInternal(context, font, string.characters8(), length, style, expansion, flags);
</span><span class="cx"> return constructTextRunInternal(context, font, string.characters16(), length, style, expansion, flags);
</span><span class="cx"> #else
</span><del>- return constructTextRunInternal(context, font, string.characters(), length, style, expansion, flags);
</del><ins>+ return constructTextRunInternal(context, font, string.deprecatedCharacters(), length, style, expansion, flags);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1351,7 +1351,7 @@
</span><span class="cx"> reversedText.reserveCapacity(length);
</span><span class="cx"> for (int i = length - 1; i >= 0; --i)
</span><span class="cx"> reversedText.append(m_text[i]);
</span><del>- textRun.setText(reversedText.characters(), length);
</del><ins>+ textRun.setText(reversedText.deprecatedCharacters(), length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const UChar suffix = listMarkerSuffix(type, m_listItem.value());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> fragmentWithHyphen.append(word + suffixStart, fragmentLength);
</span><span class="cx"> fragmentWithHyphen.append(style.hyphenString());
</span><span class="cx">
</span><del>- TextRun run = RenderBlock::constructTextRun(renderer, font, fragmentWithHyphen.characters(), fragmentWithHyphen.length(), style);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(renderer, font, fragmentWithHyphen.deprecatedCharacters(), fragmentWithHyphen.length(), style);
</ins><span class="cx"> run.setCharactersLength(fragmentWithHyphen.length());
</span><span class="cx"> run.setCharacterScanForCodePath(!renderer->canUseSimpleFontCodePath());
</span><span class="cx"> float fragmentWidth = font.width(run, &fallbackFonts, &glyphOverflow);
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx">
</span><span class="cx"> if (w > maxWordWidth) {
</span><span class="cx"> int suffixStart;
</span><del>- float maxFragmentWidth = maxWordFragmentWidth(this, style, font, characters() + i, wordLen, minimumPrefixLength, minimumSuffixLength, suffixStart, fallbackFonts, glyphOverflow);
</del><ins>+ float maxFragmentWidth = maxWordFragmentWidth(this, style, font, deprecatedCharacters() + i, wordLen, minimumPrefixLength, minimumSuffixLength, suffixStart, fallbackFonts, glyphOverflow);
</ins><span class="cx">
</span><span class="cx"> if (suffixStart) {
</span><span class="cx"> float suffixWidth;
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isAllASCII() || m_text.is8Bit())
</span><span class="cx"> return true;
</span><del>- return Font::characterRangeCodePath(characters(), length()) == Font::Simple;
</del><ins>+ return Font::characterRangeCodePath(characters16(), length()) == Font::Simple;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderText::momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/RenderText.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -77,7 +77,8 @@
</span><span class="cx"> bool is8Bit() const { return m_text.is8Bit(); }
</span><span class="cx"> const LChar* characters8() const { return m_text.impl()->characters8(); }
</span><span class="cx"> const UChar* characters16() const { return m_text.impl()->characters16(); }
</span><del>- const UChar* characters() const { return m_text.characters(); }
</del><ins>+ const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
+ const UChar* deprecatedCharacters() const { return m_text.deprecatedCharacters(); }
</ins><span class="cx"> UChar characterAt(unsigned i) const { return is8Bit() ? characters8()[i] : characters16()[i]; }
</span><span class="cx"> UChar operator[](unsigned i) const { return characterAt(i); }
</span><span class="cx"> unsigned textLength() const { return m_text.impl()->length(); } // non virtual implementation of length()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx"> if (prefixLength < minimumPrefixLength)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- prefixLength = lastHyphenLocation(text->characters() + lastSpace, pos - lastSpace, std::min(prefixLength, pos - lastSpace - minimumSuffixLength) + 1, localeIdentifier);
</del><ins>+ prefixLength = lastHyphenLocation(text->deprecatedCharacters() + lastSpace, pos - lastSpace, std::min(prefixLength, pos - lastSpace - minimumSuffixLength) + 1, localeIdentifier);
</ins><span class="cx"> if (!prefixLength || prefixLength < minimumPrefixLength)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(style);
</span><span class="cx">
</span><del>- TextRun run(renderer().characters() + fragment.characterOffset
</del><ins>+ TextRun run(renderer().deprecatedCharacters() + fragment.characterOffset
</ins><span class="cx"> , fragment.length
</span><span class="cx"> , 0 /* xPos, only relevant with allowTabs=true */
</span><span class="cx"> , 0 /* padding, only relevant for justified text, not relevant for SVG */
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* characters = text->characters();
</del><ins>+ const UChar* characters = text->deprecatedCharacters();
</ins><span class="cx"> unsigned textLength = text->textLength();
</span><span class="cx"> for (unsigned textPosition = 0; textPosition < textLength; ++textPosition) {
</span><span class="cx"> const UChar* currentCharacter = characters + textPosition;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutEnginecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> Vector<SVGTextMetrics>& visualMetricsValues = text->layoutAttributes()->textMetricsValues();
</span><span class="cx"> ASSERT(!visualMetricsValues.isEmpty());
</span><span class="cx">
</span><del>- const UChar* characters = text->characters();
</del><ins>+ const UChar* characters = text->deprecatedCharacters();
</ins><span class="cx"> const Font& font = style->font();
</span><span class="cx">
</span><span class="cx"> SVGTextLayoutEngineSpacing spacingLayout(font);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> SVGTextMetrics SVGTextMetrics::measureCharacterRange(RenderSVGInlineText* text, unsigned position, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(text);
</span><del>- return SVGTextMetrics(text, constructTextRun(text, text->characters(), position, length));
</del><ins>+ return SVGTextMetrics(text, constructTextRun(text, text->deprecatedCharacters(), position, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SVGTextMetrics::SVGTextMetrics(RenderSVGInlineText* text, unsigned position, unsigned length, float width, const String& glyphName)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> m_height = text->scaledFont().fontMetrics().floatHeight() / scalingFactor;
</span><span class="cx"> if (needsContext) {
</span><span class="cx"> m_glyph.isValid = true;
</span><del>- m_glyph.unicodeString = String(text->characters() + position, length);
</del><ins>+ m_glyph.unicodeString = String(text->deprecatedCharacters() + position, length);
</ins><span class="cx"> m_glyph.name = glyphName;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricsBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> m_totalWidth = 0;
</span><span class="cx">
</span><span class="cx"> const Font& scaledFont = text->scaledFont();
</span><del>- m_run = SVGTextMetrics::constructTextRun(text, text->characters(), 0, text->textLength());
</del><ins>+ m_run = SVGTextMetrics::constructTextRun(text, text->deprecatedCharacters(), 0, text->textLength());
</ins><span class="cx"> m_isComplexText = scaledFont.codePath(m_run) == Font::Complex;
</span><span class="cx">
</span><span class="cx"> if (m_isComplexText)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnglecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAngle.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAngle.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGAngle.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float valueInSpecifiedUnits = 0;
</span><del>- const UChar* ptr = value.characters();
</del><ins>+ const UChar* ptr = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + value.length();
</span><span class="cx">
</span><span class="cx"> if (!parseNumber(ptr, end, valueInSpecifiedUnits, false)) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimateMotionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (s.isEmpty())
</span><span class="cx"> return false;
</span><del>- const UChar* cur = s.characters();
</del><ins>+ const UChar* cur = s.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = cur + s.length();
</span><span class="cx">
</span><span class="cx"> if (!skipOptionalSVGSpaces(cur, end))
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimationElement.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimationElement.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGAnimationElement.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> result.clear();
</span><span class="cx"> if (parse.isEmpty())
</span><span class="cx"> return;
</span><del>- const UChar* cur = parse.characters();
</del><ins>+ const UChar* cur = parse.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = cur + parse.length();
</span><span class="cx">
</span><span class="cx"> skipOptionalSVGSpaces(cur, end);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFitToViewBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFitToViewBox.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFitToViewBox.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGFitToViewBox.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> bool SVGFitToViewBox::parseViewBox(Document* doc, const String& s, FloatRect& viewBox)
</span><span class="cx"> {
</span><del>- const UChar* c = s.characters();
</del><ins>+ const UChar* c = s.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = c + s.length();
</span><span class="cx"> return parseViewBox(doc, c, end, viewBox, true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontData.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontData.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGFontData.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (mirror)
</span><del>- remainingTextInRun = createStringWithMirroredCharacters(remainingTextInRun.characters(), remainingTextInRun.length());
</del><ins>+ remainingTextInRun = createStringWithMirroredCharacters(remainingTextInRun.deprecatedCharacters(), remainingTextInRun.length());
</ins><span class="cx"> if (!currentCharacter && arabicForms.isEmpty())
</span><span class="cx"> arabicForms = charactersWithArabicForm(remainingTextInRun, mirror);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGGlyphMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGGlyphMap.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGGlyphMap.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGGlyphMap.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> UChar32 character = 0;
</span><span class="cx"> unsigned clusterLength = 0;
</span><del>- SurrogatePairAwareTextIterator textIterator(unicodeString.characters(), 0, length, length);
</del><ins>+ SurrogatePairAwareTextIterator textIterator(unicodeString.deprecatedCharacters(), 0, length, length);
</ins><span class="cx"> while (textIterator.consume(character, clusterLength)) {
</span><span class="cx"> node = currentLayer->get(character);
</span><span class="cx"> if (!node) {
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> {
</span><span class="cx"> GlyphMapLayer* currentLayer = &m_rootLayer;
</span><span class="cx">
</span><del>- const UChar* characters = string.characters();
</del><ins>+ const UChar* characters = string.deprecatedCharacters();
</ins><span class="cx"> size_t length = string.length();
</span><span class="cx">
</span><span class="cx"> UChar32 character = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGGlyphRefElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGGlyphRefElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><del>- const UChar* startPtr = value.characters();
</del><ins>+ const UChar* startPtr = value.string().deprecatedCharacters();
</ins><span class="cx"> const UChar* endPtr = startPtr + value.length();
</span><span class="cx">
</span><span class="cx"> // FIXME: We need some error handling here.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGLengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGLength.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGLength.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGLength.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> float convertedNumber = 0;
</span><del>- const UChar* ptr = string.characters();
</del><ins>+ const UChar* ptr = string.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + string.length();
</span><span class="cx">
</span><span class="cx"> if (!parseNumber(ptr, end, convertedNumber, false)) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGLengthListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGLengthList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGLengthList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGLengthList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> clear();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx">
</span><del>- const UChar* ptr = value.characters();
</del><ins>+ const UChar* ptr = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + value.length();
</span><span class="cx"> while (ptr < end) {
</span><span class="cx"> const UChar* start = ptr;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGNumberListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGNumberList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGNumberList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGNumberList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> clear();
</span><span class="cx">
</span><span class="cx"> float number = 0;
</span><del>- const UChar* ptr = value.characters();
</del><ins>+ const UChar* ptr = value.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + value.length();
</span><span class="cx">
</span><span class="cx"> // The spec strangely doesn't allow leading whitespace. We might choose to violate that intentionally. (section 4.1)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGParserUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGParserUtilities.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGParserUtilities.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGParserUtilities.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> bool parseNumberFromString(const String& string, float& number, bool skip)
</span><span class="cx"> {
</span><del>- const UChar* ptr = string.characters();
</del><ins>+ const UChar* ptr = string.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + string.length();
</span><span class="cx"> return genericParseNumber(ptr, end, number, skip) && ptr == end;
</span><span class="cx"> }
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (s.isEmpty())
</span><span class="cx"> return false;
</span><del>- const UChar* cur = s.characters();
</del><ins>+ const UChar* cur = s.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = cur + s.length();
</span><span class="cx">
</span><span class="cx"> if (!parseNumber(cur, end, x))
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> bool parseRect(const String& string, FloatRect& rect)
</span><span class="cx"> {
</span><del>- const UChar* ptr = string.characters();
</del><ins>+ const UChar* ptr = string.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + string.length();
</span><span class="cx"> skipOptionalSVGSpaces(ptr, end);
</span><span class="cx">
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (points.isEmpty())
</span><span class="cx"> return true;
</span><del>- const UChar* cur = points.characters();
</del><ins>+ const UChar* cur = points.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = cur + points.length();
</span><span class="cx">
</span><span class="cx"> skipOptionalSVGSpaces(cur, end);
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> // FIXME: Parsing error detection is missing.
</span><span class="cx"> values.clear();
</span><span class="cx">
</span><del>- const UChar* ptr = input.characters();
</del><ins>+ const UChar* ptr = input.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + input.length();
</span><span class="cx"> skipOptionalSVGSpaces(ptr, end);
</span><span class="cx">
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> bool parseKerningUnicodeString(const String& input, UnicodeRanges& rangeList, HashSet<String>& stringList)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Parsing error detection is missing.
</span><del>- const UChar* ptr = input.characters();
</del><ins>+ const UChar* ptr = input.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + input.length();
</span><span class="cx">
</span><span class="cx"> while (ptr < end) {
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<String> values;
</span><span class="cx">
</span><del>- const UChar* ptr = input.characters();
</del><ins>+ const UChar* ptr = input.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + input.length();
</span><span class="cx"> skipOptionalSVGSpaces(ptr, end);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPreserveAspectRatiocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGPreserveAspectRatio.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPreserveAspectRatio.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGPreserveAspectRatio.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGPreserveAspectRatio::parse(const String& value)
</span><span class="cx"> {
</span><del>- const UChar* begin = value.characters();
</del><ins>+ const UChar* begin = value.deprecatedCharacters();
</ins><span class="cx"> parse(begin, begin + value.length(), true);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGStringListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGStringList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGStringList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGStringList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> // TODO : more error checking/reporting
</span><span class="cx"> clear();
</span><span class="cx">
</span><del>- const UChar* ptr = data.characters();
</del><ins>+ const UChar* ptr = data.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = ptr + data.length();
</span><span class="cx"> while (ptr < end) {
</span><span class="cx"> const UChar* start = ptr;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTransformListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTransformList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTransformList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGTransformList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGTransformList::parse(const String& transform)
</span><span class="cx"> {
</span><del>- const UChar* start = transform.characters();
</del><ins>+ const UChar* start = transform.deprecatedCharacters();
</ins><span class="cx"> if (!SVGTransformable::parseTransformAttribute(*this, start, start + transform.length()))
</span><span class="cx"> clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTransformablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTransformable.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTransformable.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGTransformable.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> SVGTransform::SVGTransformType SVGTransformable::parseTransformType(const String& typeString)
</span><span class="cx"> {
</span><span class="cx"> unsigned short type = SVGTransform::SVG_TRANSFORM_UNKNOWN;
</span><del>- const UChar* characters = typeString.characters();
</del><ins>+ const UChar* characters = typeString.deprecatedCharacters();
</ins><span class="cx"> parseAndSkipType(characters, characters + typeString.length(), type);
</span><span class="cx"> return static_cast<SVGTransform::SVGTransformType>(type);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGViewSpeccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGViewSpec.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGViewSpec.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGViewSpec.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> bool SVGViewSpec::parseViewSpec(const String& viewSpec)
</span><span class="cx"> {
</span><del>- const UChar* currViewSpec = viewSpec.characters();
</del><ins>+ const UChar* currViewSpec = viewSpec.deprecatedCharacters();
</ins><span class="cx"> const UChar* end = currViewSpec + viewSpec.length();
</span><span class="cx">
</span><span class="cx"> if (currViewSpec >= end || !m_contextElement)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGZoomAndPanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGZoomAndPan.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(target);
</span><span class="cx"> if (name == SVGNames::zoomAndPanAttr) {
</span><del>- const UChar* start = value.characters();
</del><ins>+ const UChar* start = value.string().deprecatedCharacters();
</ins><span class="cx"> const UChar* end = start + value.length();
</span><span class="cx"> SVGZoomAndPanType zoomAndPan = SVGZoomAndPanUnknown;
</span><span class="cx"> parseZoomAndPan(start, end, zoomAndPan);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: this should use value of document.inputEncoding to determine the encoding to use.
</span><span class="cx"> TextEncoding encoding = UTF8Encoding();
</span><del>- m_requestEntityBody = FormData::create(encoding.encode(body.characters(), body.length(), EntitiesForUnencodables));
</del><ins>+ m_requestEntityBody = FormData::create(encoding.encode(body.deprecatedCharacters(), body.length(), EntitiesForUnencodables));
</ins><span class="cx"> if (m_upload)
</span><span class="cx"> m_requestEntityBody->setAlwaysStream(true);
</span><span class="cx"> }
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> m_requestHeaders.set("Content-Type", contentType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_requestEntityBody = FormData::create(UTF8Encoding().encode(body.characters(), body.length(), EntitiesForUnencodables));
</del><ins>+ m_requestEntityBody = FormData::create(UTF8Encoding().encode(body.deprecatedCharacters(), body.length(), EntitiesForUnencodables));
</ins><span class="cx"> if (m_upload)
</span><span class="cx"> m_requestEntityBody->setAlwaysStream(true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);
</span><span class="cx">
</span><del>- const char* buffer = reinterpret_cast<const char*>(string.characters());
</del><ins>+ const char* buffer = reinterpret_cast<const char*>(string.deprecatedCharacters());
</ins><span class="cx"> int size = string.length() * sizeof(UChar);
</span><span class="cx">
</span><span class="cx"> xmlParserCtxtPtr ctxt = xmlCreateMemoryParserCtxt(buffer, size);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTUnicodeSortcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> String str1 = String::fromUTF8((const char*)results[j]->stringval);
</span><span class="cx"> String str2 = String::fromUTF8((const char*)results[j + incr]->stringval);
</span><del>- tst = collator.collate(str1.characters(), str1.length(), str2.characters(), str2.length());
</del><ins>+ tst = collator.collate(str1.deprecatedCharacters(), str1.length(), str2.deprecatedCharacters(), str2.length());
</ins><span class="cx"> }
</span><span class="cx"> if (descending)
</span><span class="cx"> tst = -tst;
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> String str1 = String::fromUTF8((const char*)res[j]->stringval);
</span><span class="cx"> String str2 = String::fromUTF8((const char*)res[j + incr]->stringval);
</span><del>- tst = collator.collate(str1.characters(), str1.length(), str2.characters(), str2.length());
</del><ins>+ tst = collator.collate(str1.deprecatedCharacters(), str1.length(), str2.deprecatedCharacters(), str2.length());
</ins><span class="cx"> }
</span><span class="cx"> if (desc)
</span><span class="cx"> tst = -tst;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx">
</span><span class="cx"> switchToUTF16(context->context());
</span><span class="cx"> XMLDocumentParserScope scope(document()->cachedResourceLoader());
</span><del>- xmlParseChunk(context->context(), reinterpret_cast<const char*>(parseString.characters()), sizeof(UChar) * parseString.length(), 0);
</del><ins>+ xmlParseChunk(context->context(), reinterpret_cast<const char*>(parseString.deprecatedCharacters()), sizeof(UChar) * parseString.length(), 0);
</ins><span class="cx">
</span><span class="cx"> // JavaScript (which may be run under the xmlParseChunk callstack) may
</span><span class="cx"> // cause the parser to be stopped or detached.
</span><span class="lines">@@ -1536,7 +1536,7 @@
</span><span class="cx"> sax.initialized = XML_SAX2_MAGIC;
</span><span class="cx"> RefPtr<XMLParserContext> parser = XMLParserContext::createStringParser(&sax, &state);
</span><span class="cx"> String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />";
</span><del>- xmlParseChunk(parser->context(), reinterpret_cast<const char*>(parseString.characters()), parseString.length() * sizeof(UChar), 1);
</del><ins>+ xmlParseChunk(parser->context(), reinterpret_cast<const char*>(parseString.deprecatedCharacters()), parseString.length() * sizeof(UChar), 1);
</ins><span class="cx"> attrsOK = state.gotAttributes;
</span><span class="cx"> return state.attributes;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Add deprecatedCharacters as a synonym for characters and convert most call sites
+ https://bugs.webkit.org/show_bug.cgi?id=126858
+
+ Reviewed by Anders Carlsson.
+
+ * History/BinaryPropertyList.cpp:
+ (BinaryPropertyListSerializer::appendStringObject):
+ Use deprecatedCharacters instead of characters.
+
+2014-01-12 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Add type checking to isEqual methods
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126862
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBinaryPropertyListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> void BinaryPropertyListSerializer::appendStringObject(const String& string)
</span><span class="cx"> {
</span><span class="cx"> startObject();
</span><del>- const UChar* characters = string.characters();
</del><ins>+ const UChar* characters = string.deprecatedCharacters();
</ins><span class="cx"> unsigned length = string.length();
</span><span class="cx"> if (charactersAreAllASCII(characters, length)) {
</span><span class="cx"> if (length <= maxLengthInMarkerByte)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Add deprecatedCharacters as a synonym for characters and convert most call sites
+ https://bugs.webkit.org/show_bug.cgi?id=126858
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/APIString.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::checkTextOfParagraph):
+ (WebKit::WebPageProxy::checkSpellingOfString):
+ (WebKit::WebPageProxy::checkGrammarOfString):
+ * WebProcess/WebPage/EncoderAdapter.cpp:
+ (WebKit::EncoderAdapter::encodeString):
+ Use deprecatedCharacters instead of characters.
+
+2014-01-12 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Add type checking to isEqual methods
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126862
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIString.h (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIString.h 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit2/Shared/APIString.h 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (!bufferLength)
</span><span class="cx"> return 0;
</span><span class="cx"> bufferLength = std::min(bufferLength, static_cast<size_t>(m_string.length()));
</span><del>- memcpy(buffer, m_string.characters(), bufferLength * sizeof(UChar));
</del><ins>+ memcpy(buffer, m_string.deprecatedCharacters(), bufferLength * sizeof(UChar));
</ins><span class="cx"> return bufferLength;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if (!bufferSize)
</span><span class="cx"> return 0;
</span><span class="cx"> char* p = buffer;
</span><del>- const UChar* d = m_string.characters();
</del><ins>+ const UChar* d = m_string.deprecatedCharacters();
</ins><span class="cx"> WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + m_string.length(), &p, p + bufferSize - 1, /* strict */ true);
</span><span class="cx"> *p++ = '\0';
</span><span class="cx"> if (result != WTF::Unicode::conversionOK && result != WTF::Unicode::targetExhausted)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -3373,18 +3373,18 @@
</span><span class="cx"> #if USE(UNIFIED_TEXT_CHECKING)
</span><span class="cx"> void WebPageProxy::checkTextOfParagraph(const String& text, uint64_t checkingTypes, Vector<TextCheckingResult>& results)
</span><span class="cx"> {
</span><del>- results = TextChecker::checkTextOfParagraph(spellDocumentTag(), text.characters(), text.length(), checkingTypes);
</del><ins>+ results = TextChecker::checkTextOfParagraph(spellDocumentTag(), text.deprecatedCharacters(), text.length(), checkingTypes);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::checkSpellingOfString(const String& text, int32_t& misspellingLocation, int32_t& misspellingLength)
</span><span class="cx"> {
</span><del>- TextChecker::checkSpellingOfString(spellDocumentTag(), text.characters(), text.length(), misspellingLocation, misspellingLength);
</del><ins>+ TextChecker::checkSpellingOfString(spellDocumentTag(), text.deprecatedCharacters(), text.length(), misspellingLocation, misspellingLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::checkGrammarOfString(const String& text, Vector<GrammarDetail>& grammarDetails, int32_t& badGrammarLocation, int32_t& badGrammarLength)
</span><span class="cx"> {
</span><del>- TextChecker::checkGrammarOfString(spellDocumentTag(), text.characters(), text.length(), grammarDetails, badGrammarLocation, badGrammarLength);
</del><ins>+ TextChecker::checkGrammarOfString(spellDocumentTag(), text.deprecatedCharacters(), text.length(), grammarDetails, badGrammarLocation, badGrammarLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::spellingUIIsShowing(bool& isShowing)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEncoderAdaptercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp (161850 => 161851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2014-01-13 02:27:42 UTC (rev 161850)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2014-01-13 02:29:47 UTC (rev 161851)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t lengthInBytes = length * sizeof(UChar);
</span><span class="cx"> m_encoder << lengthInBytes;
</span><del>- m_encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.characters()), length * sizeof(UChar), alignof(UChar));
</del><ins>+ m_encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.deprecatedCharacters()), length * sizeof(UChar), alignof(UChar));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>