Changeset 160811 in webkit


Ignore:
Timestamp:
Dec 18, 2013 5:22:56 PM (10 years ago)
Author:
andersca@apple.com
Message:

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):

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160809 r160811  
     12013-12-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Deprecate some WKMutableDictionary functions
     4        https://bugs.webkit.org/show_bug.cgi?id=125962
     5
     6        Reviewed by Tim Horton.
     7
     8        * Shared/API/c/WKDeprecatedFunctions.cpp:
     9        (WKDictionaryIsMutable):
     10        (WKDictionaryAddItem):
     11        (WKDictionaryRemoveItem):
     12        * Shared/API/c/WKMutableDictionary.cpp:
     13        * Shared/API/c/WKMutableDictionary.h:
     14
    1152013-12-18  Dan Bernstein  <mitz@apple.com>
    216

  • trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp

    r159882 r160811  
    2626#include "config.h"
    2727
     28#include "MutableDictionary.h"
    2829#include "WKArray.h"
     30#include "WKMutableDictionary.h"
     31#include "WKSharedAPICast.h"
    2932
    3033// Deprecated functions that should be removed from the framework once nobody uses them.
    3134
     35using namespace WebKit;
     36
    3237extern "C" {
    3338WK_EXPORT bool WKArrayIsMutable(WKArrayRef array);
     39
     40WK_EXPORT bool WKDictionaryAddItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
     41WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
     42WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
    3443
    3544#if PLATFORM(MAC)
    … …  
    4352}
    4453
     54bool WKDictionaryIsMutable(WKDictionaryRef dictionaryRef)
     55{
     56    return toImpl(dictionaryRef)->isMutable();
     57}
     58
     59bool WKDictionaryAddItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
     60{
     61    return toImpl(dictionaryRef)->add(toImpl(keyRef)->string(), toImpl(itemRef));
     62}
     63
     64void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef)
     65{
     66    toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
     67}
     68
     69
    4570#if PLATFORM(MAC)
    4671CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)

  • trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp

    r99239 r160811  
    3838}
    3939
    40 bool WKDictionaryIsMutable(WKDictionaryRef dictionaryRef)
    41 {
    42     return toImpl(dictionaryRef)->isMutable();
    43 }
    44 
    45 bool WKDictionaryAddItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
    46 {
    47     return toImpl(dictionaryRef)->add(toImpl(keyRef)->string(), toImpl(itemRef));
    48 }
    49 
    5040bool WKDictionarySetItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
    5141{
    … …  
    5343}
    5444
    55 void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef)
    56 {
    57     toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
    58 }

  • trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.h

    r95901 r160811  
    3939WK_EXPORT WKMutableDictionaryRef WKMutableDictionaryCreate();
    4040
    41 WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
    42 
    43 WK_EXPORT bool WKDictionaryAddItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
    4441WK_EXPORT bool WKDictionarySetItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
    45 WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
    4642
    4743#ifdef __cplusplus

  • trunk/Tools/ChangeLog

    r160805 r160811  
     12013-12-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Deprecate some WKMutableDictionary functions
     4        https://bugs.webkit.org/show_bug.cgi?id=125962
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/PlatformUtilities.cpp:
     9        (TestWebKitAPI::Util::createInitializationDictionaryForInjectedBundleTest):
     10        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
     11        (TestWebKitAPI::didAssociateFormControls):
     12        * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
     13        (TestWebKitAPI::WillLoadTest::willLoadURLRequest):
     14        (TestWebKitAPI::WillLoadTest::willLoadDataRequest):
     15        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
     16        (WTR::createMouseMessageBody):
     17        (WTR::EventSendingController::mouseMoveTo):
     18        (WTR::EventSendingController::leapForward):
     19        (WTR::createKeyDownMessageBody):
     20        (WTR::EventSendingController::mouseScrollBy):
     21        (WTR::EventSendingController::continuousMouseScrollBy):
     22        (WTR::EventSendingController::addTouchPoint):
     23        (WTR::EventSendingController::updateTouchPoint):
     24        (WTR::EventSendingController::setTouchModifier):
     25        (WTR::EventSendingController::setTouchPointRadius):
     26        (WTR::EventSendingController::touchStart):
     27        (WTR::EventSendingController::touchMove):
     28        (WTR::EventSendingController::touchEnd):
     29        (WTR::EventSendingController::touchCancel):
     30        (WTR::EventSendingController::clearTouchPoints):
     31        (WTR::EventSendingController::releaseTouchPoint):
     32        (WTR::EventSendingController::cancelTouchPoint):
     33        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     34        (WTR::InjectedBundle::done):
     35        (WTR::InjectedBundle::setMockGeolocationPosition):
     36        (WTR::InjectedBundle::setCustomPolicyDelegate):
     37        (WTR::InjectedBundle::setVisibilityState):
     38        (WTR::InjectedBundle::queueLoad):
     39        (WTR::InjectedBundle::queueLoadHTMLString):
     40        * WebKitTestRunner/TestController.cpp:
     41        (WTR::TestController::initialize):
     42        (WTR::TestController::resetStateToConsistentValues):
     43        * WebKitTestRunner/TestInvocation.cpp:
     44        (WTR::updateThreadedScrollingForCurrentTest):
     45        (WTR::updateLayoutType):
     46        (WTR::TestInvocation::invoke):
     47
    1482013-12-18  Martin Robinson  <mrobinson@igalia.com>
    249

  • trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp

    r156100 r160811  
    4646    WKRetainPtr<WKStringRef> testNameKey(AdoptWK, WKStringCreateWithUTF8CString("TestName"));
    4747    WKRetainPtr<WKStringRef> testNameString(AdoptWK, WKStringCreateWithUTF8CString(testName.c_str()));
    48     WKDictionaryAddItem(initializationDictionary, testNameKey.get(), testNameString.get());
     48    WKDictionarySetItem(initializationDictionary, testNameKey.get(), testNameString.get());
    4949
    5050    WKRetainPtr<WKStringRef> userDataKey(AdoptWK, WKStringCreateWithUTF8CString("UserData"));
    51     WKDictionaryAddItem(initializationDictionary, userDataKey.get(), userData);
     51    WKDictionarySetItem(initializationDictionary, userDataKey.get(), userData);
    5252
    5353    return initializationDictionary;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp

    r160104 r160811  
    5151    WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
    5252
    53     WKDictionaryAddItem(messageBody.get(), Util::toWK("Page").get(), page);
     53    WKDictionarySetItem(messageBody.get(), Util::toWK("Page").get(), page);
    5454    WKRetainPtr<WKUInt64Ref> numberOfElements = adoptWK(WKUInt64Create(WKArrayGetSize(elementHandles)));
    55     WKDictionaryAddItem(messageBody.get(), Util::toWK("NumberOfControls").get(), numberOfElements.get());
     55    WKDictionarySetItem(messageBody.get(), Util::toWK("NumberOfControls").get(), numberOfElements.get());
    5656
    5757    WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("DidReceiveDidAssociateFormControls").get(), messageBody.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp

    r160104 r160811  
    4545        WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
    4646
    47         WKDictionaryAddItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
    48         WKDictionaryAddItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
     47        WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
     48        WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
    4949
    5050        WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
    … …  
    5555        WKRetainPtr<WKMutableDictionaryRef> messageBody = adoptWK(WKMutableDictionaryCreate());
    5656
    57         WKDictionaryAddItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
    58         WKDictionaryAddItem(messageBody.get(), Util::toWK("DataReturn").get(), data);
    59         WKDictionaryAddItem(messageBody.get(), Util::toWK("MIMETypeReturn").get(), MIMEType);
    60         WKDictionaryAddItem(messageBody.get(), Util::toWK("EncodingNameReturn").get(), encodingName);
    61         WKDictionaryAddItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
    62         WKDictionaryAddItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
     57        WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
     58        WKDictionarySetItem(messageBody.get(), Util::toWK("DataReturn").get(), data);
     59        WKDictionarySetItem(messageBody.get(), Util::toWK("MIMETypeReturn").get(), MIMEType);
     60        WKDictionarySetItem(messageBody.get(), Util::toWK("EncodingNameReturn").get(), encodingName);
     61        WKDictionarySetItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
     62        WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
    6363
    6464        WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());

  • trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp

    r156100 r160811  
    193193    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    194194    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString(state == MouseUp ? "MouseUp" : "MouseDown"));
    195     WKDictionaryAddItem(EventSenderMessageBody, subMessageKey.get(), subMessageName.get());
     195    WKDictionarySetItem(EventSenderMessageBody, subMessageKey.get(), subMessageName.get());
    196196
    197197    WKRetainPtr<WKStringRef> buttonKey = adoptWK(WKStringCreateWithUTF8CString("Button"));
    198198    WKRetainPtr<WKUInt64Ref> buttonRef = adoptWK(WKUInt64Create(button));
    199     WKDictionaryAddItem(EventSenderMessageBody, buttonKey.get(), buttonRef.get());
     199    WKDictionarySetItem(EventSenderMessageBody, buttonKey.get(), buttonRef.get());
    200200
    201201    WKRetainPtr<WKStringRef> modifiersKey = adoptWK(WKStringCreateWithUTF8CString("Modifiers"));
    202202    WKRetainPtr<WKUInt64Ref> modifiersRef = adoptWK(WKUInt64Create(modifiers));
    203     WKDictionaryAddItem(EventSenderMessageBody, modifiersKey.get(), modifiersRef.get());
     203    WKDictionarySetItem(EventSenderMessageBody, modifiersKey.get(), modifiersRef.get());
    204204
    205205    return EventSenderMessageBody;
    … …  
    239239    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    240240    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseMoveTo"));
    241     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     241    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    242242
    243243    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
    244244    WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
    245     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     245    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    246246
    247247    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
    248248    WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
    249     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     249    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    250250
    251251    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    259259    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    260260    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("LeapForward"));
    261     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     261    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    262262
    263263    WKRetainPtr<WKStringRef> timeKey(AdoptWK, WKStringCreateWithUTF8CString("TimeInMilliseconds"));
    264264    WKRetainPtr<WKUInt64Ref> timeRef(AdoptWK, WKUInt64Create(milliseconds));
    265     WKDictionaryAddItem(EventSenderMessageBody.get(), timeKey.get(), timeRef.get());
     265    WKDictionarySetItem(EventSenderMessageBody.get(), timeKey.get(), timeRef.get());
    266266
    267267    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    290290    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    291291    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("KeyDown"));
    292     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     292    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    293293
    294294    WKRetainPtr<WKStringRef> keyKey(AdoptWK, WKStringCreateWithUTF8CString("Key"));
    295     WKDictionaryAddItem(EventSenderMessageBody.get(), keyKey.get(), toWK(key).get());
     295    WKDictionarySetItem(EventSenderMessageBody.get(), keyKey.get(), toWK(key).get());
    296296
    297297    WKRetainPtr<WKStringRef> modifiersKey(AdoptWK, WKStringCreateWithUTF8CString("Modifiers"));
    298298    WKRetainPtr<WKUInt64Ref> modifiersRef(AdoptWK, WKUInt64Create(modifiers));
    299     WKDictionaryAddItem(EventSenderMessageBody.get(), modifiersKey.get(), modifiersRef.get());
     299    WKDictionarySetItem(EventSenderMessageBody.get(), modifiersKey.get(), modifiersRef.get());
    300300
    301301    WKRetainPtr<WKStringRef> locationKey(AdoptWK, WKStringCreateWithUTF8CString("Location"));
    302302    WKRetainPtr<WKUInt64Ref> locationRef(AdoptWK, WKUInt64Create(location));
    303     WKDictionaryAddItem(EventSenderMessageBody.get(), locationKey.get(), locationRef.get());
     303    WKDictionarySetItem(EventSenderMessageBody.get(), locationKey.get(), locationRef.get());
    304304
    305305    return EventSenderMessageBody;
    … …  
    334334    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    335335    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseScrollBy"));
    336     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     336    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    337337
    338338    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
    339339    WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
    340     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     340    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    341341
    342342    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
    343343    WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
    344     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     344    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    345345
    346346    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    354354    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    355355    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ContinuousMouseScrollBy"));
    356     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     356    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    357357
    358358    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
    359359    WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
    360     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     360    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    361361
    362362    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
    363363    WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
    364     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     364    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    365365
    366366    WKRetainPtr<WKStringRef> pagedKey(AdoptWK, WKStringCreateWithUTF8CString("Paged"));
    367367    WKRetainPtr<WKUInt64Ref> pagedRef(AdoptWK, WKUInt64Create(paged));
    368     WKDictionaryAddItem(EventSenderMessageBody.get(), pagedKey.get(), pagedRef.get());
     368    WKDictionarySetItem(EventSenderMessageBody.get(), pagedKey.get(), pagedRef.get());
    369369
    370370    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    448448    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    449449    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("AddTouchPoint"));
    450     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     450    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    451451
    452452    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
    453453    WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(x));
    454     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     454    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    455455
    456456    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
    457457    WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
    458     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     458    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    459459
    460460    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    468468    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    469469    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("UpdateTouchPoint"));
    470     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     470    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    471471
    472472    WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
    473473    WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
    474     WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
     474    WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
    475475
    476476    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
    477477    WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(x));
    478     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     478    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    479479
    480480    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
    481481    WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
    482     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     482    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    483483
    484484    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    492492    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    493493    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("SetTouchModifier"));
    494     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     494    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    495495
    496496    WKEventModifiers mod = 0;
    … …  
    506506    WKRetainPtr<WKStringRef> modifierKey(AdoptWK, WKStringCreateWithUTF8CString("Modifier"));
    507507    WKRetainPtr<WKUInt64Ref> modifierRef(AdoptWK, WKUInt64Create(mod));
    508     WKDictionaryAddItem(EventSenderMessageBody.get(), modifierKey.get(), modifierRef.get());
     508    WKDictionarySetItem(EventSenderMessageBody.get(), modifierKey.get(), modifierRef.get());
    509509
    510510    WKRetainPtr<WKStringRef> enableKey(AdoptWK, WKStringCreateWithUTF8CString("Enable"));
    511511    WKRetainPtr<WKUInt64Ref> enableRef(AdoptWK, WKUInt64Create(enable));
    512     WKDictionaryAddItem(EventSenderMessageBody.get(), enableKey.get(), enableRef.get());
     512    WKDictionarySetItem(EventSenderMessageBody.get(), enableKey.get(), enableRef.get());
    513513
    514514    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    523523    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    524524    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("SetTouchPointRadius"));
    525     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     525    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    526526
    527527    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusX"));
    528528    WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(radiusX));
    529     WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
     529    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
    530530
    531531    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusY"));
    532532    WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(radiusY));
    533     WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
     533    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
    534534
    535535    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    543543    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    544544    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchStart"));
    545     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     545    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    546546
    547547    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    555555    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    556556    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchMove"));
    557     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     557    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    558558
    559559    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    567567    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    568568    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchEnd"));
    569     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     569    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    570570
    571571    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    579579    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    580580    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchCancel"));
    581     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     581    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    582582
    583583    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    591591    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    592592    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ClearTouchPoints"));
    593     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     593    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    594594
    595595    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    603603    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    604604    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ReleaseTouchPoint"));
    605     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     605    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    606606
    607607    WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
    608608    WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
    609     WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
     609    WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
    610610
    611611    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
    … …  
    619619    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
    620620    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("CancelTouchPoint"));
    621     WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
     621    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
    622622
    623623    WKRetainPtr<WKStringRef> indexKey(AdoptWK, WKStringCreateWithUTF8CString("Index"));
    624624    WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
    625     WKDictionaryAddItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
     625    WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
    626626
    627627    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r160104 r160811  
    294294
    295295    WKRetainPtr<WKStringRef> pixelResultKey = adoptWK(WKStringCreateWithUTF8CString("PixelResult"));
    296     WKDictionaryAddItem(doneMessageBody.get(), pixelResultKey.get(), m_pixelResult.get());
     296    WKDictionarySetItem(doneMessageBody.get(), pixelResultKey.get(), m_pixelResult.get());
    297297
    298298    WKRetainPtr<WKStringRef> repaintRectsKey = adoptWK(WKStringCreateWithUTF8CString("RepaintRects"));
    299     WKDictionaryAddItem(doneMessageBody.get(), repaintRectsKey.get(), m_repaintRects.get());
     299    WKDictionarySetItem(doneMessageBody.get(), repaintRectsKey.get(), m_repaintRects.get());
    300300
    301301    WKRetainPtr<WKStringRef> audioResultKey = adoptWK(WKStringCreateWithUTF8CString("AudioResult"));
    302     WKDictionaryAddItem(doneMessageBody.get(), audioResultKey.get(), m_audioResult.get());
     302    WKDictionarySetItem(doneMessageBody.get(), audioResultKey.get(), m_audioResult.get());
    303303
    304304    WKBundlePostMessage(m_bundle, doneMessageName.get(), doneMessageBody.get());
    … …  
    399399    WKRetainPtr<WKStringRef> latitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("latitude"));
    400400    WKRetainPtr<WKDoubleRef> latitudeWK(AdoptWK, WKDoubleCreate(latitude));
    401     WKDictionaryAddItem(messageBody.get(), latitudeKeyWK.get(), latitudeWK.get());
     401    WKDictionarySetItem(messageBody.get(), latitudeKeyWK.get(), latitudeWK.get());
    402402
    403403    WKRetainPtr<WKStringRef> longitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("longitude"));
    404404    WKRetainPtr<WKDoubleRef> longitudeWK(AdoptWK, WKDoubleCreate(longitude));
    405     WKDictionaryAddItem(messageBody.get(), longitudeKeyWK.get(), longitudeWK.get());
     405    WKDictionarySetItem(messageBody.get(), longitudeKeyWK.get(), longitudeWK.get());
    406406
    407407    WKRetainPtr<WKStringRef> accuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("accuracy"));
    408408    WKRetainPtr<WKDoubleRef> accuracyWK(AdoptWK, WKDoubleCreate(accuracy));
    409     WKDictionaryAddItem(messageBody.get(), accuracyKeyWK.get(), accuracyWK.get());
     409    WKDictionarySetItem(messageBody.get(), accuracyKeyWK.get(), accuracyWK.get());
    410410
    411411    WKRetainPtr<WKStringRef> providesAltitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesAltitude"));
    412412    WKRetainPtr<WKBooleanRef> providesAltitudeWK(AdoptWK, WKBooleanCreate(providesAltitude));
    413     WKDictionaryAddItem(messageBody.get(), providesAltitudeKeyWK.get(), providesAltitudeWK.get());
     413    WKDictionarySetItem(messageBody.get(), providesAltitudeKeyWK.get(), providesAltitudeWK.get());
    414414
    415415    WKRetainPtr<WKStringRef> altitudeKeyWK(AdoptWK, WKStringCreateWithUTF8CString("altitude"));
    416416    WKRetainPtr<WKDoubleRef> altitudeWK(AdoptWK, WKDoubleCreate(altitude));
    417     WKDictionaryAddItem(messageBody.get(), altitudeKeyWK.get(), altitudeWK.get());
     417    WKDictionarySetItem(messageBody.get(), altitudeKeyWK.get(), altitudeWK.get());
    418418
    419419    WKRetainPtr<WKStringRef> providesAltitudeAccuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesAltitudeAccuracy"));
    420420    WKRetainPtr<WKBooleanRef> providesAltitudeAccuracyWK(AdoptWK, WKBooleanCreate(providesAltitudeAccuracy));
    421     WKDictionaryAddItem(messageBody.get(), providesAltitudeAccuracyKeyWK.get(), providesAltitudeAccuracyWK.get());
     421    WKDictionarySetItem(messageBody.get(), providesAltitudeAccuracyKeyWK.get(), providesAltitudeAccuracyWK.get());
    422422
    423423    WKRetainPtr<WKStringRef> altitudeAccuracyKeyWK(AdoptWK, WKStringCreateWithUTF8CString("altitudeAccuracy"));
    424424    WKRetainPtr<WKDoubleRef> altitudeAccuracyWK(AdoptWK, WKDoubleCreate(altitudeAccuracy));
    425     WKDictionaryAddItem(messageBody.get(), altitudeAccuracyKeyWK.get(), altitudeAccuracyWK.get());
     425    WKDictionarySetItem(messageBody.get(), altitudeAccuracyKeyWK.get(), altitudeAccuracyWK.get());
    426426
    427427    WKRetainPtr<WKStringRef> providesHeadingKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesHeading"));
    428428    WKRetainPtr<WKBooleanRef> providesHeadingWK(AdoptWK, WKBooleanCreate(providesHeading));
    429     WKDictionaryAddItem(messageBody.get(), providesHeadingKeyWK.get(), providesHeadingWK.get());
     429    WKDictionarySetItem(messageBody.get(), providesHeadingKeyWK.get(), providesHeadingWK.get());
    430430
    431431    WKRetainPtr<WKStringRef> headingKeyWK(AdoptWK, WKStringCreateWithUTF8CString("heading"));
    432432    WKRetainPtr<WKDoubleRef> headingWK(AdoptWK, WKDoubleCreate(heading));
    433     WKDictionaryAddItem(messageBody.get(), headingKeyWK.get(), headingWK.get());
     433    WKDictionarySetItem(messageBody.get(), headingKeyWK.get(), headingWK.get());
    434434
    435435    WKRetainPtr<WKStringRef> providesSpeedKeyWK(AdoptWK, WKStringCreateWithUTF8CString("providesSpeed"));
    436436    WKRetainPtr<WKBooleanRef> providesSpeedWK(AdoptWK, WKBooleanCreate(providesSpeed));
    437     WKDictionaryAddItem(messageBody.get(), providesSpeedKeyWK.get(), providesSpeedWK.get());
     437    WKDictionarySetItem(messageBody.get(), providesSpeedKeyWK.get(), providesSpeedWK.get());
    438438
    439439    WKRetainPtr<WKStringRef> speedKeyWK(AdoptWK, WKStringCreateWithUTF8CString("speed"));
    440440    WKRetainPtr<WKDoubleRef> speedWK(AdoptWK, WKDoubleCreate(speed));
    441     WKDictionaryAddItem(messageBody.get(), speedKeyWK.get(), speedWK.get());
     441    WKDictionarySetItem(messageBody.get(), speedKeyWK.get(), speedWK.get());
    442442
    443443    WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
    … …  
    458458    WKRetainPtr<WKStringRef> enabledKeyWK(AdoptWK, WKStringCreateWithUTF8CString("enabled"));
    459459    WKRetainPtr<WKBooleanRef> enabledWK(AdoptWK, WKBooleanCreate(enabled));
    460     WKDictionaryAddItem(messageBody.get(), enabledKeyWK.get(), enabledWK.get());
     460    WKDictionarySetItem(messageBody.get(), enabledKeyWK.get(), enabledWK.get());
    461461
    462462    WKRetainPtr<WKStringRef> permissiveKeyWK(AdoptWK, WKStringCreateWithUTF8CString("permissive"));
    463463    WKRetainPtr<WKBooleanRef> permissiveWK(AdoptWK, WKBooleanCreate(permissive));
    464     WKDictionaryAddItem(messageBody.get(), permissiveKeyWK.get(), permissiveWK.get());
     464    WKDictionarySetItem(messageBody.get(), permissiveKeyWK.get(), permissiveWK.get());
    465465
    466466    WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
    … …  
    474474    WKRetainPtr<WKStringRef> visibilityStateKeyWK(AdoptWK, WKStringCreateWithUTF8CString("visibilityState"));
    475475    WKRetainPtr<WKUInt64Ref> visibilityStateWK(AdoptWK, WKUInt64Create(visibilityState));
    476     WKDictionaryAddItem(messageBody.get(), visibilityStateKeyWK.get(), visibilityStateWK.get());
     476    WKDictionarySetItem(messageBody.get(), visibilityStateKeyWK.get(), visibilityStateWK.get());
    477477
    478478    WKRetainPtr<WKStringRef> isInitialKeyWK(AdoptWK, WKStringCreateWithUTF8CString("isInitialState"));
    479479    WKRetainPtr<WKBooleanRef> isInitialWK(AdoptWK, WKBooleanCreate(isInitialState));
    480     WKDictionaryAddItem(messageBody.get(), isInitialKeyWK.get(), isInitialWK.get());
     480    WKDictionarySetItem(messageBody.get(), isInitialKeyWK.get(), isInitialWK.get());
    481481
    482482    WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
    … …  
    529529
    530530    WKRetainPtr<WKStringRef> urlKey(AdoptWK, WKStringCreateWithUTF8CString("url"));
    531     WKDictionaryAddItem(loadData.get(), urlKey.get(), url);
     531    WKDictionarySetItem(loadData.get(), urlKey.get(), url);
    532532
    533533    WKRetainPtr<WKStringRef> targetKey(AdoptWK, WKStringCreateWithUTF8CString("target"));
    534     WKDictionaryAddItem(loadData.get(), targetKey.get(), target);
     534    WKDictionarySetItem(loadData.get(), targetKey.get(), target);
    535535
    536536    WKBundlePostMessage(m_bundle, messageName.get(), loadData.get());
    … …  
    546546
    547547    WKRetainPtr<WKStringRef> contentKey(AdoptWK, WKStringCreateWithUTF8CString("content"));
    548     WKDictionaryAddItem(loadData.get(), contentKey.get(), content);
     548    WKDictionarySetItem(loadData.get(), contentKey.get(), content);
    549549
    550550    if (baseURL) {
    551551        WKRetainPtr<WKStringRef> baseURLKey(AdoptWK, WKStringCreateWithUTF8CString("baseURL"));
    552         WKDictionaryAddItem(loadData.get(), baseURLKey.get(), baseURL);
     552        WKDictionarySetItem(loadData.get(), baseURLKey.get(), baseURL);
    553553    }
    554554
    555555    if (unreachableURL) {
    556556        WKRetainPtr<WKStringRef> unreachableURLKey(AdoptWK, WKStringCreateWithUTF8CString("unreachableURL"));
    557         WKDictionaryAddItem(loadData.get(), unreachableURLKey.get(), unreachableURL);
     557        WKDictionarySetItem(loadData.get(), unreachableURLKey.get(), unreachableURL);
    558558    }
    559559

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r160627 r160811  
    363363        WKRetainPtr<WKStringRef> useRemoteLayerTreeKey = adoptWK(WKStringCreateWithUTF8CString("RemoteLayerTree"));
    364364        WKRetainPtr<WKBooleanRef> useRemoteLayerTreeValue = adoptWK(WKBooleanCreate(m_shouldUseRemoteLayerTree));
    365         WKDictionaryAddItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
     365        WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
    366366    }
    367367
    … …  
    555555    WKRetainPtr<WKStringRef> shouldGCKey = adoptWK(WKStringCreateWithUTF8CString("ShouldGC"));
    556556    WKRetainPtr<WKBooleanRef> shouldGCValue = adoptWK(WKBooleanCreate(m_gcBetweenTests));
    557     WKDictionaryAddItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
     557    WKDictionarySetItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
    558558
    559559    WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), resetMessageBody.get());

  • trunk/Tools/WebKitTestRunner/TestInvocation.cpp

    r160459 r160811  
    150150    WKRetainPtr<WKStringRef> useThreadedScrollingKey = adoptWK(WKStringCreateWithUTF8CString("ThreadedScrolling"));
    151151    WKRetainPtr<WKBooleanRef> useThreadedScrollingValue = adoptWK(WKBooleanCreate(shouldUseThreadedScrolling(pathOrURL)));
    152     WKDictionaryAddItem(viewOptions.get(), useThreadedScrollingKey.get(), useThreadedScrollingValue.get());
     152    WKDictionarySetItem(viewOptions.get(), useThreadedScrollingKey.get(), useThreadedScrollingValue.get());
    153153
    154154    WKRetainPtr<WKStringRef> useRemoteLayerTreeKey = adoptWK(WKStringCreateWithUTF8CString("RemoteLayerTree"));
    155155    WKRetainPtr<WKBooleanRef> useRemoteLayerTreeValue = adoptWK(WKBooleanCreate(TestController::shared().shouldUseRemoteLayerTree()));
    156     WKDictionaryAddItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
     156    WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
    157157
    158158    TestController::shared().ensureViewSupportsOptions(viewOptions.get());
    … …  
    183183    WKRetainPtr<WKStringRef> useFixedLayoutKey = adoptWK(WKStringCreateWithUTF8CString("UseFixedLayout"));
    184184    WKRetainPtr<WKBooleanRef> useFixedLayoutValue = adoptWK(WKBooleanCreate(shouldUseFixedLayout(pathOrURL)));
    185     WKDictionaryAddItem(viewOptions.get(), useFixedLayoutKey.get(), useFixedLayoutValue.get());
     185    WKDictionarySetItem(viewOptions.get(), useFixedLayoutKey.get(), useFixedLayoutValue.get());
    186186
    187187    TestController::shared().ensureViewSupportsOptions(viewOptions.get());
    … …  
    202202    WKRetainPtr<WKStringRef> dumpFrameLoadDelegatesKey = adoptWK(WKStringCreateWithUTF8CString("DumpFrameLoadDelegates"));
    203203    WKRetainPtr<WKBooleanRef> dumpFrameLoadDelegatesValue = adoptWK(WKBooleanCreate(shouldLogFrameLoadDelegates(m_pathOrURL.c_str())));
    204     WKDictionaryAddItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
     204    WKDictionarySetItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
    205205
    206206    WKRetainPtr<WKStringRef> dumpPixelsKey = adoptWK(WKStringCreateWithUTF8CString("DumpPixels"));
    207207    WKRetainPtr<WKBooleanRef> dumpPixelsValue = adoptWK(WKBooleanCreate(m_dumpPixels));
    208     WKDictionaryAddItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
     208    WKDictionarySetItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
    209209
    210210    WKRetainPtr<WKStringRef> useWaitToDumpWatchdogTimerKey = adoptWK(WKStringCreateWithUTF8CString("UseWaitToDumpWatchdogTimer"));
    211211    WKRetainPtr<WKBooleanRef> useWaitToDumpWatchdogTimerValue = adoptWK(WKBooleanCreate(TestController::shared().useWaitToDumpWatchdogTimer()));
    212     WKDictionaryAddItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
     212    WKDictionarySetItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
    213213
    214214    WKRetainPtr<WKStringRef> timeoutKey = adoptWK(WKStringCreateWithUTF8CString("Timeout"));
    215215    WKRetainPtr<WKUInt64Ref> timeoutValue = adoptWK(WKUInt64Create(m_timeout));
    216     WKDictionaryAddItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
     216    WKDictionarySetItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
    217217
    218218    WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), beginTestMessageBody.get());
Note: See TracChangeset for help on using the changeset viewer.