From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit/win/WebLocalizableStrings.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Source/WebKit/win/WebLocalizableStrings.cpp') diff --git a/Source/WebKit/win/WebLocalizableStrings.cpp b/Source/WebKit/win/WebLocalizableStrings.cpp index fd61a01fb..dfb714b46 100644 --- a/Source/WebKit/win/WebLocalizableStrings.cpp +++ b/Source/WebKit/win/WebLocalizableStrings.cpp @@ -132,12 +132,10 @@ static CFBundleRef createWebKitBundle() return 0; String bundlePathString(pathStr); - CFStringRef bundlePathCFString = bundlePathString.createCFString(); - if (!bundlePathCFString) + if (!bundlePathString) return 0; - CFURLRef bundleURLRef = CFURLCreateWithFileSystemPath(0, bundlePathCFString, kCFURLWindowsPathStyle, true); - CFRelease(bundlePathCFString); + CFURLRef bundleURLRef = CFURLCreateWithFileSystemPath(0, bundlePathString.createCFString().get(), kCFURLWindowsPathStyle, true); if (!bundleURLRef) return 0; @@ -168,8 +166,7 @@ static CFStringRef copyLocalizedStringFromBundle(WebLocalizableStringsBundle* st if (!bundle) return notFound; - RetainPtr keyString(AdoptCF, key.createCFString()); - CFStringRef result = CFCopyLocalizedStringWithDefaultValue(keyString.get(), 0, bundle, notFound, 0); + CFStringRef result = CFCopyLocalizedStringWithDefaultValue(key.createCFString().get(), 0, bundle, notFound, 0); ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key); return result; -- cgit v1.2.1