<!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>[205847] trunk</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/205847">205847</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 19:12:51 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix post-landing review comments after <a href="http://trac.webkit.org/projects/webkit/changeset/205787">r205787</a>
https://bugs.webkit.org/show_bug.cgi?id=161885
Reviewed by Darin Adler.
Source/WebCore:
Leverage new StringBuilder::append(CFStringRef) overload.
* html/parser/HTMLParserIdioms.cpp:
(WebCore::parseHTTPRefreshInternal):
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::captionsDefaultFontCSS):
(WebCore::buildDisplayStringForTrackBase):
* platform/network/mac/CookieJarMac.mm:
(WebCore::cookiesForSession):
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::mediaControlsStyleSheet):
(WebCore::RenderThemeIOS::mediaControlsScript):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsStyleSheet):
(WebCore::RenderThemeMac::mediaControlsScript):
Source/WTF:
Add new StringBuilder::append(CFStringRef) / append(NSString*)
overloads to avoid an extra string copy when possible.
* wtf/text/StringBuilder.cpp:
(WTF::StringBuilder::append):
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::append):
Tools:
Leverage new StringBuilder::append(CFStringRef) overload.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::dumpDOMAsWebArchive):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuildercpp">trunk/Source/WTF/wtf/text/StringBuilder.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuilderh">trunk/Source/WTF/wtf/text/StringBuilder.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieJarMacmm">trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WTF/ChangeLog 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-12 Chris Dumez <cdumez@apple.com>
+
+ Fix post-landing review comments after r205787
+ https://bugs.webkit.org/show_bug.cgi?id=161885
+
+ Reviewed by Darin Adler.
+
+ Add new StringBuilder::append(CFStringRef) / append(NSString*)
+ overloads to avoid an extra string copy when possible.
+
+ * wtf/text/StringBuilder.cpp:
+ (WTF::StringBuilder::append):
+ * wtf/text/StringBuilder.h:
+ (WTF::StringBuilder::append):
+
</ins><span class="cx"> 2016-09-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.cpp (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.cpp 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WTF/wtf/text/StringBuilder.cpp 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -306,6 +306,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(CF)
+
+void StringBuilder::append(CFStringRef string)
+{
+ // Fast path: avoid constructing a temporary String when possible.
+ if (auto* characters = CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1)) {
+ append(reinterpret_cast<const LChar*>(characters), CFStringGetLength(string));
+ return;
+ }
+ append(String(string));
+}
+
+#endif
+
</ins><span class="cx"> void StringBuilder::appendNumber(int number)
</span><span class="cx"> {
</span><span class="cx"> numberToStringSigned<StringBuilder>(number, this);
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.h 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -101,6 +101,13 @@
</span><span class="cx"> else
</span><span class="cx"> append(stringView.characters16(), stringView.length());
</span><span class="cx"> }
</span><ins>+
+#if USE(CF)
+ WTF_EXPORT_PRIVATE void append(CFStringRef);
+#endif
+#if USE(CF) && defined(__OBJC__)
+ void append(NSString *string) { append((__bridge CFStringRef)string); }
+#endif
</ins><span class="cx">
</span><span class="cx"> void append(const String& string, unsigned offset, unsigned length)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-12 Chris Dumez <cdumez@apple.com>
+
+ Fix post-landing review comments after r205787
+ https://bugs.webkit.org/show_bug.cgi?id=161885
+
+ Reviewed by Darin Adler.
+
+ Leverage new StringBuilder::append(CFStringRef) overload.
+
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::parseHTTPRefreshInternal):
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::captionsDefaultFontCSS):
+ (WebCore::buildDisplayStringForTrackBase):
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookiesForSession):
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::mediaControlsStyleSheet):
+ (WebCore::RenderThemeIOS::mediaControlsScript):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsStyleSheet):
+ (WebCore::RenderThemeMac::mediaControlsScript):
+
</ins><span class="cx"> 2016-09-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser: Correctly ignore spaces before relative URLs with no scheme
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> builder.append(getPropertyNameString(CSSPropertyFontFamily));
</span><span class="cx"> builder.appendLiteral(": \"");
</span><del>- builder.append(String(static_cast<CFStringRef>(name.get())));
</del><ins>+ builder.append(static_cast<CFStringRef>(name.get()));
</ins><span class="cx"> builder.append('"');
</span><span class="cx"> if (behavior == kMACaptionAppearanceBehaviorUseValue)
</span><span class="cx"> builder.appendLiteral(" !important");
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> else if (!language.isEmpty())
</span><span class="cx"> displayName.append(language);
</span><span class="cx"> else
</span><del>- displayName.append(String(localeIdentifier.get()));
</del><ins>+ displayName.append(localeIdentifier.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -155,9 +155,9 @@
</span><span class="cx"> if (!cookiesBuilder.isEmpty())
</span><span class="cx"> cookiesBuilder.appendLiteral("; ");
</span><span class="cx">
</span><del>- cookiesBuilder.append(String([cookie name]));
</del><ins>+ cookiesBuilder.append([cookie name]);
</ins><span class="cx"> cookiesBuilder.append('=');
</span><del>- cookiesBuilder.append(String([cookie value]));
</del><ins>+ cookiesBuilder.append([cookie value]);
</ins><span class="cx"> }
</span><span class="cx"> return cookiesBuilder.toString();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -1290,11 +1290,8 @@
</span><span class="cx"> String RenderThemeIOS::mediaControlsStyleSheet()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsStyleSheet.isEmpty()) {
- StringBuilder builder;
- builder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]));
- m_mediaControlsStyleSheet = builder.toString();
- }
</del><ins>+ if (m_mediaControlsStyleSheet.isEmpty())
+ m_mediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil];
</ins><span class="cx"> return m_mediaControlsStyleSheet;
</span><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -1306,9 +1303,10 @@
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (m_mediaControlsScript.isEmpty()) {
</span><span class="cx"> StringBuilder scriptBuilder;
</span><del>- scriptBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]));
- scriptBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]));
- scriptBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]));
</del><ins>+ NSBundle* bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsiOS" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> m_mediaControlsScript = scriptBuilder.toString();
</span><span class="cx"> }
</span><span class="cx"> return m_mediaControlsScript;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (m_mediaControlsStyleSheet.isEmpty()) {
</span><span class="cx"> StringBuilder styleSheetBuilder;
</span><del>- styleSheetBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]));
</del><ins>+ styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> m_mediaControlsStyleSheet = styleSheetBuilder.toString();
</span><span class="cx"> }
</span><span class="cx"> return m_mediaControlsStyleSheet;
</span><span class="lines">@@ -249,8 +249,9 @@
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (m_mediaControlsScript.isEmpty()) {
</span><span class="cx"> StringBuilder scriptBuilder;
</span><del>- scriptBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]));
- scriptBuilder.append(String([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]));
</del><ins>+ NSBundle* bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> m_mediaControlsScript = scriptBuilder.toString();
</span><span class="cx"> }
</span><span class="cx"> return m_mediaControlsScript;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Tools/ChangeLog 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-12 Chris Dumez <cdumez@apple.com>
+
+ Fix post-landing review comments after r205787
+ https://bugs.webkit.org/show_bug.cgi?id=161885
+
+ Reviewed by Darin Adler.
+
+ Leverage new StringBuilder::append(CFStringRef) overload.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::dumpDOMAsWebArchive):
+
</ins><span class="cx"> 2016-09-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser: Correctly ignore spaces before relative URLs with no scheme
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (205846 => 205847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-09-13 01:25:08 UTC (rev 205846)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-09-13 02:12:51 UTC (rev 205847)
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx"> WKRetainPtr<WKDataRef> wkData = adoptWK(WKBundleFrameCopyWebArchive(frame));
</span><span class="cx"> RetainPtr<CFDataRef> cfData = adoptCF(CFDataCreate(0, WKDataGetBytes(wkData.get()), WKDataGetSize(wkData.get())));
</span><span class="cx"> RetainPtr<CFStringRef> cfString = adoptCF(createXMLStringFromWebArchiveData(cfData.get()));
</span><del>- stringBuilder.append(String(cfString.get()));
</del><ins>+ stringBuilder.append(cfString.get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>