<!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>[160572] trunk/Source/WebKit2</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/160572">160572</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 15:59:14 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Start removing calls to String::characters()
https://bugs.webkit.org/show_bug.cgi?id=125699
Reviewed by Anders Carlsson.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(CoreIPC::::decodePlatformData):
* UIProcess/Plugins/PluginInfoStore.cpp:
(WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
(WebKit::PluginInfoStore::findPlugin):
* UIProcess/Plugins/PluginInfoStore.h:
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::PluginInfoStore::pluginsDirectories):
(WebKit::PluginInfoStore::pluginPathsInDirectory):
* UIProcess/cf/WebPreferencesCF.cpp:
(WebKit::makeKey):
* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
(WebKit::InjectedBundle::load):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadStringImpl):
(WebKit::WebPage::loadHTMLString):
(WebKit::WebPage::loadAlternateHTMLString):
(WebKit::WebPage::loadPlainTextString):
(WebKit::WebPage::loadWebArchiveData):
* WebProcess/WebPage/WebPage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginInfoStoreh">trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscfWebPreferencesCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundlemacInjectedBundleMacmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-13 Sam Weinig <sam@webkit.org>
+
+ [WK2] Start removing calls to String::characters()
+ https://bugs.webkit.org/show_bug.cgi?id=125699
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (CoreIPC::::decodePlatformData):
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
+ (WebKit::PluginInfoStore::findPlugin):
+ * UIProcess/Plugins/PluginInfoStore.h:
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::pluginsDirectories):
+ (WebKit::PluginInfoStore::pluginPathsInDirectory):
+ * UIProcess/cf/WebPreferencesCF.cpp:
+ (WebKit::makeKey):
+ * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WebKit::InjectedBundle::load):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadStringImpl):
+ (WebKit::WebPage::loadHTMLString):
+ (WebKit::WebPage::loadAlternateHTMLString):
+ (WebKit::WebPage::loadPlainTextString):
+ (WebKit::WebPage::loadWebArchiveData):
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2013-12-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2: Add support for inline candidates on iOS.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -164,11 +164,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSString* nsString(const String& string)
-{
- return string.impl() ? [NSString stringWithCharacters:reinterpret_cast<const UniChar*>(string.characters()) length:string.length()] : @"";
-}
-
</del><span class="cx"> void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</span><span class="cx"> {
</span><span class="cx"> bool errorIsNull = resourceError.isNull();
</span><span class="lines">@@ -241,7 +236,7 @@
</span><span class="cx"> CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:(NSDictionary *)userInfo.get()]);
</del><ins>+ RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
</ins><span class="cx">
</span><span class="cx"> resourceError = ResourceError(nsError.get());
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -176,11 +176,6 @@
</span><span class="cx"> {
</span><span class="cx"> return PluginModuleLoadNormally;
</span><span class="cx"> }
</span><del>-
-String PluginInfoStore::getMIMETypeForExtension(const String& extension)
-{
- return MIMETypeRegistry::getMIMETypeForExtension(extension);
-}
</del><span class="cx">
</span><span class="cx"> PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String&)
</span><span class="cx"> {
</span><span class="lines">@@ -209,7 +204,7 @@
</span><span class="cx"> return plugin;
</span><span class="cx">
</span><span class="cx"> // Finally, try to get the MIME type from the extension in a platform specific manner and use that.
</span><del>- String extensionMimeType = getMIMETypeForExtension(extension);
</del><ins>+ String extensionMimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
</ins><span class="cx"> if (!extensionMimeType.isNull()) {
</span><span class="cx"> PluginModuleInfo plugin = findPluginForMIMEType(extensionMimeType, allowedPluginTypes);
</span><span class="cx"> if (!plugin.path.isNull()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginInfoStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx"> // Return whether this plug-in should be used (added to the list of plug-ins) or not.
</span><span class="cx"> static bool shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlugins, const PluginModuleInfo&);
</span><span class="cx">
</span><del>- // Get the MIME type for the given extension.
- static String getMIMETypeForExtension(const String& extension);
-
</del><span class="cx"> Vector<String> m_additionalPluginsDirectories;
</span><span class="cx"> Vector<PluginModuleInfo> m_plugins;
</span><span class="cx"> bool m_pluginListIsUpToDate;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -47,20 +47,12 @@
</span><span class="cx">
</span><span class="cx"> return pluginsDirectories;
</span><span class="cx"> }
</span><del>-
-// FIXME: Once the UI process knows the difference between the main thread and the web thread we can drop this and just use
-// String::createCFString.
-static CFStringRef safeCreateCFString(const String& string)
-{
- return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(string.characters()), string.length());
-}
</del><span class="cx">
</span><span class="cx"> Vector<String> PluginInfoStore::pluginPathsInDirectory(const String& directory)
</span><span class="cx"> {
</span><span class="cx"> Vector<String> pluginPaths;
</span><span class="cx">
</span><del>- RetainPtr<CFStringRef> directoryCFString = adoptCF(safeCreateCFString(directory));
-
</del><ins>+ RetainPtr<CFStringRef> directoryCFString = directory.createCFString();
</ins><span class="cx"> NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(NSString *)directoryCFString.get() error:nil];
</span><span class="cx"> for (NSString *filename in filenames)
</span><span class="cx"> pluginPaths.append([(NSString *)directoryCFString.get() stringByAppendingPathComponent:filename]);
</span><span class="lines">@@ -113,16 +105,6 @@
</span><span class="cx"> return PluginModuleLoadNormally;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String PluginInfoStore::getMIMETypeForExtension(const String& extension)
-{
- // FIXME: This should just call MIMETypeRegistry::getMIMETypeForExtension and be
- // strength reduced into the callsite once we can safely convert String
- // to CFStringRef off the main thread.
-
- RetainPtr<CFStringRef> extensionCFString = adoptCF(safeCreateCFString(extension));
- return WKGetMIMETypeForExtension((NSString *)extensionCFString.get());
-}
-
</del><span class="cx"> PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String& bundleIdentifier)
</span><span class="cx"> {
</span><span class="cx"> loadPluginsIfNecessary();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebPreferencesCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -33,14 +33,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static RetainPtr<CFStringRef> cfStringFromWebCoreString(const String& string)
-{
- return RetainPtr<CFStringRef> = adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(string.characters()), string.length()));
-}
-
</del><span class="cx"> static inline RetainPtr<CFStringRef> makeKey(const String& identifier, const String& baseKey)
</span><span class="cx"> {
</span><del>- return cfStringFromWebCoreString(makeString(identifier, ".WebKit2", baseKey));
</del><ins>+ return makeString(identifier, ".WebKit2", baseKey).createCFString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setStringValueIfInUserDefaults(const String& identifier, const String& baseKey, WebPreferencesStore& store)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundlemacInjectedBundleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> m_sandboxExtension = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<CFStringRef> injectedBundlePathStr = adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(m_path.characters()), m_path.length()));
</del><ins>+ RetainPtr<CFStringRef> injectedBundlePathStr = m_path.createCFString();
</ins><span class="cx"> if (!injectedBundlePathStr) {
</span><span class="cx"> WTFLogAlways("InjectedBundle::load failed - Could not create the path string.\n");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -917,6 +917,17 @@
</span><span class="cx"> m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, CoreIPC::MessageDecoder& decoder)
+{
+ if (htmlString.is8Bit()) {
+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
+ loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-8"), baseURL, unreachableURL, decoder);
+ } else {
+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
+ loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
+ }
+}
+
</ins><span class="cx"> void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
</span><span class="lines">@@ -926,29 +937,26 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
</del><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><del>- loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, URL(), decoder);
</del><ins>+ loadString(htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
</del><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><span class="cx"> URL unreachableURL = unreachableURLString.isEmpty() ? URL() : URL(URL(), unreachableURLString);
</span><del>- loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, unreachableURL, decoder);
</del><ins>+ loadString(htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadPlainTextString(const String& string, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(string.characters()), string.length() * sizeof(UChar));
- loadDataImpl(sharedBuffer, "text/plain", "utf-16", blankURL(), URL(), decoder);
</del><ins>+ loadString(string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadWebArchiveData(const CoreIPC::DataReference& webArchiveData, CoreIPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(webArchiveData.data()), webArchiveData.size() * sizeof(uint8_t));
</span><del>- loadDataImpl(sharedBuffer, "application/x-webarchive", "utf-16", blankURL(), URL(), decoder);
</del><ins>+ loadDataImpl(sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::linkClicked(const String& url, const WebMouseEvent& event)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (160571 => 160572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-13 23:57:39 UTC (rev 160571)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-13 23:59:14 UTC (rev 160572)
</span><span class="lines">@@ -700,6 +700,7 @@
</span><span class="cx"> String sourceForFrame(WebFrame*);
</span><span class="cx">
</span><span class="cx"> void loadDataImpl(PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
</span><ins>+ void loadString(const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
</ins><span class="cx">
</span><span class="cx"> bool platformHasLocalDataForURL(const WebCore::URL&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>