<!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>[160811] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160811">160811</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 17:22:56 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate some WKMutableDictionary functions
https://bugs.webkit.org/show_bug.cgi?id=125962
Reviewed by Tim Horton.
Source/WebKit2:
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKDictionaryIsMutable):
(WKDictionaryAddItem):
(WKDictionaryRemoveItem):
* Shared/API/c/WKMutableDictionary.cpp:
* Shared/API/c/WKMutableDictionary.h:
Tools:
* TestWebKitAPI/PlatformUtilities.cpp:
(TestWebKitAPI::Util::createInitializationDictionaryForInjectedBundleTest):
* TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
(TestWebKitAPI::didAssociateFormControls):
* TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
(TestWebKitAPI::WillLoadTest::willLoadURLRequest):
(TestWebKitAPI::WillLoadTest::willLoadDataRequest):
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::createMouseMessageBody):
(WTR::EventSendingController::mouseMoveTo):
(WTR::EventSendingController::leapForward):
(WTR::createKeyDownMessageBody):
(WTR::EventSendingController::mouseScrollBy):
(WTR::EventSendingController::continuousMouseScrollBy):
(WTR::EventSendingController::addTouchPoint):
(WTR::EventSendingController::updateTouchPoint):
(WTR::EventSendingController::setTouchModifier):
(WTR::EventSendingController::setTouchPointRadius):
(WTR::EventSendingController::touchStart):
(WTR::EventSendingController::touchMove):
(WTR::EventSendingController::touchEnd):
(WTR::EventSendingController::touchCancel):
(WTR::EventSendingController::clearTouchPoints):
(WTR::EventSendingController::releaseTouchPoint):
(WTR::EventSendingController::cancelTouchPoint):
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::done):
(WTR::InjectedBundle::setMockGeolocationPosition):
(WTR::InjectedBundle::setCustomPolicyDelegate):
(WTR::InjectedBundle::setVisibilityState):
(WTR::InjectedBundle::queueLoad):
(WTR::InjectedBundle::queueLoadHTMLString):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
(WTR::TestController::resetStateToConsistentValues):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::updateThreadedScrollingForCurrentTest):
(WTR::updateLayoutType):
(WTR::TestInvocation::invoke):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKMutableDictionarycpp">trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKMutableDictionaryh">trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformUtilitiescpp">trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-18 Anders Carlsson <andersca@apple.com>
+
+ Deprecate some WKMutableDictionary functions
+ https://bugs.webkit.org/show_bug.cgi?id=125962
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKDictionaryIsMutable):
+ (WKDictionaryAddItem):
+ (WKDictionaryRemoveItem):
+ * Shared/API/c/WKMutableDictionary.cpp:
+ * Shared/API/c/WKMutableDictionary.h:
+
</ins><span class="cx"> 2013-12-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Allow the web process plug-in to intercept resource requests
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -25,13 +25,22 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><ins>+#include "MutableDictionary.h"
</ins><span class="cx"> #include "WKArray.h"
</span><ins>+#include "WKMutableDictionary.h"
+#include "WKSharedAPICast.h"
</ins><span class="cx">
</span><span class="cx"> // Deprecated functions that should be removed from the framework once nobody uses them.
</span><span class="cx">
</span><ins>+using namespace WebKit;
+
</ins><span class="cx"> extern "C" {
</span><span class="cx"> WK_EXPORT bool WKArrayIsMutable(WKArrayRef array);
</span><span class="cx">
</span><ins>+WK_EXPORT bool WKDictionaryAddItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
+WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
+WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
</span><span class="cx"> #endif
</span><span class="lines">@@ -42,6 +51,22 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKDictionaryIsMutable(WKDictionaryRef dictionaryRef)
+{
+ return toImpl(dictionaryRef)->isMutable();
+}
+
+bool WKDictionaryAddItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
+{
+ return toImpl(dictionaryRef)->add(toImpl(keyRef)->string(), toImpl(itemRef));
+}
+
+void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef)
+{
+ toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
+}
+
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKMutableDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -37,22 +37,8 @@
</span><span class="cx"> return toAPI(dictionary.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WKDictionaryIsMutable(WKDictionaryRef dictionaryRef)
-{
- return toImpl(dictionaryRef)->isMutable();
-}
-
-bool WKDictionaryAddItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
-{
- return toImpl(dictionaryRef)->add(toImpl(keyRef)->string(), toImpl(itemRef));
-}
-
</del><span class="cx"> bool WKDictionarySetItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> return toImpl(dictionaryRef)->set(toImpl(keyRef)->string(), toImpl(itemRef));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef)
-{
- toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKMutableDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.h (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.h 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.h 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -38,11 +38,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKMutableDictionaryRef WKMutableDictionaryCreate();
</span><span class="cx">
</span><del>-WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
-
-WK_EXPORT bool WKDictionaryAddItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
</del><span class="cx"> WK_EXPORT bool WKDictionarySetItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
</span><del>-WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
</del><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/ChangeLog 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2013-12-18 Anders Carlsson <andersca@apple.com>
+
+ Deprecate some WKMutableDictionary functions
+ https://bugs.webkit.org/show_bug.cgi?id=125962
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/PlatformUtilities.cpp:
+ (TestWebKitAPI::Util::createInitializationDictionaryForInjectedBundleTest):
+ * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
+ (TestWebKitAPI::didAssociateFormControls):
+ * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
+ (TestWebKitAPI::WillLoadTest::willLoadURLRequest):
+ (TestWebKitAPI::WillLoadTest::willLoadDataRequest):
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::createMouseMessageBody):
+ (WTR::EventSendingController::mouseMoveTo):
+ (WTR::EventSendingController::leapForward):
+ (WTR::createKeyDownMessageBody):
+ (WTR::EventSendingController::mouseScrollBy):
+ (WTR::EventSendingController::continuousMouseScrollBy):
+ (WTR::EventSendingController::addTouchPoint):
+ (WTR::EventSendingController::updateTouchPoint):
+ (WTR::EventSendingController::setTouchModifier):
+ (WTR::EventSendingController::setTouchPointRadius):
+ (WTR::EventSendingController::touchStart):
+ (WTR::EventSendingController::touchMove):
+ (WTR::EventSendingController::touchEnd):
+ (WTR::EventSendingController::touchCancel):
+ (WTR::EventSendingController::clearTouchPoints):
+ (WTR::EventSendingController::releaseTouchPoint):
+ (WTR::EventSendingController::cancelTouchPoint):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::done):
+ (WTR::InjectedBundle::setMockGeolocationPosition):
+ (WTR::InjectedBundle::setCustomPolicyDelegate):
+ (WTR::InjectedBundle::setVisibilityState):
+ (WTR::InjectedBundle::queueLoad):
+ (WTR::InjectedBundle::queueLoadHTMLString):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+ (WTR::TestController::resetStateToConsistentValues):
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::updateThreadedScrollingForCurrentTest):
+ (WTR::updateLayoutType):
+ (WTR::TestInvocation::invoke):
+
</ins><span class="cx"> 2013-12-18 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Add support for building GtkLauncher
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -45,10 +45,10 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> testNameKey(AdoptWK, WKStringCreateWithUTF8CString("TestName"));
</span><span class="cx"> WKRetainPtr<WKStringRef> testNameString(AdoptWK, WKStringCreateWithUTF8CString(testName.c_str()));
</span><del>- WKDictionaryAddItem(initializationDictionary, testNameKey.get(), testNameString.get());
</del><ins>+ WKDictionarySetItem(initializationDictionary, testNameKey.get(), testNameString.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> userDataKey(AdoptWK, WKStringCreateWithUTF8CString("UserData"));
</span><del>- WKDictionaryAddItem(initializationDictionary, userDataKey.get(), userData);
</del><ins>+ WKDictionarySetItem(initializationDictionary, userDataKey.get(), userData);
</ins><span class="cx">
</span><span class="cx"> return initializationDictionary;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx">
</span><del>- WKDictionaryAddItem(messageBody.get(), Util::toWK("Page").get(), page);
</del><ins>+ WKDictionarySetItem(messageBody.get(), Util::toWK("Page").get(), page);
</ins><span class="cx"> WKRetainPtr<WKUInt64Ref> numberOfElements = adoptWK(WKUInt64Create(WKArrayGetSize(elementHandles)));
</span><del>- WKDictionaryAddItem(messageBody.get(), Util::toWK("NumberOfControls").get(), numberOfElements.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), Util::toWK("NumberOfControls").get(), numberOfElements.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("DidReceiveDidAssociateFormControls").get(), messageBody.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx">
</span><del>- WKDictionaryAddItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</del><ins>+ WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
</span><span class="cx"> }
</span><span class="lines">@@ -54,12 +54,12 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx">
</span><del>- WKDictionaryAddItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("DataReturn").get(), data);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("MIMETypeReturn").get(), MIMEType);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("EncodingNameReturn").get(), encodingName);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
- WKDictionaryAddItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</del><ins>+ WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("DataReturn").get(), data);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("MIMETypeReturn").get(), MIMEType);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("EncodingNameReturn").get(), encodingName);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
+ WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -192,15 +192,15 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString(state == MouseUp ? "MouseUp" : "MouseDown"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody, subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody, subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> buttonKey = adoptWK(WKStringCreateWithUTF8CString("Button"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> buttonRef = adoptWK(WKUInt64Create(button));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody, buttonKey.get(), buttonRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody, buttonKey.get(), buttonRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> modifiersKey = adoptWK(WKStringCreateWithUTF8CString("Modifiers"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> modifiersRef = adoptWK(WKUInt64Create(modifiers));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody, modifiersKey.get(), modifiersRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody, modifiersKey.get(), modifiersRef.get());
</ins><span class="cx">
</span><span class="cx"> return EventSenderMessageBody;
</span><span class="cx"> }
</span><span class="lines">@@ -238,15 +238,15 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseMoveTo"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -258,11 +258,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("LeapForward"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> timeKey(AdoptWK, WKStringCreateWithUTF8CString("TimeInMilliseconds"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> timeRef(AdoptWK, WKUInt64Create(milliseconds));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), timeKey.get(), timeRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), timeKey.get(), timeRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -289,18 +289,18 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("KeyDown"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> keyKey(AdoptWK, WKStringCreateWithUTF8CString("Key"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), keyKey.get(), toWK(key).get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), keyKey.get(), toWK(key).get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> modifiersKey(AdoptWK, WKStringCreateWithUTF8CString("Modifiers"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> modifiersRef(AdoptWK, WKUInt64Create(modifiers));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), modifiersKey.get(), modifiersRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), modifiersKey.get(), modifiersRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> locationKey(AdoptWK, WKStringCreateWithUTF8CString("Location"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> locationRef(AdoptWK, WKUInt64Create(location));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), locationKey.get(), locationRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), locationKey.get(), locationRef.get());
</ins><span class="cx">
</span><span class="cx"> return EventSenderMessageBody;
</span><span class="cx"> }
</span><span class="lines">@@ -333,15 +333,15 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseScrollBy"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -353,19 +353,19 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ContinuousMouseScrollBy"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> pagedKey(AdoptWK, WKStringCreateWithUTF8CString("Paged"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> pagedRef(AdoptWK, WKUInt64Create(paged));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), pagedKey.get(), pagedRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), pagedKey.get(), pagedRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -447,15 +447,15 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("AddTouchPoint"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(x));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -467,19 +467,19 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("UpdateTouchPoint"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(x));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("SetTouchModifier"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKEventModifiers mod = 0;
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(modifier, "ctrl"))
</span><span class="lines">@@ -505,11 +505,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> modifierKey(AdoptWK, WKStringCreateWithUTF8CString("Modifier"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> modifierRef(AdoptWK, WKUInt64Create(mod));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), modifierKey.get(), modifierRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), modifierKey.get(), modifierRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> enableKey(AdoptWK, WKStringCreateWithUTF8CString("Enable"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> enableRef(AdoptWK, WKUInt64Create(enable));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), enableKey.get(), enableRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), enableKey.get(), enableRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -522,15 +522,15 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("SetTouchPointRadius"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusX"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(radiusX));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusY"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(radiusY));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchStart"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchMove"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchEnd"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchCancel"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ClearTouchPoints"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -602,11 +602,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ReleaseTouchPoint"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -618,11 +618,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("CancelTouchPoint"));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
</span><del>- WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</del><ins>+ WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -293,13 +293,13 @@
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> doneMessageBody(AdoptWK, WKMutableDictionaryCreate());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> pixelResultKey = adoptWK(WKStringCreateWithUTF8CString("PixelResult"));
</span><del>- WKDictionaryAddItem(doneMessageBody.get(), pixelResultKey.get(), m_pixelResult.get());
</del><ins>+ WKDictionarySetItem(doneMessageBody.get(), pixelResultKey.get(), m_pixelResult.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> repaintRectsKey = adoptWK(WKStringCreateWithUTF8CString("RepaintRects"));
</span><del>- WKDictionaryAddItem(doneMessageBody.get(), repaintRectsKey.get(), m_repaintRects.get());
</del><ins>+ WKDictionarySetItem(doneMessageBody.get(), repaintRectsKey.get(), m_repaintRects.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> audioResultKey = adoptWK(WKStringCreateWithUTF8CString("AudioResult"));
</span><del>- WKDictionaryAddItem(doneMessageBody.get(), audioResultKey.get(), m_audioResult.get());
</del><ins>+ WKDictionarySetItem(doneMessageBody.get(), audioResultKey.get(), m_audioResult.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, doneMessageName.get(), doneMessageBody.get());
</span><span class="cx">
</span><span class="lines">@@ -398,47 +398,47 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> latitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("latitude"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> latitudeWK(AdoptWK, WKDoubleCreate(latitude));
</span><del>- WKDictionaryAddItem(messageBody.get(), latitudeKeyWK.get(), latitudeWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), latitudeKeyWK.get(), latitudeWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> longitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("longitude"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> longitudeWK(AdoptWK, WKDoubleCreate(longitude));
</span><del>- WKDictionaryAddItem(messageBody.get(), longitudeKeyWK.get(), longitudeWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), longitudeKeyWK.get(), longitudeWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> accuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("accuracy"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> accuracyWK(AdoptWK, WKDoubleCreate(accuracy));
</span><del>- WKDictionaryAddItem(messageBody.get(), accuracyKeyWK.get(), accuracyWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), accuracyKeyWK.get(), accuracyWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> providesAltitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesAltitude"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> providesAltitudeWK(AdoptWK, WKBooleanCreate(providesAltitude));
</span><del>- WKDictionaryAddItem(messageBody.get(), providesAltitudeKeyWK.get(), providesAltitudeWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), providesAltitudeKeyWK.get(), providesAltitudeWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> altitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("altitude"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> altitudeWK(AdoptWK, WKDoubleCreate(altitude));
</span><del>- WKDictionaryAddItem(messageBody.get(), altitudeKeyWK.get(), altitudeWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), altitudeKeyWK.get(), altitudeWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> providesAltitudeAccuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesAltitudeAccuracy"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> providesAltitudeAccuracyWK(AdoptWK, WKBooleanCreate(providesAltitudeAccuracy));
</span><del>- WKDictionaryAddItem(messageBody.get(), providesAltitudeAccuracyKeyWK.get(), providesAltitudeAccuracyWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), providesAltitudeAccuracyKeyWK.get(), providesAltitudeAccuracyWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> altitudeAccuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("altitudeAccuracy"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> altitudeAccuracyWK(AdoptWK, WKDoubleCreate(altitudeAccuracy));
</span><del>- WKDictionaryAddItem(messageBody.get(), altitudeAccuracyKeyWK.get(), altitudeAccuracyWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), altitudeAccuracyKeyWK.get(), altitudeAccuracyWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> providesHeadingKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesHeading"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> providesHeadingWK(AdoptWK, WKBooleanCreate(providesHeading));
</span><del>- WKDictionaryAddItem(messageBody.get(), providesHeadingKeyWK.get(), providesHeadingWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), providesHeadingKeyWK.get(), providesHeadingWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> headingKeyWK(AdoptWK, WKStringCreateWithUTF8CString("heading"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> headingWK(AdoptWK, WKDoubleCreate(heading));
</span><del>- WKDictionaryAddItem(messageBody.get(), headingKeyWK.get(), headingWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), headingKeyWK.get(), headingWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> providesSpeedKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesSpeed"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> providesSpeedWK(AdoptWK, WKBooleanCreate(providesSpeed));
</span><del>- WKDictionaryAddItem(messageBody.get(), providesSpeedKeyWK.get(), providesSpeedWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), providesSpeedKeyWK.get(), providesSpeedWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> speedKeyWK(AdoptWK, WKStringCreateWithUTF8CString("speed"));
</span><span class="cx"> WKRetainPtr<WKDoubleRef> speedWK(AdoptWK, WKDoubleCreate(speed));
</span><del>- WKDictionaryAddItem(messageBody.get(), speedKeyWK.get(), speedWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), speedKeyWK.get(), speedWK.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="lines">@@ -457,11 +457,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> enabledKeyWK(AdoptWK, WKStringCreateWithUTF8CString("enabled"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> enabledWK(AdoptWK, WKBooleanCreate(enabled));
</span><del>- WKDictionaryAddItem(messageBody.get(), enabledKeyWK.get(), enabledWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), enabledKeyWK.get(), enabledWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> permissiveKeyWK(AdoptWK, WKStringCreateWithUTF8CString("permissive"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> permissiveWK(AdoptWK, WKBooleanCreate(permissive));
</span><del>- WKDictionaryAddItem(messageBody.get(), permissiveKeyWK.get(), permissiveWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), permissiveKeyWK.get(), permissiveWK.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="lines">@@ -473,11 +473,11 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> visibilityStateKeyWK(AdoptWK, WKStringCreateWithUTF8CString("visibilityState"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> visibilityStateWK(AdoptWK, WKUInt64Create(visibilityState));
</span><del>- WKDictionaryAddItem(messageBody.get(), visibilityStateKeyWK.get(), visibilityStateWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), visibilityStateKeyWK.get(), visibilityStateWK.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> isInitialKeyWK(AdoptWK, WKStringCreateWithUTF8CString("isInitialState"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> isInitialWK(AdoptWK, WKBooleanCreate(isInitialState));
</span><del>- WKDictionaryAddItem(messageBody.get(), isInitialKeyWK.get(), isInitialWK.get());
</del><ins>+ WKDictionarySetItem(messageBody.get(), isInitialKeyWK.get(), isInitialWK.get());
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="lines">@@ -528,10 +528,10 @@
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> loadData(AdoptWK, WKMutableDictionaryCreate());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> urlKey(AdoptWK, WKStringCreateWithUTF8CString("url"));
</span><del>- WKDictionaryAddItem(loadData.get(), urlKey.get(), url);
</del><ins>+ WKDictionarySetItem(loadData.get(), urlKey.get(), url);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> targetKey(AdoptWK, WKStringCreateWithUTF8CString("target"));
</span><del>- WKDictionaryAddItem(loadData.get(), targetKey.get(), target);
</del><ins>+ WKDictionarySetItem(loadData.get(), targetKey.get(), target);
</ins><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), loadData.get());
</span><span class="cx"> }
</span><span class="lines">@@ -545,16 +545,16 @@
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> loadData(AdoptWK, WKMutableDictionaryCreate());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> contentKey(AdoptWK, WKStringCreateWithUTF8CString("content"));
</span><del>- WKDictionaryAddItem(loadData.get(), contentKey.get(), content);
</del><ins>+ WKDictionarySetItem(loadData.get(), contentKey.get(), content);
</ins><span class="cx">
</span><span class="cx"> if (baseURL) {
</span><span class="cx"> WKRetainPtr<WKStringRef> baseURLKey(AdoptWK, WKStringCreateWithUTF8CString("baseURL"));
</span><del>- WKDictionaryAddItem(loadData.get(), baseURLKey.get(), baseURL);
</del><ins>+ WKDictionarySetItem(loadData.get(), baseURLKey.get(), baseURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (unreachableURL) {
</span><span class="cx"> WKRetainPtr<WKStringRef> unreachableURLKey(AdoptWK, WKStringCreateWithUTF8CString("unreachableURL"));
</span><del>- WKDictionaryAddItem(loadData.get(), unreachableURLKey.get(), unreachableURL);
</del><ins>+ WKDictionarySetItem(loadData.get(), unreachableURLKey.get(), unreachableURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), loadData.get());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> viewOptions = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx"> WKRetainPtr<WKStringRef> useRemoteLayerTreeKey = adoptWK(WKStringCreateWithUTF8CString("RemoteLayerTree"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> useRemoteLayerTreeValue = adoptWK(WKBooleanCreate(m_shouldUseRemoteLayerTree));
</span><del>- WKDictionaryAddItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
</del><ins>+ WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> createWebViewWithOptions(viewOptions.get());
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> shouldGCKey = adoptWK(WKStringCreateWithUTF8CString("ShouldGC"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> shouldGCValue = adoptWK(WKBooleanCreate(m_gcBetweenTests));
</span><del>- WKDictionaryAddItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
</del><ins>+ WKDictionarySetItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
</ins><span class="cx">
</span><span class="cx"> WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), resetMessageBody.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (160810 => 160811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2013-12-19 01:14:26 UTC (rev 160810)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2013-12-19 01:22:56 UTC (rev 160811)
</span><span class="lines">@@ -149,11 +149,11 @@
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> viewOptions = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx"> WKRetainPtr<WKStringRef> useThreadedScrollingKey = adoptWK(WKStringCreateWithUTF8CString("ThreadedScrolling"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> useThreadedScrollingValue = adoptWK(WKBooleanCreate(shouldUseThreadedScrolling(pathOrURL)));
</span><del>- WKDictionaryAddItem(viewOptions.get(), useThreadedScrollingKey.get(), useThreadedScrollingValue.get());
</del><ins>+ WKDictionarySetItem(viewOptions.get(), useThreadedScrollingKey.get(), useThreadedScrollingValue.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> useRemoteLayerTreeKey = adoptWK(WKStringCreateWithUTF8CString("RemoteLayerTree"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> useRemoteLayerTreeValue = adoptWK(WKBooleanCreate(TestController::shared().shouldUseRemoteLayerTree()));
</span><del>- WKDictionaryAddItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
</del><ins>+ WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
</ins><span class="cx">
</span><span class="cx"> TestController::shared().ensureViewSupportsOptions(viewOptions.get());
</span><span class="cx"> #else
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> viewOptions = adoptWK(WKMutableDictionaryCreate());
</span><span class="cx"> WKRetainPtr<WKStringRef> useFixedLayoutKey = adoptWK(WKStringCreateWithUTF8CString("UseFixedLayout"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> useFixedLayoutValue = adoptWK(WKBooleanCreate(shouldUseFixedLayout(pathOrURL)));
</span><del>- WKDictionaryAddItem(viewOptions.get(), useFixedLayoutKey.get(), useFixedLayoutValue.get());
</del><ins>+ WKDictionarySetItem(viewOptions.get(), useFixedLayoutKey.get(), useFixedLayoutValue.get());
</ins><span class="cx">
</span><span class="cx"> TestController::shared().ensureViewSupportsOptions(viewOptions.get());
</span><span class="cx"> }
</span><span class="lines">@@ -201,19 +201,19 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> dumpFrameLoadDelegatesKey = adoptWK(WKStringCreateWithUTF8CString("DumpFrameLoadDelegates"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> dumpFrameLoadDelegatesValue = adoptWK(WKBooleanCreate(shouldLogFrameLoadDelegates(m_pathOrURL.c_str())));
</span><del>- WKDictionaryAddItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
</del><ins>+ WKDictionarySetItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> dumpPixelsKey = adoptWK(WKStringCreateWithUTF8CString("DumpPixels"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> dumpPixelsValue = adoptWK(WKBooleanCreate(m_dumpPixels));
</span><del>- WKDictionaryAddItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
</del><ins>+ WKDictionarySetItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> useWaitToDumpWatchdogTimerKey = adoptWK(WKStringCreateWithUTF8CString("UseWaitToDumpWatchdogTimer"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> useWaitToDumpWatchdogTimerValue = adoptWK(WKBooleanCreate(TestController::shared().useWaitToDumpWatchdogTimer()));
</span><del>- WKDictionaryAddItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
</del><ins>+ WKDictionarySetItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> timeoutKey = adoptWK(WKStringCreateWithUTF8CString("Timeout"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> timeoutValue = adoptWK(WKUInt64Create(m_timeout));
</span><del>- WKDictionaryAddItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
</del><ins>+ WKDictionarySetItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
</ins><span class="cx">
</span><span class="cx"> WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), beginTestMessageBody.get());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>