<!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>[165715] trunk/Source/WebKit</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/165715">165715</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-16 19:44:57 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebKit/mac: Remove all deprecatedCharacters use from WebKit directory
https://bugs.webkit.org/show_bug.cgi?id=130305
Reviewed by Andreas Kling.
* History/BinaryPropertyList.cpp:
(BinaryPropertyListSerializer::appendStringObject): Use operator[]
instead of deprecatedCharacters.
Source/WebKit/win: Remove all deprecatedCharacters use from WebKit
https://bugs.webkit.org/show_bug.cgi?id=130305
Reviewed by Andreas Kling.
* AccessibleTextImpl.cpp:
(AccessibleText::get_text): Use BString instead of SysAllocStringLen,
which handles String directly.
(AccessibleText::get_textBeforeOffset): Ditto.
(AccessibleText::get_textAfterOffset): Ditto.
(AccessibleText::get_textAtOffset): Ditto.
(AccessibleText::get_attributes): Ditto.
* DOMCSSClasses.cpp:
(DOMCSSStyleDeclaration::getPropertyValue): Ditto.
* DOMCoreClasses.cpp:
(DOMNode::nodeValue): Ditto.
(DOMElement::getAttribute): Ditto.
(DOMElement::font): Rework this to leak a string, since it returns a
pointer to a font family name's characters with no defined lifetime.
* DOMHTMLClasses.cpp:
(DOMHTMLElement::innerText): Use BString's String-based constructor,
instead of explicitly passing a character pointer.
(DOMHTMLFormElement::action): Ditto.
(DOMHTMLFormElement::method): Ditto.
(DOMHTMLInputElement::value): Ditto.
(DOMHTMLTextAreaElement::value): Ditto.
* MarshallingHelpers.cpp:
(MarshallingHelpers::PathStringToFileCFURLRef): Use String::createCFString.
* WebCoreSupport/WebEditorClient.cpp:
(WebEditorClient::checkSpellingOfString): Use StringView::upconvertedCharacters.
(WebEditorClient::checkGrammarOfString): Ditto.
* WebDataSource.cpp:
(WebDataSource::unreachableURL): Use BString's String-based constructor,
instead of explicitly passing a character pointer.
* WebDownload.cpp:
(WebDownload::bundlePathForTargetPath): Use BString instead of SysAllocStringLen.
* WebDownloadCFNet.cpp:
(WebDownload::didFinish): Use BString's String-based constructor,
instead of explicitly passing a character pointer.
* WebDownloadCurl.cpp:
(WebDownload::didReceiveResponse): Ditto.
* WebElementPropertyBag.cpp:
(convertStringToVariant): Use BString instead of SysAllocStringLen.
* WebFrame.cpp:
(WebFrame::searchForLabelsBeforeElement): Ditto.
(WebFrame::matchLabelsAgainstElement): Ditto.
* WebHistory.cpp:
(WebHistory::addVisitedLinksToPageGroup): Use a better loop and call
visitedLinkHash, since it can take a String.
* WebKitGraphics.cpp:
(CenterTruncateStringToWidth): Use StringView::getCharactersWithUpconvert.
(RightTruncateStringToWidth): Ditto.
* WebView.cpp:
(WebView::applicationNameForUserAgent): Use BString instead of SysAllocStringLen.
(WebView::customUserAgent): Ditto.
(WebView::groupName): Ditto.
(WebView::selectedText): Ditto.
(WebView::onIMERequestReconvertString): Use StringView::getCharactersWithUpconvert.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKitwinAccessibleTextImplcpp">trunk/Source/WebKit/win/AccessibleTextImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMCSSClassescpp">trunk/Source/WebKit/win/DOMCSSClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassescpp">trunk/Source/WebKit/win/DOMCoreClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinDOMHTMLClassescpp">trunk/Source/WebKit/win/DOMHTMLClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinMarshallingHelperscpp">trunk/Source/WebKit/win/MarshallingHelpers.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDataSourcecpp">trunk/Source/WebKit/win/WebDataSource.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDownloadcpp">trunk/Source/WebKit/win/WebDownload.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDownloadCFNetcpp">trunk/Source/WebKit/win/WebDownloadCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDownloadCurlcpp">trunk/Source/WebKit/win/WebDownloadCurl.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebElementPropertyBagcpp">trunk/Source/WebKit/win/WebElementPropertyBag.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistorycpp">trunk/Source/WebKit/win/WebHistory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitGraphicscpp">trunk/Source/WebKit/win/WebKitGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-16 Darin Adler <darin@apple.com>
+
+ Remove all deprecatedCharacters use from WebKit directory
+ https://bugs.webkit.org/show_bug.cgi?id=130305
+
+ Reviewed by Andreas Kling.
+
+ * History/BinaryPropertyList.cpp:
+ (BinaryPropertyListSerializer::appendStringObject): Use operator[]
+ instead of deprecatedCharacters.
+
</ins><span class="cx"> 2014-03-14 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the production build.
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBinaryPropertyListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -691,9 +691,8 @@
</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.deprecatedCharacters();
</del><span class="cx"> unsigned length = string.length();
</span><del>- if (charactersAreAllASCII(characters, length)) {
</del><ins>+ if (string.containsOnlyASCII()) {
</ins><span class="cx"> if (length <= maxLengthInMarkerByte)
</span><span class="cx"> appendByte(static_cast<unsigned char>(asciiStringMarkerByte | length));
</span><span class="cx"> else {
</span><span class="lines">@@ -701,7 +700,7 @@
</span><span class="cx"> appendInteger(length);
</span><span class="cx"> }
</span><span class="cx"> for (unsigned i = 0; i < length; ++i)
</span><del>- appendByte(characters[i]);
</del><ins>+ appendByte(string[i]);
</ins><span class="cx"> } else {
</span><span class="cx"> if (length <= maxLengthInMarkerByte)
</span><span class="cx"> appendByte(static_cast<unsigned char>(unicodeStringMarkerByte | length));
</span><span class="lines">@@ -710,8 +709,8 @@
</span><span class="cx"> appendInteger(length);
</span><span class="cx"> }
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- appendByte(characters[i] >> 8);
- appendByte(characters[i]);
</del><ins>+ appendByte(string[i] >> 8);
+ appendByte(string[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinAccessibleTextImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleTextImpl.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> endOffset = convertSpecialOffset(endOffset);
</span><span class="cx"> WTF::String substringText = m_object->stringValue().substring(startOffset, endOffset - startOffset);
</span><span class="cx">
</span><del>- *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
</del><ins>+ *text = BString(substringText).release();
</ins><span class="cx"> if (substringText.length() && !*text)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx">
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
</span><del>- *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
</del><ins>+ *text = BString(substringText).release();
</ins><span class="cx">
</span><span class="cx"> if (substringText.length() && !*text)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
</span><del>- *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
</del><ins>+ *text = BString(substringText).release();
</ins><span class="cx"> if (substringText.length() && !*text)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx">
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
</span><del>- *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
</del><ins>+ *text = BString(substringText).release();
</ins><span class="cx">
</span><span class="cx"> if (substringText.length() && !*text)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx"> HRESULT AccessibleText::get_attributes(BSTR* attributes)
</span><span class="cx"> {
</span><span class="cx"> WTF::String text("text-model:a1");
</span><del>- *attributes = SysAllocStringLen(text.deprecatedCharacters(), text.length());
</del><ins>+ *attributes = BString(text).release();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/ChangeLog 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2014-03-16 Darin Adler <darin@apple.com>
+
+ Remove all deprecatedCharacters use from WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=130305
+
+ Reviewed by Andreas Kling.
+
+ * AccessibleTextImpl.cpp:
+ (AccessibleText::get_text): Use BString instead of SysAllocStringLen,
+ which handles String directly.
+ (AccessibleText::get_textBeforeOffset): Ditto.
+ (AccessibleText::get_textAfterOffset): Ditto.
+ (AccessibleText::get_textAtOffset): Ditto.
+ (AccessibleText::get_attributes): Ditto.
+ * DOMCSSClasses.cpp:
+ (DOMCSSStyleDeclaration::getPropertyValue): Ditto.
+ * DOMCoreClasses.cpp:
+ (DOMNode::nodeValue): Ditto.
+ (DOMElement::getAttribute): Ditto.
+ (DOMElement::font): Rework this to leak a string, since it returns a
+ pointer to a font family name's characters with no defined lifetime.
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLElement::innerText): Use BString's String-based constructor,
+ instead of explicitly passing a character pointer.
+ (DOMHTMLFormElement::action): Ditto.
+ (DOMHTMLFormElement::method): Ditto.
+ (DOMHTMLInputElement::value): Ditto.
+ (DOMHTMLTextAreaElement::value): Ditto.
+
+ * MarshallingHelpers.cpp:
+ (MarshallingHelpers::PathStringToFileCFURLRef): Use String::createCFString.
+
+ * WebCoreSupport/WebEditorClient.cpp:
+ (WebEditorClient::checkSpellingOfString): Use StringView::upconvertedCharacters.
+ (WebEditorClient::checkGrammarOfString): Ditto.
+
+ * WebDataSource.cpp:
+ (WebDataSource::unreachableURL): Use BString's String-based constructor,
+ instead of explicitly passing a character pointer.
+
+ * WebDownload.cpp:
+ (WebDownload::bundlePathForTargetPath): Use BString instead of SysAllocStringLen.
+
+ * WebDownloadCFNet.cpp:
+ (WebDownload::didFinish): Use BString's String-based constructor,
+ instead of explicitly passing a character pointer.
+ * WebDownloadCurl.cpp:
+ (WebDownload::didReceiveResponse): Ditto.
+
+ * WebElementPropertyBag.cpp:
+ (convertStringToVariant): Use BString instead of SysAllocStringLen.
+ * WebFrame.cpp:
+ (WebFrame::searchForLabelsBeforeElement): Ditto.
+ (WebFrame::matchLabelsAgainstElement): Ditto.
+
+ * WebHistory.cpp:
+ (WebHistory::addVisitedLinksToPageGroup): Use a better loop and call
+ visitedLinkHash, since it can take a String.
+
+ * WebKitGraphics.cpp:
+ (CenterTruncateStringToWidth): Use StringView::getCharactersWithUpconvert.
+ (RightTruncateStringToWidth): Ditto.
+
+ * WebView.cpp:
+ (WebView::applicationNameForUserAgent): Use BString instead of SysAllocStringLen.
+ (WebView::customUserAgent): Ditto.
+ (WebView::groupName): Ditto.
+ (WebView::selectedText): Ditto.
+ (WebView::onIMERequestReconvertString): Use StringView::getCharactersWithUpconvert.
+
</ins><span class="cx"> 2014-03-14 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace "Apple Computer, Inc." with "Apple Inc." in copyright headers
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCSSClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCSSClasses.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCSSClasses.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/DOMCSSClasses.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebKitDLL.h"
</span><span class="cx"> #include "DOMCSSClasses.h"
</span><span class="cx">
</span><ins>+#include <WebCore/BString.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> // DOMCSSStyleDeclaration - DOMCSSStyleDeclaration ----------------------------
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> WTF::String propertyNameString(propertyName);
</span><span class="cx"> WTF::String value = m_style->getPropertyValue(propertyNameString);
</span><del>- *result = SysAllocStringLen(value.deprecatedCharacters(), value.length());
</del><ins>+ *result = WebCore::BString(value).release();
</ins><span class="cx"> if (value.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> if (!m_node)
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> WTF::String nodeValueStr = m_node->nodeValue();
</span><del>- *result = SysAllocStringLen(nodeValueStr.deprecatedCharacters(), nodeValueStr.length());
</del><ins>+ *result = BString(nodeValueStr).release();
</ins><span class="cx"> if (nodeValueStr.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -1033,7 +1033,7 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> WTF::String nameString(name, SysStringLen(name));
</span><span class="cx"> WTF::String& attrValueString = (WTF::String&) m_element->getAttribute(nameString);
</span><del>- *result = SysAllocStringLen(attrValueString.deprecatedCharacters(), attrValueString.length());
</del><ins>+ *result = BString(attrValueString).release();
</ins><span class="cx"> if (attrValueString.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -1257,7 +1257,12 @@
</span><span class="cx">
</span><span class="cx"> FontDescription fontDescription = renderer->style().font().fontDescription();
</span><span class="cx"> AtomicString family = fontDescription.firstFamily();
</span><del>- webFontDescription->family = family.string().deprecatedCharacters();
</del><ins>+
+ // FIXME: This leaks. Delete this whole function to get rid of the leak.
+ UChar* familyCharactersBuffer = new UChar[family.length()];
+ StringView(family.string()).getCharactersWithUpconvert(familyCharactersBuffer);
+
+ webFontDescription->family = familyCharactersBuffer;
</ins><span class="cx"> webFontDescription->familyLength = family.length();
</span><span class="cx"> webFontDescription->size = fontDescription.computedSize();
</span><span class="cx"> webFontDescription->bold = fontDescription.weight() >= WebCore::FontWeight600;
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMHTMLClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMHTMLClasses.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_element && m_element->isHTMLElement());
</span><span class="cx"> WTF::String innerTextString = toHTMLElement(m_element)->innerText();
</span><del>- *result = BString(innerTextString.deprecatedCharacters(), innerTextString.length()).release();
</del><ins>+ *result = BString(innerTextString).release();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_element && isHTMLFormElement(m_element));
</span><span class="cx"> WTF::String actionString = toHTMLFormElement(m_element)->action();
</span><del>- *result = BString(actionString.deprecatedCharacters(), actionString.length()).release();
</del><ins>+ *result = BString(actionString).release();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_element && isHTMLFormElement(m_element));
</span><span class="cx"> WTF::String methodString = toHTMLFormElement(m_element)->method();
</span><del>- *result = BString(methodString.deprecatedCharacters(), methodString.length()).release();
</del><ins>+ *result = BString(methodString).release();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1210,7 +1210,7 @@
</span><span class="cx"> ASSERT(m_element && isHTMLInputElement(m_element));
</span><span class="cx"> HTMLInputElement* inputElement = toHTMLInputElement(m_element);
</span><span class="cx"> WTF::String valueString = inputElement->value();
</span><del>- *result = BString(valueString.deprecatedCharacters(), valueString.length()).release();
</del><ins>+ *result = BString(valueString).release();
</ins><span class="cx"> if (valueString.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> ASSERT(m_element && isHTMLTextAreaElement(m_element));
</span><span class="cx"> HTMLTextAreaElement* textareaElement = toHTMLTextAreaElement(m_element);
</span><span class="cx"> WTF::String valueString = textareaElement->value();
</span><del>- *result = BString(valueString.deprecatedCharacters(), valueString.length()).release();
</del><ins>+ *result = BString(valueString).release();
</ins><span class="cx"> if (valueString.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinMarshallingHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/MarshallingHelpers.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -51,10 +51,7 @@
</span><span class="cx">
</span><span class="cx"> CFURLRef MarshallingHelpers::PathStringToFileCFURLRef(const String& string)
</span><span class="cx"> {
</span><del>- CFStringRef cfPath = CFStringCreateWithCharactersNoCopy(0, (const UniChar*)string.deprecatedCharacters(), string.length(), kCFAllocatorNull);
- CFURLRef pathURL = CFURLCreateWithFileSystemPath(0, cfPath, kCFURLWindowsPathStyle, false);
- CFRelease(cfPath);
- return pathURL;
</del><ins>+ return CFURLCreateWithFileSystemPath(0, string.createCFString().get(), kCFURLWindowsPathStyle, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String MarshallingHelpers::FileCFURLRefToPathString(CFURLRef fileURL)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> initViewSpecificSpelling(m_webView);
</span><del>- ed->checkSpellingOfString(m_webView, text.toStringWithoutCopying().deprecatedCharacters(), text.length(), misspellingLocation, misspellingLength);
</del><ins>+ ed->checkSpellingOfString(m_webView, text.upconvertedCharacters(), text.length(), misspellingLocation, misspellingLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebEditorClient::getAutoCorrectSuggestionForMisspelledWord(const String& inputWord)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx">
</span><span class="cx"> initViewSpecificSpelling(m_webView);
</span><span class="cx"> COMPtr<IEnumWebGrammarDetails> enumDetailsObj;
</span><del>- if (FAILED(ed->checkGrammarOfString(m_webView, text.toStringWithoutCopying().deprecatedCharacters(), text.length(), &enumDetailsObj, badGrammarLocation, badGrammarLength)))
</del><ins>+ if (FAILED(ed->checkGrammarOfString(m_webView, text.upconvertedCharacters(), text.length(), &enumDetailsObj, badGrammarLocation, badGrammarLength)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> while (true) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDataSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDataSource.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDataSource.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebDataSource.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> /* [retval][out] */ BSTR* url)
</span><span class="cx"> {
</span><span class="cx"> URL unreachableURL = m_loader->unreachableURL();
</span><del>- BString urlString((LPOLESTR)unreachableURL.string().deprecatedCharacters(), unreachableURL.string().length());
</del><ins>+ BString urlString(unreachableURL.string());
</ins><span class="cx">
</span><span class="cx"> *url = urlString.release();
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDownload.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDownload.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebDownload.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> bundle.truncate(1);
</span><span class="cx">
</span><span class="cx"> bundle.append(DownloadBundle::fileExtension());
</span><del>- *bundlePath = SysAllocStringLen(bundle.deprecatedCharacters(), bundle.length());
</del><ins>+ *bundlePath = BString(bundle).release();
</ins><span class="cx"> if (!*bundlePath)
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDownloadCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDownloadCFNet.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDownloadCFNet.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebDownloadCFNet.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx">
</span><span class="cx"> bool reportBundlePathAsFinalPath = true;
</span><span class="cx">
</span><del>- BString destinationBSTR(m_destination.deprecatedCharacters(), m_destination.length());
</del><ins>+ BString destinationBSTR(m_destination);
</ins><span class="cx"> if (FAILED(m_delegate->decideDestinationWithSuggestedFilename(this, destinationBSTR)))
</span><span class="cx"> LOG_ERROR("delegate->decideDestinationWithSuggestedFilename() failed");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDownloadCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDownloadCurl.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDownloadCurl.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebDownloadCurl.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> if (suggestedFilename.isEmpty())
</span><span class="cx"> suggestedFilename = pathGetFileName(response.url().string());
</span><span class="cx"> suggestedFilename = decodeURLEscapeSequences(suggestedFilename);
</span><del>- BString suggestedFilenameBSTR(suggestedFilename.deprecatedCharacters(), suggestedFilename.length());
</del><ins>+ BString suggestedFilenameBSTR(suggestedFilename);
</ins><span class="cx"> m_delegate->decideDestinationWithSuggestedFilename(this, suggestedFilenameBSTR);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebElementPropertyBagcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebElementPropertyBag.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "DOMCoreClasses.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameLoaderClient.h"
</span><ins>+#include <WebCore/BString.h>
</ins><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/HitTestResult.h>
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx"> static HRESULT convertStringToVariant(VARIANT* pVar, const String& string)
</span><span class="cx"> {
</span><span class="cx"> V_VT(pVar) = VT_BSTR;
</span><del>- V_BSTR(pVar) = SysAllocStringLen(string.deprecatedCharacters(), string.length());
</del><ins>+ V_BSTR(pVar) = BString(string).release();
</ins><span class="cx"> if (string.length() && !V_BSTR(pVar))
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> bool resultIsInCellAbove;
</span><span class="cx"> String label = coreFrame->searchForLabelsBeforeElement(labelStrings, coreElement, &resultDistance, &resultIsInCellAbove);
</span><span class="cx">
</span><del>- *result = SysAllocStringLen(label.deprecatedCharacters(), label.length());
</del><ins>+ *result = BString(label).release();
</ins><span class="cx"> if (label.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> if (outResultDistance)
</span><span class="lines">@@ -1404,7 +1404,7 @@
</span><span class="cx">
</span><span class="cx"> String label = coreFrame->matchLabelsAgainstElement(labelStrings, coreElement);
</span><span class="cx">
</span><del>- *result = SysAllocStringLen(label.deprecatedCharacters(), label.length());
</del><ins>+ *result = BString(label).release();
</ins><span class="cx"> if (label.length() && !*result)
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistory.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -565,8 +565,6 @@
</span><span class="cx">
</span><span class="cx"> void WebHistory::addVisitedLinksToPageGroup(PageGroup& group)
</span><span class="cx"> {
</span><del>- for (auto it = m_entriesByURL.begin(); it != m_entriesByURL.end(); ++it) {
- const String& url = it->key;
- group.addVisitedLink(url.deprecatedCharacters(), url.length());
- }
</del><ins>+ for (auto& url : m_entriesByURL.keys())
+ group.addVisitedLinkHash(visitedLinkHash(url));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitGraphics.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/StringTruncator.h>
</span><span class="cx"> #include <WebCore/WebCoreTextRenderer.h>
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx"> FontCachePurgePreventer fontCachePurgePreventer;
</span><span class="cx">
</span><span class="cx"> String result = StringTruncator::centerTruncate(String(text, length), width, makeFont(description), StringTruncator::EnableRoundingHacks);
</span><del>- memcpy(buffer, result.deprecatedCharacters(), result.length() * sizeof(UChar));
</del><ins>+ StringView(result).getCharactersWithUpconvert(buffer);
</ins><span class="cx"> buffer[result.length()] = '\0';
</span><span class="cx"> return result.length();
</span><span class="cx"> }
</span><span class="lines">@@ -129,7 +130,7 @@
</span><span class="cx"> FontCachePurgePreventer fontCachePurgePreventer;
</span><span class="cx">
</span><span class="cx"> String result = StringTruncator::rightTruncate(String(text, length), width, makeFont(description), StringTruncator::EnableRoundingHacks);
</span><del>- memcpy(buffer, result.deprecatedCharacters(), result.length() * sizeof(UChar));
</del><ins>+ StringView(result).getCharactersWithUpconvert(buffer);
</ins><span class="cx"> buffer[result.length()] = '\0';
</span><span class="cx"> return result.length();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (165714 => 165715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-03-16 23:09:25 UTC (rev 165714)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-03-17 02:44:57 UTC (rev 165715)
</span><span class="lines">@@ -3178,7 +3178,7 @@
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::applicationNameForUserAgent(
</span><span class="cx"> /* [retval][out] */ BSTR* applicationName)
</span><span class="cx"> {
</span><del>- *applicationName = SysAllocStringLen(m_applicationName.deprecatedCharacters(), m_applicationName.length());
</del><ins>+ *applicationName = BString(m_applicationName).release();
</ins><span class="cx"> if (!*applicationName && m_applicationName.length())
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -3198,7 +3198,7 @@
</span><span class="cx"> *userAgentString = 0;
</span><span class="cx"> if (!m_userAgentOverridden)
</span><span class="cx"> return S_OK;
</span><del>- *userAgentString = SysAllocStringLen(m_userAgentCustom.deprecatedCharacters(), m_userAgentCustom.length());
</del><ins>+ *userAgentString = BString(m_userAgentCustom).release();
</ins><span class="cx"> if (!*userAgentString && m_userAgentCustom.length())
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -3646,7 +3646,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return S_OK;
</span><span class="cx"> String groupNameString = m_page->groupName();
</span><del>- *groupName = SysAllocStringLen(groupNameString.deprecatedCharacters(), groupNameString.length());
</del><ins>+ *groupName = BString(groupNameString).release();
</ins><span class="cx"> if (!*groupName && groupNameString.length())
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -3756,7 +3756,7 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><span class="cx"> String frameSelectedText = focusedFrame->editor().selectedText();
</span><del>- *text = SysAllocStringLen(frameSelectedText.deprecatedCharacters(), frameSelectedText.length());
</del><ins>+ *text = BString(frameSelectedText).release();
</ins><span class="cx"> if (!*text && frameSelectedText.length())
</span><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -5827,7 +5827,7 @@
</span><span class="cx"> reconvertString->dwStrLen = text.length();
</span><span class="cx"> reconvertString->dwTargetStrLen = text.length();
</span><span class="cx"> reconvertString->dwStrOffset = sizeof(RECONVERTSTRING);
</span><del>- memcpy(reconvertString + 1, text.deprecatedCharacters(), text.length() * sizeof(UChar));
</del><ins>+ StringView(text).getCharactersWithUpconvert(reinterpret_cast<UChar*>(reconvertString + 1));
</ins><span class="cx"> return totalSize;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>