diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp')
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp index 7dea31554..0e6b985fb 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp @@ -48,8 +48,8 @@ static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messag // Do basic sanity checks on the returned webarchive. We have more thorough checks in LayoutTests. size_t size = WKDataGetSize(receivedData); const unsigned char* bytes = WKDataGetBytes(receivedData); - RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(0, bytes, size)); - RetainPtr<CFPropertyListRef> propertyList(AdoptCF, CFPropertyListCreateWithData(0, data.get(), kCFPropertyListImmutable, 0, 0)); + RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, bytes, size)); + RetainPtr<CFPropertyListRef> propertyList = adoptCF(CFPropertyListCreateWithData(0, data.get(), kCFPropertyListImmutable, 0, 0)); EXPECT_TRUE(propertyList); // It should be a dictionary. @@ -78,7 +78,7 @@ static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messag EXPECT_TRUE(resourceData); EXPECT_EQ(CFDataGetTypeID(), CFGetTypeID(resourceData)); - RetainPtr<CFStringRef> stringData(AdoptCF, CFStringCreateFromExternalRepresentation(0, (CFDataRef)resourceData, kCFStringEncodingUTF8)); + RetainPtr<CFStringRef> stringData = adoptCF(CFStringCreateFromExternalRepresentation(0, (CFDataRef)resourceData, kCFStringEncodingUTF8)); EXPECT_TRUE(stringData); // It should contain the string "Simple HTML file." in it. |