<!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>[163257] trunk/Source/WebCore</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/163257">163257</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-02-01 20:59:36 -0800 (Sat, 01 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use deprecatedCharacters in a few more places (non-Mac-build sites found by EWS)
https://bugs.webkit.org/show_bug.cgi?id=128042
Reviewed by Sam Weinig.
* Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp:
(WebCore::IDBLevelDBCoding::encodeString):
* platform/graphics/win/FontCacheWin.cpp:
(WebCore::FontCache::systemFallbackForCharacters):
(WebCore::createGDIFont):
(WebCore::FontCache::getTraitsInFamily):
* platform/network/DataURL.cpp:
(WebCore::handleDataURL):
* platform/win/BString.cpp:
(WebCore::BString::BString):
* platform/win/ClipboardUtilitiesWin.cpp:
(WebCore::createGlobalData):
* platform/win/FileSystemWin.cpp:
(WebCore::pathByAppendingComponent):
(WebCore::fileSystemRepresentation):
* platform/win/PasteboardWin.cpp:
(WebCore::filesystemPathFromUrlOrTitle):
(WebCore::Pasteboard::writeURLToDataObject):
(WebCore::createGlobalImageFileDescriptor):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::calculatePositionAndSize):
Call deprecatedCharacters instead of characters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbleveldbIDBLevelDBCodingcpp">trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLcpp">trunk/Source/WebCore/platform/network/DataURL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinBStringcpp">trunk/Source/WebCore/platform/win/BString.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinClipboardUtilitiesWincpp">trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinFileSystemWincpp">trunk/Source/WebCore/platform/win/FileSystemWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPasteboardWincpp">trunk/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/ChangeLog 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-01 Darin Adler <darin@apple.com>
+
+ Use deprecatedCharacters in a few more places (non-Mac-build sites found by EWS)
+ https://bugs.webkit.org/show_bug.cgi?id=128042
+
+ Reviewed by Sam Weinig.
+
+ * Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp:
+ (WebCore::IDBLevelDBCoding::encodeString):
+ * platform/graphics/win/FontCacheWin.cpp:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ (WebCore::createGDIFont):
+ (WebCore::FontCache::getTraitsInFamily):
+ * platform/network/DataURL.cpp:
+ (WebCore::handleDataURL):
+ * platform/win/BString.cpp:
+ (WebCore::BString::BString):
+ * platform/win/ClipboardUtilitiesWin.cpp:
+ (WebCore::createGlobalData):
+ * platform/win/FileSystemWin.cpp:
+ (WebCore::pathByAppendingComponent):
+ (WebCore::fileSystemRepresentation):
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::filesystemPathFromUrlOrTitle):
+ (WebCore::Pasteboard::writeURLToDataObject):
+ (WebCore::createGlobalImageFileDescriptor):
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::calculatePositionAndSize):
+ Call deprecatedCharacters instead of characters.
+
</ins><span class="cx"> 2014-02-01 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for ActionSheets in WK2 for iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbleveldbIDBLevelDBCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> size_t length = s.length();
</span><span class="cx"> Vector<char> ret(length * sizeof(UChar));
</span><span class="cx">
</span><del>- const UChar* src = s.characters();
</del><ins>+ const UChar* src = s.deprecatedCharacters();
</ins><span class="cx"> UChar* dst = reinterpret_cast<UChar*>(ret.data());
</span><span class="cx"> for (unsigned i = 0; i < length; ++i)
</span><span class="cx"> *dst++ = htons(*src++);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx"> LOGFONT logFont;
</span><span class="cx"> logFont.lfCharSet = DEFAULT_CHARSET;
</span><del>- memcpy(logFont.lfFaceName, linkedFonts->at(linkedFontIndex).characters(), linkedFonts->at(linkedFontIndex).length() * sizeof(WCHAR));
</del><ins>+ memcpy(logFont.lfFaceName, linkedFonts->at(linkedFontIndex).deprecatedCharacters(), linkedFonts->at(linkedFontIndex).length() * sizeof(WCHAR));
</ins><span class="cx"> logFont.lfFaceName[linkedFonts->at(linkedFontIndex).length()] = 0;
</span><span class="cx"> EnumFontFamiliesEx(hdc, &logFont, linkedFontEnumProc, reinterpret_cast<LPARAM>(&hfont), 0);
</span><span class="cx"> linkedFontIndex++;
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> LOGFONT logFont;
</span><span class="cx"> logFont.lfCharSet = DEFAULT_CHARSET;
</span><span class="cx"> unsigned familyLength = min(family.length(), static_cast<unsigned>(LF_FACESIZE - 1));
</span><del>- memcpy(logFont.lfFaceName, family.characters(), familyLength * sizeof(UChar));
</del><ins>+ memcpy(logFont.lfFaceName, family.string().deprecatedCharacters(), familyLength * sizeof(UChar));
</ins><span class="cx"> logFont.lfFaceName[familyLength] = 0;
</span><span class="cx"> logFont.lfPitchAndFamily = 0;
</span><span class="cx">
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> LOGFONT logFont;
</span><span class="cx"> logFont.lfCharSet = DEFAULT_CHARSET;
</span><span class="cx"> unsigned familyLength = min(familyName.length(), static_cast<unsigned>(LF_FACESIZE - 1));
</span><del>- memcpy(logFont.lfFaceName, familyName.characters(), familyLength * sizeof(UChar));
</del><ins>+ memcpy(logFont.lfFaceName, familyName.string().deprecatedCharacters(), familyLength * sizeof(UChar));
</ins><span class="cx"> logFont.lfFaceName[familyLength] = 0;
</span><span class="cx"> logFont.lfPitchAndFamily = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DataURL.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURL.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/network/DataURL.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> data = decodeURLEscapeSequences(data, encoding);
</span><span class="cx"> handle->client()->didReceiveResponse(handle, response);
</span><span class="cx">
</span><del>- CString encodedData = encoding.encode(data.characters(), data.length(), URLEncodedEntitiesForUnencodables);
</del><ins>+ CString encodedData = encoding.encode(data.deprecatedCharacters(), data.length(), URLEncodedEntitiesForUnencodables);
</ins><span class="cx"> response.setExpectedContentLength(encodedData.length());
</span><span class="cx"> if (encodedData.length())
</span><span class="cx"> handle->client()->didReceiveData(handle, encodedData.data(), encodedData.length(), 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinBStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/BString.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/BString.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/win/BString.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (s.isNull())
</span><span class="cx"> m_bstr = 0;
</span><span class="cx"> else
</span><del>- m_bstr = SysAllocStringLen(s.characters(), s.length());
</del><ins>+ m_bstr = SysAllocStringLen(s.deprecatedCharacters(), s.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BString::BString(const URL& url)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> if (url.isNull())
</span><span class="cx"> m_bstr = 0;
</span><span class="cx"> else
</span><del>- m_bstr = SysAllocStringLen(url.string().characters(), url.string().length());
</del><ins>+ m_bstr = SysAllocStringLen(url.string().deprecatedCharacters(), url.string().length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BString::BString(const AtomicString& s)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if (s.isNull())
</span><span class="cx"> m_bstr = 0;
</span><span class="cx"> else
</span><del>- m_bstr = SysAllocStringLen(s.characters(), s.length());
</del><ins>+ m_bstr = SysAllocStringLen(s.string().deprecatedCharacters(), s.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CF)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinClipboardUtilitiesWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> if (!vm)
</span><span class="cx"> return 0;
</span><span class="cx"> UChar* buffer = static_cast<UChar*>(GlobalLock(vm));
</span><del>- memcpy(buffer, str.characters(), str.length() * sizeof(UChar));
</del><ins>+ memcpy(buffer, str.deprecatedCharacters(), str.length() * sizeof(UChar));
</ins><span class="cx"> buffer[str.length()] = 0;
</span><span class="cx"> GlobalUnlock(vm);
</span><span class="cx"> return vm;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinFileSystemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -159,19 +159,19 @@
</span><span class="cx"> Vector<UChar> buffer(MAX_PATH);
</span><span class="cx">
</span><span class="cx"> #if OS(WINCE)
</span><del>- buffer.append(path.characters(), path.length());
</del><ins>+ buffer.append(path.deprecatedCharacters(), path.length());
</ins><span class="cx">
</span><span class="cx"> UChar lastPathCharacter = path[path.length() - 1];
</span><span class="cx"> if (lastPathCharacter != L'\\' && lastPathCharacter != L'/' && component[0] != L'\\' && component[0] != L'/')
</span><span class="cx"> buffer.append(PlatformFilePathSeparator);
</span><span class="cx">
</span><del>- buffer.append(component.characters(), component.length());
</del><ins>+ buffer.append(component.deprecatedCharacters(), component.length());
</ins><span class="cx"> buffer.shrinkToFit();
</span><span class="cx"> #else
</span><span class="cx"> if (path.length() + 1 > buffer.size())
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- memcpy(buffer.data(), path.characters(), path.length() * sizeof(UChar));
</del><ins>+ memcpy(buffer.data(), path.deprecatedCharacters(), path.length() * sizeof(UChar));
</ins><span class="cx"> buffer[path.length()] = '\0';
</span><span class="cx">
</span><span class="cx"> String componentCopy = component;
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> CString fileSystemRepresentation(const String& path)
</span><span class="cx"> {
</span><del>- const UChar* characters = path.characters();
</del><ins>+ const UChar* characters = path.deprecatedCharacters();
</ins><span class="cx"> int size = WideCharToMultiByte(CP_ACP, 0, characters, path.length(), 0, 0, 0, 0) - 1;
</span><span class="cx">
</span><span class="cx"> char* buffer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> if (!title.isEmpty()) {
</span><span class="cx"> size_t len = std::min<size_t>(title.length(), fsPathMaxLengthExcludingExtension);
</span><del>- CopyMemory(fsPathBuffer, title.characters(), len * sizeof(UChar));
</del><ins>+ CopyMemory(fsPathBuffer, title.deprecatedCharacters(), len * sizeof(UChar));
</ins><span class="cx"> fsPathBuffer[len] = 0;
</span><span class="cx"> pathRemoveBadFSCharacters(fsPathBuffer, len);
</span><span class="cx"> }
</span><span class="lines">@@ -573,10 +573,10 @@
</span><span class="cx"> String lastComponent = kurl.lastPathComponent();
</span><span class="cx"> if (kurl.isLocalFile() || (!isLink && !lastComponent.isEmpty())) {
</span><span class="cx"> len = std::min<DWORD>(fsPathMaxLengthExcludingExtension, lastComponent.length());
</span><del>- CopyMemory(fsPathBuffer, lastComponent.characters(), len * sizeof(UChar));
</del><ins>+ CopyMemory(fsPathBuffer, lastComponent.deprecatedCharacters(), len * sizeof(UChar));
</ins><span class="cx"> } else {
</span><span class="cx"> len = std::min<DWORD>(fsPathMaxLengthExcludingExtension, url.length());
</span><del>- CopyMemory(fsPathBuffer, url.characters(), len * sizeof(UChar));
</del><ins>+ CopyMemory(fsPathBuffer, url.deprecatedCharacters(), len * sizeof(UChar));
</ins><span class="cx"> }
</span><span class="cx"> fsPathBuffer[len] = 0;
</span><span class="cx"> pathRemoveBadFSCharacters(fsPathBuffer, len);
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> fgd->fgd[0].nFileSizeLow = content.length();
</span><span class="cx">
</span><span class="cx"> unsigned maxSize = std::min<unsigned>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</span><del>- CopyMemory(fgd->fgd[0].cFileName, fsPath.characters(), maxSize * sizeof(UChar));
</del><ins>+ CopyMemory(fgd->fgd[0].cFileName, fsPath.deprecatedCharacters(), maxSize * sizeof(UChar));
</ins><span class="cx"> GlobalUnlock(urlFileDescriptor);
</span><span class="cx">
</span><span class="cx"> char* fileContents = static_cast<char*>(GlobalLock(urlFileContent));
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int maxSize = std::min<int>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</span><del>- CopyMemory(fgd->fgd[0].cFileName, (LPCWSTR)fsPath.characters(), maxSize * sizeof(UChar));
</del><ins>+ CopyMemory(fgd->fgd[0].cFileName, (LPCWSTR)fsPath.deprecatedCharacters(), maxSize * sizeof(UChar));
</ins><span class="cx"> GlobalUnlock(memObj);
</span><span class="cx">
</span><span class="cx"> return memObj;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (163256 => 163257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-02-02 02:45:52 UTC (rev 163256)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2014-02-02 04:59:36 UTC (rev 163257)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> itemFont.update(m_popupClient->fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- popupWidth = std::max(popupWidth, static_cast<int>(ceilf(itemFont.width(TextRun(text.characters(), text.length())))));
</del><ins>+ popupWidth = std::max(popupWidth, static_cast<int>(ceilf(itemFont.width(TextRun(text.deprecatedCharacters(), text.length())))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (naturalHeight > maxPopupHeight)
</span></span></pre>
</div>
</div>
</body>
</html>