<!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>[160608] 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/160608">160608</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 17:09:47 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Rename WebString to API::String
https://bugs.webkit.org/show_bug.cgi?id=125726
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
* Shared/API/Cocoa/WKRemoteObjectRegistry.mm:
* Shared/API/c/WKPluginInformation.cpp:
* Shared/API/c/WKSharedAPICast.h:
* Shared/API/c/WKString.cpp:
* Shared/API/c/cf/WKStringCF.mm:
* Shared/APIArray.cpp:
* Shared/APIArray.h:
* Shared/APIString.h: Copied from Source/WebKit2/Shared/WebString.h.
* Shared/Cocoa/WKNSString.h:
* Shared/Cocoa/WKNSString.mm:
* Shared/ImmutableDictionary.cpp:
* Shared/Plugins/Netscape/PluginInformation.cpp:
* Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
* Shared/UserData.cpp:
* Shared/UserMessageCoders.h:
* Shared/WebArchiveResource.h:
* Shared/WebOpenPanelParameters.cpp:
* Shared/WebRenderLayer.cpp:
* Shared/WebRenderObject.cpp:
* Shared/WebString.h: Removed.
* UIProcess/API/C/WKCredential.cpp:
* UIProcess/API/C/WKDatabaseManager.cpp:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
* UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
* UIProcess/APINavigationData.h:
* UIProcess/Authentication/WebCredential.h:
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
* UIProcess/Plugins/WebPluginSiteDataManager.cpp:
* UIProcess/WebContext.cpp:
* UIProcess/WebDatabaseManagerProxy.cpp:
* UIProcess/WebFormClient.cpp:
* UIProcess/WebLoaderClient.cpp:
* UIProcess/WebPageGroup.cpp:
* UIProcess/WebUIClient.cpp:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectRegistrymm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKPluginInformationcpp">trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKStringcpp">trunk/Source/WebKit2/Shared/API/c/WKString.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccfWKStringCFmm">trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIArraycpp">trunk/Source/WebKit2/Shared/APIArray.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIArrayh">trunk/Source/WebKit2/Shared/APIArray.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSStringh">trunk/Source/WebKit2/Shared/Cocoa/WKNSString.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSStringmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedImmutableDictionarycpp">trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapemacPluginInformationMacmm">trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourceh">trunk/Source/WebKit2/Shared/WebArchiveResource.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebOpenPanelParameterscpp">trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderLayercpp">trunk/Source/WebKit2/Shared/WebRenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderObjectcpp">trunk/Source/WebKit2/Shared/WebRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCredentialcpp">trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPINavigationDatah">trunk/Source/WebKit2/UIProcess/APINavigationData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationWebCredentialh">trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormClientcpp">trunk/Source/WebKit2/UIProcess/WebFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebLoaderClientcpp">trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebUIClientcpp">trunk/Source/WebKit2/UIProcess/WebUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageEditorClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageFormClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIStringh">trunk/Source/WebKit2/Shared/APIString.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebStringh">trunk/Source/WebKit2/Shared/WebString.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2013-12-13 Sam Weinig <sam@webkit.org>
+
+ [WK2] Rename WebString to API::String
+ https://bugs.webkit.org/show_bug.cgi?id=125726
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ * Shared/API/Cocoa/WKRemoteObjectRegistry.mm:
+ * Shared/API/c/WKPluginInformation.cpp:
+ * Shared/API/c/WKSharedAPICast.h:
+ * Shared/API/c/WKString.cpp:
+ * Shared/API/c/cf/WKStringCF.mm:
+ * Shared/APIArray.cpp:
+ * Shared/APIArray.h:
+ * Shared/APIString.h: Copied from Source/WebKit2/Shared/WebString.h.
+ * Shared/Cocoa/WKNSString.h:
+ * Shared/Cocoa/WKNSString.mm:
+ * Shared/ImmutableDictionary.cpp:
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ * Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
+ * Shared/UserData.cpp:
+ * Shared/UserMessageCoders.h:
+ * Shared/WebArchiveResource.h:
+ * Shared/WebOpenPanelParameters.cpp:
+ * Shared/WebRenderLayer.cpp:
+ * Shared/WebRenderObject.cpp:
+ * Shared/WebString.h: Removed.
+ * UIProcess/API/C/WKCredential.cpp:
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ * UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
+ * UIProcess/APINavigationData.h:
+ * UIProcess/Authentication/WebCredential.h:
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+ * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+ * UIProcess/WebContext.cpp:
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ * UIProcess/WebFormClient.cpp:
+ * UIProcess/WebLoaderClient.cpp:
+ * UIProcess/WebPageGroup.cpp:
+ * UIProcess/WebUIClient.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
+
</ins><span class="cx"> 2013-12-14 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify FeatureDefines.xcconfig
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -30,10 +30,10 @@
</span><span class="cx">
</span><span class="cx"> #import "APIArray.h"
</span><span class="cx"> #import "APINumber.h"
</span><ins>+#import "APIString.h"
</ins><span class="cx"> #import "MutableDictionary.h"
</span><span class="cx"> #import "WKRemoteObjectInterfaceInternal.h"
</span><span class="cx"> #import "WebData.h"
</span><del>-#import "WebString.h"
</del><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/TemporaryChange.h>
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> if (!objectClass)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"-classForCoder returned nil for %@", object];
</span><span class="cx">
</span><del>- encoder->_currentDictionary->set(classNameKey, WebString::create(class_getName(objectClass)));
</del><ins>+ encoder->_currentDictionary->set(classNameKey, API::String::create(class_getName(objectClass)));
</ins><span class="cx">
</span><span class="cx"> if ([object isKindOfClass:[NSInvocation class]]) {
</span><span class="cx"> // We have to special case NSInvocation since we don't want to encode the target.
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> static id decodeObject(WKRemoteObjectDecoder *decoder)
</span><span class="cx"> {
</span><del>- WebString* classNameString = decoder->_currentDictionary->get<WebString>(classNameKey);
</del><ins>+ API::String* classNameString = decoder->_currentDictionary->get<API::String>(classNameKey);
</ins><span class="cx"> if (!classNameString)
</span><span class="cx"> [NSException raise:NSInvalidUnarchiveOperationException format:@"Class name missing"];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectRegistrymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> [encoder encodeObject:invocation forKey:invocationKey];
</span><span class="cx">
</span><span class="cx"> RefPtr<MutableDictionary> body = MutableDictionary::create();
</span><del>- body->set(interfaceIdentifierKey, WebString::create(interface.identifier));
</del><ins>+ body->set(interfaceIdentifierKey, API::String::create(interface.identifier));
</ins><span class="cx"> body->set(encodedInvocationKey, [encoder rootObjectDictionary]);
</span><span class="cx">
</span><span class="cx"> [self _sendMessageWithBody:body.release()];
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> const ImmutableDictionary* dictionary = toImpl(static_cast<WKDictionaryRef>(body));
</span><span class="cx">
</span><del>- WebString* interfaceIdentifier = dictionary->get<WebString>(interfaceIdentifierKey);
</del><ins>+ API::String* interfaceIdentifier = dictionary->get<API::String>(interfaceIdentifierKey);
</ins><span class="cx"> if (!interfaceIdentifier)
</span><span class="cx"> return NO;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKPluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -26,16 +26,16 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKPluginInformation.h"
</span><span class="cx">
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "PluginInformation.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><del>-#include "WebString.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationBundleIdentifierKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationBundleIdentifierKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationBundleIdentifierKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationBundleVersionKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationBundleVersionKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationBundleVersionKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationBundleShortVersionKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationBundleShortVersionKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationBundleShortVersionKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationPathKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationPathKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationPathKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationDisplayNameKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationDisplayNameKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationDisplayNameKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationDefaultLoadPolicyKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationHasSandboxProfileKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationHasSandboxProfileKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationHasSandboxProfileKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationFrameURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationFrameURLKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationFrameURLKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationMIMETypeKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationMIMETypeKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationMIMETypeKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationPageURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationPageURLKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationPageURLKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationPluginspageAttributeURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> WKStringRef WKPluginInformationPluginURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(pluginInformationPluginURLKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(pluginInformationPluginURLKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> WKStringRef WKPlugInInformationReplacementObscuredKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static WebString* key = WebString::create(plugInInformationReplacementObscuredKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(plugInInformationReplacementObscuredKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WKSharedAPICast_h
</span><span class="cx">
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "ImageOptions.h"
</span><span class="cx"> #include "SameDocumentNavigationType.h"
</span><span class="cx"> #include "WKBase.h"
</span><span class="lines">@@ -44,7 +45,6 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WebURL.h"
</span><span class="cx"> #include "WebURLRequest.h"
</span><span class="cx"> #include "WebURLResponse.h"
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKSecurityOriginRef, WebSecurityOrigin)
</span><span class="cx"> WK_ADD_API_MAPPING(WKSerializedScriptValueRef, WebSerializedScriptValue)
</span><span class="cx"> WK_ADD_API_MAPPING(WKSizeRef, API::Size)
</span><del>-WK_ADD_API_MAPPING(WKStringRef, WebString)
</del><ins>+WK_ADD_API_MAPPING(WKStringRef, API::String)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKTypeRef, API::Object)
</span><span class="cx"> WK_ADD_API_MAPPING(WKUInt64Ref, API::UInt64)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLRef, WebURL)
</span><span class="lines">@@ -124,6 +124,12 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKObjCTypeWrapperRef, ObjCObjectGraph)
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+template<typename T>
+inline typename ImplTypeInfo<T>::APIType toAPI(T t)
+{
+ return reinterpret_cast<typename ImplTypeInfo<T>::APIType>(t);
+}
+
</ins><span class="cx"> template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>
</span><span class="cx"> class ProxyingRefPtr {
</span><span class="cx"> public:
</span><span class="lines">@@ -152,23 +158,17 @@
</span><span class="cx"> return reinterpret_cast<typename APITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-inline typename ImplTypeInfo<T>::APIType toAPI(T t)
-{
- return reinterpret_cast<typename ImplTypeInfo<T>::APIType>(t);
-}
-
</del><span class="cx"> /* Special cases. */
</span><span class="cx">
</span><del>-inline ProxyingRefPtr<WebString> toAPI(StringImpl* string)
</del><ins>+inline ProxyingRefPtr<API::String> toAPI(StringImpl* string)
</ins><span class="cx"> {
</span><del>- return ProxyingRefPtr<WebString>(WebString::create(string));
</del><ins>+ return ProxyingRefPtr<API::String>(API::String::create(string));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline WKStringRef toCopiedAPI(const String& string)
</span><span class="cx"> {
</span><del>- RefPtr<WebString> webString = WebString::create(string);
- return toAPI(webString.release().leakRef());
</del><ins>+ RefPtr<API::String> apiString = API::String::create(string);
+ return toAPI(apiString.release().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ProxyingRefPtr<WebURL> toURLRef(StringImpl* string)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKString.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx">
</span><span class="cx"> WKTypeID WKStringGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebString::APIType);
</del><ins>+ return toAPI(API::String::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKStringCreateWithUTF8CString(const char* string)
</span><span class="cx"> {
</span><del>- RefPtr<WebString> webString = WebString::createFromUTF8String(string);
- return toAPI(webString.release().leakRef());
</del><ins>+ RefPtr<API::String> apiString = API::String::createFromUTF8String(string);
+ return toAPI(apiString.release().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEmpty(WKStringRef stringRef)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKStringCreateWithJSString(JSStringRef jsStringRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebString> webString = WebString::create(jsStringRef);
- return toAPI(webString.release().leakRef());
</del><ins>+ RefPtr<API::String> apiString = API::String::create(jsStringRef);
+ return toAPI(apiString.release().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSStringRef WKStringCopyJSString(WKStringRef stringRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccfWKStringCFmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> // Since WKNSString is an internal class with no subclasses, we can do a simple equality check.
</span><span class="cx"> if (object_getClass((NSString *)cfString) == wkNSStringClass()) {
</span><del>- return toAPI(static_cast<WebString*>(&[(WKNSString *)cfString retain]._apiObject));
</del><ins>+ return toAPI(static_cast<API::String*>(&[(WKNSString *)cfString retain]._apiObject));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> String string(cfString);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIArray.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIArray.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/APIArray.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx">
</span><del>-#include "WebString.h"
</del><ins>+#include "APIString.h"
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> return adoptRef(new Array(std::move(elements)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Array> Array::createStringArray(const Vector<String>& strings)
</del><ins>+PassRefPtr<Array> Array::createStringArray(const Vector<WTF::String>& strings)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<Object>> elements;
</span><span class="cx"> elements.reserveInitialCapacity(strings.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& string : strings)
</span><del>- elements.uncheckedAppend(WebKit::WebString::create(string));
</del><ins>+ elements.uncheckedAppend(API::String::create(string));
</ins><span class="cx">
</span><span class="cx"> return create(std::move(elements));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIArray.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIArray.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/APIArray.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -46,9 +46,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<Array> create();
</span><span class="cx"> static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
</span><ins>+ static PassRefPtr<Array> createStringArray(const Vector<WTF::String>&);
</ins><span class="cx">
</span><del>- static PassRefPtr<Array> createStringArray(const Vector<String>&);
-
</del><span class="cx"> virtual ~Array();
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIStringhfromrev160571trunkSourceWebKit2SharedWebStringh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIString.h (from rev 160571, trunk/Source/WebKit2/Shared/WebString.h) (0 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIString.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIString.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -0,0 +1,120 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIString_h
+#define APIString_h
+
+#include "APIObject.h"
+#include <JavaScriptCore/InitializeThreading.h>
+#include <JavaScriptCore/JSStringRef.h>
+#include <JavaScriptCore/OpaqueJSString.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
+#include <wtf/unicode/UTF8.h>
+
+namespace API {
+
+class String FINAL : public API::ObjectImpl<API::Object::Type::String> {
+public:
+ static PassRefPtr<String> createNull()
+ {
+ return adoptRef(new String);
+ }
+
+ static PassRefPtr<String> create(const WTF::String& string)
+ {
+ return adoptRef(new String(string));
+ }
+
+ static PassRefPtr<String> create(JSStringRef jsStringRef)
+ {
+ return adoptRef(new String(jsStringRef->string()));
+ }
+
+ static PassRefPtr<String> createFromUTF8String(const char* string)
+ {
+ return adoptRef(new String(WTF::String::fromUTF8(string)));
+ }
+
+ virtual ~String()
+ {
+ }
+
+ bool isNull() const { return m_string.isNull(); }
+ bool isEmpty() const { return m_string.isEmpty(); }
+
+ size_t length() const { return m_string.length(); }
+ size_t getCharacters(UChar* buffer, size_t bufferLength) const
+ {
+ if (!bufferLength)
+ return 0;
+ bufferLength = std::min(bufferLength, static_cast<size_t>(m_string.length()));
+ memcpy(buffer, m_string.characters(), bufferLength * sizeof(UChar));
+ return bufferLength;
+ }
+
+ size_t maximumUTF8CStringSize() const { return m_string.length() * 3 + 1; }
+ size_t getUTF8CString(char* buffer, size_t bufferSize)
+ {
+ if (!bufferSize)
+ return 0;
+ char* p = buffer;
+ const UChar* d = m_string.characters();
+ WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + m_string.length(), &p, p + bufferSize - 1, /* strict */ true);
+ *p++ = '\0';
+ if (result != WTF::Unicode::conversionOK && result != WTF::Unicode::targetExhausted)
+ return 0;
+ return p - buffer;
+ }
+
+ bool equal(String* other) { return m_string == other->m_string; }
+ bool equalToUTF8String(const char* other) { return m_string == WTF::String::fromUTF8(other); }
+ bool equalToUTF8StringIgnoringCase(const char* other) { return equalIgnoringCase(m_string, other); }
+
+ const WTF::String& string() const { return m_string; }
+
+ JSStringRef createJSString() const
+ {
+ JSC::initializeThreading();
+ return OpaqueJSString::create(m_string).leakRef();
+ }
+
+private:
+ String()
+ : m_string()
+ {
+ }
+
+ String(const WTF::String& string)
+ : m_string(!string.impl() ? WTF::String(StringImpl::empty()) : string)
+ {
+ }
+
+ WTF::String m_string;
+};
+
+} // namespace WebKit
+
+#endif // APIString_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSString.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSString.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSString.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIString.h"
</ins><span class="cx"> #import "WKObject.h"
</span><del>-#import "WebString.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-inline NSString *wrapper(WebString& string) { ASSERT([string.wrapper() isKindOfClass:[NSString class]]); return (NSString *)string.wrapper(); }
</del><ins>+inline NSString *wrapper(API::String& string) { ASSERT([string.wrapper() isKindOfClass:[NSString class]]); return (NSString *)string.wrapper(); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @interface WKNSString : WKObject <NSCopying>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSStringmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "WebString.h"
</del><ins>+#import "APIString.h"
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSObject *)_web_createTarget
</span><span class="cx"> {
</span><del>- const String& string = static_cast<WebString*>(&self._apiObject)->string();
</del><ins>+ const String& string = static_cast<API::String*>(&self._apiObject)->string();
</ins><span class="cx"> return (NSString *)CFMakeCollectable(string.createCFString().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedImmutableDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><del>-#include "WebString.h"
</del><ins>+#include "APIString.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> keys.reserveInitialCapacity(m_map.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& key : m_map.keys())
</span><del>- keys.uncheckedAppend(WebString::create(key));
</del><ins>+ keys.uncheckedAppend(API::String::create(key));
</ins><span class="cx">
</span><span class="cx"> return API::Array::create(std::move(keys));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "PluginModuleInfo.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WebURL.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx"> void getPluginModuleInformation(const PluginModuleInfo& plugin, ImmutableDictionary::MapType& map)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- map.set(pluginInformationPathKey(), WebString::create(plugin.path));
- map.set(pluginInformationDisplayNameKey(), WebString::create(plugin.info.name));
</del><ins>+ map.set(pluginInformationPathKey(), API::String::create(plugin.path));
+ map.set(pluginInformationDisplayNameKey(), API::String::create(plugin.info.name));
</ins><span class="cx"> map.set(pluginInformationDefaultLoadPolicyKey(), API::UInt64::create(toWKPluginLoadPolicy(PluginInfoStore::defaultLoadPolicyForPlugin(plugin))));
</span><span class="cx">
</span><span class="cx"> getPlatformPluginModuleInformation(plugin, map);
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> if (!frameURLString.isEmpty())
</span><span class="cx"> map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
</span><span class="cx"> if (!mimeType.isEmpty())
</span><del>- map.set(pluginInformationMIMETypeKey(), WebString::create(mimeType));
</del><ins>+ map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
</ins><span class="cx"> if (!pageURLString.isEmpty())
</span><span class="cx"> map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
</span><span class="cx"> if (!pluginspageAttributeURLString.isEmpty())
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> if (!frameURLString.isEmpty())
</span><span class="cx"> map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
</span><span class="cx"> if (!mimeType.isEmpty())
</span><del>- map.set(pluginInformationMIMETypeKey(), WebString::create(mimeType));
</del><ins>+ map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
</ins><span class="cx"> if (!pageURLString.isEmpty())
</span><span class="cx"> map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapemacPluginInformationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -29,19 +29,19 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> #import "APINumber.h"
</span><ins>+#import "APIString.h"
</ins><span class="cx"> #import "PluginModuleInfo.h"
</span><span class="cx"> #import "PluginSandboxProfile.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><del>-#import "WebString.h"
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void getPlatformPluginModuleInformation(const PluginModuleInfo& plugin, ImmutableDictionary::MapType& map)
</span><span class="cx"> {
</span><del>- map.set(pluginInformationBundleIdentifierKey(), WebString::create(plugin.bundleIdentifier));
- map.set(pluginInformationBundleVersionKey(), WebString::create(plugin.versionString));
- map.set(pluginInformationBundleShortVersionKey(), WebString::create(plugin.shortVersionString));
</del><ins>+ map.set(pluginInformationBundleIdentifierKey(), API::String::create(plugin.bundleIdentifier));
+ map.set(pluginInformationBundleVersionKey(), API::String::create(plugin.versionString));
+ map.set(pluginInformationBundleShortVersionKey(), API::String::create(plugin.shortVersionString));
</ins><span class="cx"> map.set(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey(), API::Boolean::create(WKIsPluginUpdateAvailable(nsStringFromWebCoreString(plugin.bundleIdentifier))));
</span><span class="cx"> map.set(pluginInformationHasSandboxProfileKey(), API::Boolean::create(pluginHasSandboxProfile(plugin.bundleIdentifier)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "MutableDictionary.h"
</span><span class="cx"> #include "WebSerializedScriptValue.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WebURL.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case API::Object::Type::String: {
</span><del>- auto& string = static_cast<const WebString&>(object);
</del><ins>+ auto& string = static_cast<const API::String&>(object);
</ins><span class="cx"> encoder << string.string();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> if (!decoder.decode(string))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result = WebString::create(string);
</del><ins>+ result = API::String::create(string);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -42,7 +43,6 @@
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><span class="cx"> #include "WebSerializedScriptValue.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WebURL.h"
</span><span class="cx"> #include "WebURLRequest.h"
</span><span class="cx"> #include "WebURLResponse.h"
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::String: {
</span><del>- WebString* string = static_cast<WebString*>(m_root);
</del><ins>+ API::String* string = static_cast<API::String*>(m_root);
</ins><span class="cx"> encoder << string->string();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> String string;
</span><span class="cx"> if (!decoder.decode(string))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebString::create(string);
</del><ins>+ coder.m_root = API::String::create(string);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebData;
</span><del>-class WebString;
</del><span class="cx"> class WebURL;
</span><span class="cx">
</span><span class="cx"> class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebOpenPanelParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "WebOpenPanelParameters.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><del>-#include "WebString.h"
</del><ins>+#include "APIString.h"
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderLayer.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebRenderLayer.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/WebRenderLayer.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "WebPage.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderObject.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebRenderObject.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/WebRenderObject.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "WebRenderObject.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "WebPage.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> classNames.reserveInitialCapacity(element->classNames().size());
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0, size = element->classNames().size(); i < size; ++i)
</span><del>- classNames.append(WebString::create(element->classNames()[i]));
</del><ins>+ classNames.append(API::String::create(element->classNames()[i]));
</ins><span class="cx">
</span><span class="cx"> m_elementClassNames = API::Array::create(std::move(classNames));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebStringh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebString.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebString.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/Shared/WebString.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -1,118 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebString_h
-#define WebString_h
-
-#include "APIObject.h"
-#include <JavaScriptCore/InitializeThreading.h>
-#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/OpaqueJSString.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-#include <wtf/unicode/UTF8.h>
-
-namespace WebKit {
-
-// WebString - A string type suitable for vending to an API.
-
-class WebString : public API::ObjectImpl<API::Object::Type::String> {
-public:
- static PassRefPtr<WebString> createNull()
- {
- return adoptRef(new WebString());
- }
-
- static PassRefPtr<WebString> create(const String& string)
- {
- return adoptRef(new WebString(string));
- }
-
- static PassRefPtr<WebString> create(JSStringRef jsStringRef)
- {
- return adoptRef(new WebString(String(jsStringRef->string())));
- }
-
- static PassRefPtr<WebString> createFromUTF8String(const char* string)
- {
- return adoptRef(new WebString(String::fromUTF8(string)));
- }
-
- bool isNull() const { return m_string.isNull(); }
- bool isEmpty() const { return m_string.isEmpty(); }
-
- size_t length() const { return m_string.length(); }
- size_t getCharacters(UChar* buffer, size_t bufferLength) const
- {
- if (!bufferLength)
- return 0;
- bufferLength = std::min(bufferLength, static_cast<size_t>(m_string.length()));
- memcpy(buffer, m_string.characters(), bufferLength * sizeof(UChar));
- return bufferLength;
- }
-
- size_t maximumUTF8CStringSize() const { return m_string.length() * 3 + 1; }
- size_t getUTF8CString(char* buffer, size_t bufferSize)
- {
- if (!bufferSize)
- return 0;
- char* p = buffer;
- const UChar* d = m_string.characters();
- WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + m_string.length(), &p, p + bufferSize - 1, /* strict */ true);
- *p++ = '\0';
- if (result != WTF::Unicode::conversionOK && result != WTF::Unicode::targetExhausted)
- return 0;
- return p - buffer;
- }
-
- bool equal(WebString* other) { return m_string == other->m_string; }
- bool equalToUTF8String(const char* other) { return m_string == String::fromUTF8(other); }
- bool equalToUTF8StringIgnoringCase(const char* other) { return equalIgnoringCase(m_string, other); }
-
- const String& string() const { return m_string; }
-
- JSStringRef createJSString() const
- {
- JSC::initializeThreading();
- return OpaqueJSString::create(m_string).leakRef();
- }
-
-private:
- WebString()
- : m_string()
- {
- }
-
- WebString(const String& string)
- : m_string(!string.impl() ? String(StringImpl::empty()) : string)
- {
- }
-
- String m_string;
-};
-
-} // namespace WebKit
-
-#endif // WebString_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKCredential.h"
</span><span class="cx">
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebCredential.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WKAPICast.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::originKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginQuotaKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginUsageKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static WebString* key = WebString::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
</del><ins>+ static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
</ins><span class="cx"> return toAPI(key);
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -315,13 +315,13 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPageGetSessionHistoryURLValueType()
</span><span class="cx"> {
</span><del>- static WebString* sessionHistoryURLValueType = WebString::create("SessionHistoryURL").leakRef();
</del><ins>+ static API::String* sessionHistoryURLValueType = API::String::create("SessionHistoryURL").leakRef();
</ins><span class="cx"> return toAPI(sessionHistoryURLValueType);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPageGetSessionBackForwardListItemValueType()
</span><span class="cx"> {
</span><del>- static WebString* sessionBackForwardListValueType = WebString::create("SessionBackForwardListItem").leakRef();
</del><ins>+ static API::String* sessionBackForwardListValueType = API::String::create("SessionBackForwardListItem").leakRef();
</ins><span class="cx"> return toAPI(sessionBackForwardListValueType);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import "APIArray.h"
</span><span class="cx"> #import "APINumber.h"
</span><ins>+#import "APIString.h"
</ins><span class="cx"> #import "ImmutableDictionary.h"
</span><span class="cx"> #import "PluginInfoStore.h"
</span><span class="cx"> #import "PluginInformation.h"
</span><span class="lines">@@ -38,7 +39,6 @@
</span><span class="cx"> #import "WKSharedAPICast.h"
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WebContext.h"
</span><del>-#import "WebString.h"
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "APIArray.h"
</span><ins>+#import "APIString.h"
</ins><span class="cx"> #import "WKArray.h"
</span><span class="cx"> #import "WKPageGroup.h"
</span><span class="cx"> #import "WKPreferences.h"
</span><span class="lines">@@ -38,7 +39,6 @@
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKURL.h"
</span><span class="cx"> #import "WKURLCF.h"
</span><del>-#import "WebString.h"
</del><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPINavigationDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APINavigationData.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APINavigationData.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/APINavigationData.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx">
</span><span class="cx"> virtual ~NavigationData();
</span><span class="cx">
</span><del>- String title() const { return m_store.title; }
- String url() const { return m_store.url; }
</del><ins>+ WTF::String title() const { return m_store.title; }
+ WTF::String url() const { return m_store.url; }
</ins><span class="cx"> const WebCore::ResourceRequest& originalRequest() const { return m_store.originalRequest; }
</span><span class="cx"> const WebCore::ResourceResponse& response() const { return m_store.response; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationWebCredentialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -27,12 +27,10 @@
</span><span class="cx"> #define WebCredential_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "WebString.h"
-
</del><ins>+#include "APIString.h"
</ins><span class="cx"> #include <WebCore/Credential.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><del>-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebCertificateInfo;
</span><span class="lines">@@ -46,7 +44,7 @@
</span><span class="cx"> return adoptRef(new WebCredential(credential));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<WebCredential> create(WebString* username, WebString* password, WebCore::CredentialPersistence persistence)
</del><ins>+ static PassRefPtr<WebCredential> create(API::String* username, API::String* password, WebCore::CredentialPersistence persistence)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebCredential(WebCore::Credential(username->string(), password->string(), persistence)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> permissions.clear();
</span><span class="cx"> RefPtr<API::Array> knownOrigins = knownPermissions->keys();
</span><span class="cx"> for (size_t i = 0; i < knownOrigins->size(); ++i) {
</span><del>- WebString* origin = knownOrigins->at<WebString>(i);
</del><ins>+ API::String* origin = knownOrigins->at<API::String>(i);
</ins><span class="cx"> permissions.set(origin->string(), knownPermissions->get<API::Boolean>(origin->string())->value());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -135,9 +135,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_autoStartOrigins.clear();
</span><span class="cx"> for (size_t i = 0, length = originList.size(); i < length; ++i) {
</span><del>- if (originList.at(i)->type() != WebString::APIType)
</del><ins>+ if (originList.at(i)->type() != API::String::APIType)
</ins><span class="cx"> continue;
</span><del>- m_autoStartOrigins.append(static_cast<WebString*>(originList.at(i))->string());
</del><ins>+ m_autoStartOrigins.append(static_cast<API::String*>(originList.at(i))->string());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < sites->size(); ++i) {
</span><del>- if (WebString* site = sites->at<WebString>(i))
</del><ins>+ if (API::String* site = sites->at<API::String>(i))
</ins><span class="cx"> sitesVector.append(site->string());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> messageNameStringBuilder.append(".");
</span><span class="cx"> messageNameStringBuilder.append(messageName.data(), messageName.size());
</span><span class="cx">
</span><del>- s_invalidMessageCallback(toAPI(WebString::create(messageNameStringBuilder.toString()).get()));
</del><ins>+ s_invalidMessageCallback(toAPI(API::String::create(messageNameStringBuilder.toString()).get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::processDidCachePage(WebProcessProxy* process)
</span><span class="lines">@@ -1277,20 +1277,20 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& pluginModule : pluginModules) {
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><del>- map.set(ASCIILiteral("path"), WebString::create(pluginModule.path));
- map.set(ASCIILiteral("name"), WebString::create(pluginModule.info.name));
- map.set(ASCIILiteral("file"), WebString::create(pluginModule.info.file));
- map.set(ASCIILiteral("desc"), WebString::create(pluginModule.info.desc));
</del><ins>+ map.set(ASCIILiteral("path"), API::String::create(pluginModule.path));
+ map.set(ASCIILiteral("name"), API::String::create(pluginModule.info.name));
+ map.set(ASCIILiteral("file"), API::String::create(pluginModule.info.file));
+ map.set(ASCIILiteral("desc"), API::String::create(pluginModule.info.desc));
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<API::Object>> mimeTypes;
</span><span class="cx"> mimeTypes.reserveInitialCapacity(pluginModule.info.mimes.size());
</span><span class="cx"> for (const auto& mimeClassInfo : pluginModule.info.mimes)
</span><del>- mimeTypes.uncheckedAppend(WebString::create(mimeClassInfo.type));
</del><ins>+ mimeTypes.uncheckedAppend(API::String::create(mimeClassInfo.type));
</ins><span class="cx"> map.set(ASCIILiteral("mimes"), API::Array::create(std::move(mimeTypes)));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- map.set(ASCIILiteral("bundleId"), WebString::create(pluginModule.bundleIdentifier));
- map.set(ASCIILiteral("version"), WebString::create(pluginModule.versionString));
</del><ins>+ map.set(ASCIILiteral("bundleId"), API::String::create(pluginModule.bundleIdentifier));
+ map.set(ASCIILiteral("version"), API::String::create(pluginModule.versionString));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> plugins.uncheckedAppend(ImmutableDictionary::create(std::move(map)));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -168,8 +168,8 @@
</span><span class="cx"> for (const auto& databaseDetails : originAndDatabases.databases) {
</span><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><span class="cx">
</span><del>- detailsMap.set(databaseDetailsNameKey(), WebString::create(databaseDetails.name()));
- detailsMap.set(databaseDetailsDisplayNameKey(), WebString::create(databaseDetails.displayName()));
</del><ins>+ detailsMap.set(databaseDetailsNameKey(), API::String::create(databaseDetails.name()));
+ detailsMap.set(databaseDetailsDisplayNameKey(), API::String::create(databaseDetails.displayName()));
</ins><span class="cx"> detailsMap.set(databaseDetailsExpectedUsageKey(), API::UInt64::create(databaseDetails.expectedUsage()));
</span><span class="cx"> detailsMap.set(databaseDetailsCurrentUsageKey(), API::UInt64::create(databaseDetails.currentUsage()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -26,10 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebFormClient.h"
</span><span class="cx">
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebString.h"
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -40,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < textFieldValues.size(); ++i)
</span><del>- map.set(textFieldValues[i].first, WebString::create(textFieldValues[i].second));
</del><ins>+ map.set(textFieldValues[i].first, API::String::create(textFieldValues[i].second));
</ins><span class="cx"> RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::create(std::move(map));
</span><span class="cx">
</span><span class="cx"> m_client.willSubmitForm(toAPI(page), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), toAPI(userData), toAPI(listener), m_client.base.clientInfo);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -274,14 +274,14 @@
</span><span class="cx"> if (m_client.didFailToInitializePlugin_deprecatedForUseWithV0)
</span><span class="cx"> m_client.didFailToInitializePlugin_deprecatedForUseWithV0(
</span><span class="cx"> toAPI(page),
</span><del>- toAPI(pluginInformation->get<WebString>(pluginInformationMIMETypeKey())),
</del><ins>+ toAPI(pluginInformation->get<API::String>(pluginInformationMIMETypeKey())),
</ins><span class="cx"> m_client.base.clientInfo);
</span><span class="cx">
</span><span class="cx"> if (m_client.pluginDidFail_deprecatedForUseWithV1)
</span><span class="cx"> m_client.pluginDidFail_deprecatedForUseWithV1(
</span><span class="cx"> toAPI(page),
</span><span class="cx"> kWKErrorCodeCannotLoadPlugIn,
</span><del>- toAPI(pluginInformation->get<WebString>(pluginInformationMIMETypeKey())),
</del><ins>+ toAPI(pluginInformation->get<API::String>(pluginInformationMIMETypeKey())),
</ins><span class="cx"> 0,
</span><span class="cx"> 0,
</span><span class="cx"> m_client.base.clientInfo);
</span><span class="lines">@@ -300,9 +300,9 @@
</span><span class="cx"> m_client.pluginDidFail_deprecatedForUseWithV1(
</span><span class="cx"> toAPI(page),
</span><span class="cx"> kWKErrorCodeInsecurePlugInVersion,
</span><del>- toAPI(pluginInformation->get<WebString>(pluginInformationMIMETypeKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationBundleIdentifierKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationBundleVersionKey())),
</del><ins>+ toAPI(pluginInformation->get<API::String>(pluginInformationMIMETypeKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationBundleIdentifierKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationBundleVersionKey())),
</ins><span class="cx"> m_client.base.clientInfo);
</span><span class="cx">
</span><span class="cx"> if (m_client.pluginDidFail)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> loadPolicy = toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toWKPluginLoadPolicy(currentPluginLoadPolicy), toAPI(pluginInformation), &unavailabilityDescriptionOut, m_client.base.clientInfo));
</span><span class="cx">
</span><span class="cx"> if (unavailabilityDescriptionOut) {
</span><del>- RefPtr<WebString> webUnavailabilityDescription = adoptRef(toImpl(unavailabilityDescriptionOut));
</del><ins>+ RefPtr<API::String> webUnavailabilityDescription = adoptRef(toImpl(unavailabilityDescriptionOut));
</ins><span class="cx"> unavailabilityDescription = webUnavailabilityDescription->string();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -145,9 +145,9 @@
</span><span class="cx">
</span><span class="cx"> patternVector.reserveInitialCapacity(size);
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><del>- WebString* webString = array->at<WebString>(i);
- ASSERT(webString);
- patternVector.uncheckedAppend(webString->string());
</del><ins>+ API::String* string = array->at<API::String>(i);
+ ASSERT(string);
+ patternVector.uncheckedAppend(string->string());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return patternVector;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> if (!m_client.runJavaScriptPrompt)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- WebString* string = toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo));
</del><ins>+ API::String* string = toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo));
</ins><span class="cx"> if (!string)
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="lines">@@ -183,9 +183,9 @@
</span><span class="cx"> if (m_client.missingPluginButtonClicked_deprecatedForUseWithV0)
</span><span class="cx"> m_client.missingPluginButtonClicked_deprecatedForUseWithV0(
</span><span class="cx"> toAPI(page),
</span><del>- toAPI(pluginInformation->get<WebString>(pluginInformationMIMETypeKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())),
</del><ins>+ toAPI(pluginInformation->get<API::String>(pluginInformationMIMETypeKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationPluginURLKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationPluginspageAttributeURLKey())),
</ins><span class="cx"> m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx"> m_client.unavailablePluginButtonClicked_deprecatedForUseWithV1(
</span><span class="cx"> toAPI(page),
</span><span class="cx"> pluginUnavailabilityReason,
</span><del>- toAPI(pluginInformation->get<WebString>(pluginInformationMIMETypeKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationPluginURLKey())),
- toAPI(pluginInformation->get<WebString>(pluginInformationPluginspageAttributeURLKey())),
</del><ins>+ toAPI(pluginInformation->get<API::String>(pluginInformationMIMETypeKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationPluginURLKey())),
+ toAPI(pluginInformation->get<API::String>(pluginInformationPluginspageAttributeURLKey())),
</ins><span class="cx"> m_client.base.clientInfo);
</span><span class="cx">
</span><span class="cx"> if (m_client.unavailablePluginButtonClicked)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -2827,7 +2827,7 @@
</span><span class="cx"> BCF049E411FE20F600F86A58 /* WKBundleFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleFramePrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF049E511FE20F600F86A58 /* WKBundlePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF04C8C11FF9B7D00F86A58 /* APIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = "<group>"; };
</span><del>- BCF04C8E11FF9F6E00F86A58 /* WebString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebString.h; sourceTree = "<group>"; };
</del><ins>+ BCF04C8E11FF9F6E00F86A58 /* APIString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIString.h; sourceTree = "<group>"; };
</ins><span class="cx"> BCF18637167D071E00A1A85A /* CacheModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheModel.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3603,7 +3603,7 @@
</span><span class="cx"> 51217463164C21370037A5C1 /* WebResourceBuffer.h */,
</span><span class="cx"> F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
</span><span class="cx"> A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
</span><del>- BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
</del><ins>+ BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
</ins><span class="cx"> C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
</span><span class="cx"> BCDB86C01200FB97007254BE /* WebURL.h */,
</span><span class="cx"> BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "WKBundlePagePrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIString.h"
</ins><span class="cx"> #include "InjectedBundleBackForwardList.h"
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx"> #include "PageBanner.h"
</span><span class="lines">@@ -44,7 +45,6 @@
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><del>-#include "WebString.h"
</del><span class="cx"> #include "WebURL.h"
</span><span class="cx"> #include "WebURLRequest.h"
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> originIdentifiers.reserveInitialCapacity(origins.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& origin : origins)
</span><del>- originIdentifiers.uncheckedAppend(WebString::create(origin->databaseIdentifier()));
</del><ins>+ originIdentifiers.uncheckedAppend(API::String::create(origin->databaseIdentifier()));
</ins><span class="cx">
</span><span class="cx"> return API::Array::create(std::move(originIdentifiers));
</span><span class="cx"> }
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> return patternsVector;
</span><span class="cx">
</span><span class="cx"> patternsVector.reserveInitialCapacity(size);
</span><del>- for (const auto& entry : patterns->elementsOfType<WebString>())
</del><ins>+ for (const auto& entry : patterns->elementsOfType<API::String>())
</ins><span class="cx"> patternsVector.uncheckedAppend(entry->string());
</span><span class="cx"> return patternsVector;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(typesArray->size() == dataArray->size());
</span><span class="cx">
</span><del>- for (const auto& type : typesArray->elementsOfType<WebString>())
</del><ins>+ for (const auto& type : typesArray->elementsOfType<API::String>())
</ins><span class="cx"> pasteboardTypes.append(type->string());
</span><span class="cx">
</span><span class="cx"> for (const auto& item : dataArray->elementsOfType<WebData>()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < values.size(); ++i)
</span><del>- map.set(values[i].first, WebString::create(values[i].second));
</del><ins>+ map.set(values[i].first, API::String::create(values[i].second));
</ins><span class="cx"> auto textFieldsMap = ImmutableDictionary::create(std::move(map));
</span><span class="cx">
</span><span class="cx"> m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client.base.clientInfo);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < values.size(); ++i)
</span><del>- map.set(values[i].first, WebString::create(values[i].second));
</del><ins>+ map.set(values[i].first, API::String::create(values[i].second));
</ins><span class="cx"> auto textFieldsMap = ImmutableDictionary::create(std::move(map));
</span><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.shouldGenerateFileForUpload)
</span><span class="cx"> return String();
</span><del>- RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.shouldGenerateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> generatedFilePath = adoptRef(toImpl(m_client.shouldGenerateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));
</ins><span class="cx"> return generatedFilePath ? generatedFilePath->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.shouldGenerateFileForUpload)
</span><span class="cx"> return String();
</span><del>- RefPtr<WebString> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));
</ins><span class="cx"> return generatedFilePath ? generatedFilePath->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> if (!m_client.createPlugInStartLabelTitle)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- RefPtr<WebString> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(toAPI(mimeType.impl()), m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> title = adoptRef(toImpl(m_client.createPlugInStartLabelTitle(toAPI(mimeType.impl()), m_client.base.clientInfo)));
</ins><span class="cx"> return title ? title->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> if (!m_client.createPlugInStartLabelSubtitle)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- RefPtr<WebString> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(toAPI(mimeType.impl()), m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> subtitle = adoptRef(toImpl(m_client.createPlugInStartLabelSubtitle(toAPI(mimeType.impl()), m_client.base.clientInfo)));
</ins><span class="cx"> return subtitle ? subtitle->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> if (!m_client.createPlugInExtraStyleSheet)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- RefPtr<WebString> styleSheet = adoptRef(toImpl(m_client.createPlugInExtraStyleSheet(m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> styleSheet = adoptRef(toImpl(m_client.createPlugInExtraStyleSheet(m_client.base.clientInfo)));
</ins><span class="cx"> return styleSheet ? styleSheet->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if (!m_client.createPlugInExtraScript)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- RefPtr<WebString> script = adoptRef(toImpl(m_client.createPlugInExtraScript(m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> script = adoptRef(toImpl(m_client.createPlugInExtraScript(m_client.base.clientInfo)));
</ins><span class="cx"> return script ? script->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm (160607 => 160608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2013-12-15 00:43:57 UTC (rev 160607)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2013-12-15 01:09:47 UTC (rev 160608)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> size_t count = WKArrayGetSize(result.get());
</span><span class="cx"> for (size_t k = 0; k < count; k++) {
</span><span class="cx"> WKTypeRef item = WKArrayGetItemAtIndex(result.get(), k);
</span><del>- if (toImpl(item)->type() == WebString::APIType) {
</del><ins>+ if (toImpl(item)->type() == API::String::APIType) {
</ins><span class="cx"> RetainPtr<CFStringRef> name = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)item));
</span><span class="cx"> [names addObject:(NSString *)name.get()];
</span><span class="cx"> }
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- if (toImpl(result.get())->type() == WebString::APIType)
</del><ins>+ if (toImpl(result.get())->type() == API::String::APIType)
</ins><span class="cx"> return CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)result.get()));
</span><span class="cx"> else if (toImpl(result.get())->type() == API::Boolean::APIType)
</span><span class="cx"> return [NSNumber numberWithBool:WKBooleanGetValue(static_cast<WKBooleanRef>(result.get()))];
</span></span></pre>
</div>
</div>
</body>
</html>