diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitTools/TestWebKitAPI/PlatformUtilities.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitTools/TestWebKitAPI/PlatformUtilities.cpp')
| -rw-r--r-- | WebKitTools/TestWebKitAPI/PlatformUtilities.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp b/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp index 281fb13..23678a0 100644 --- a/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp +++ b/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp @@ -33,13 +33,21 @@ namespace TestWebKitAPI { namespace Util { -WKContextRef createContextForInjectedBundleTest(const std::string& testName) +WKContextRef createContextForInjectedBundleTest(const std::string& testName, WKTypeRef userData) { WKRetainPtr<WKStringRef> injectedBundlePath(AdoptWK, createInjectedBundlePath()); WKContextRef context = WKContextCreateWithInjectedBundlePath(injectedBundlePath.get()); + WKRetainPtr<WKMutableDictionaryRef> initializationDictionary(AdoptWK, WKMutableDictionaryCreate()); + + WKRetainPtr<WKStringRef> testNameKey(AdoptWK, WKStringCreateWithUTF8CString("TestName")); WKRetainPtr<WKStringRef> testNameString(AdoptWK, WKStringCreateWithUTF8CString(testName.c_str())); - WKContextSetInitializationUserDataForInjectedBundle(context, testNameString.get()); + WKDictionaryAddItem(initializationDictionary.get(), testNameKey.get(), testNameString.get()); + + WKRetainPtr<WKStringRef> userDataKey(AdoptWK, WKStringCreateWithUTF8CString("UserData")); + WKDictionaryAddItem(initializationDictionary.get(), userDataKey.get(), userData); + + WKContextSetInitializationUserDataForInjectedBundle(context, initializationDictionary.get()); return context; } |