diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
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.
Diffstat (limited to 'Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp index 79dd8ced0..fac02c1b4 100644 --- a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp +++ b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp @@ -65,7 +65,7 @@ PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilte if (provisionalURL.isEmpty()) provisionalURL = m_mainFrame->provisionalURL(); if (!provisionalURL.isEmpty()) { - provisionalURLString.adoptCF(provisionalURL.createCFString()); + provisionalURLString = provisionalURL.createCFString(); keys[numValues] = ProvisionalURLKey(); values[numValues] = provisionalURLString.get(); ++numValues; @@ -179,8 +179,7 @@ void WebPageProxy::restoreFromSessionStateData(WebData* webData) static RetainPtr<CFStringRef> autosaveKey(const String& name) { - String key = "com.apple.WebKit.searchField:" + name; - return RetainPtr<CFStringRef>(AdoptCF, key.createCFString()); + return String("com.apple.WebKit.searchField:" + name).createCFString(); } void WebPageProxy::saveRecentSearches(const String& name, const Vector<String>& searchItems) @@ -192,10 +191,8 @@ void WebPageProxy::saveRecentSearches(const String& name, const Vector<String>& if (size_t size = searchItems.size()) { items.adoptCF(CFArrayCreateMutable(0, size, &kCFTypeArrayCallBacks)); - for (size_t i = 0; i < size; ++i) { - RetainPtr<CFStringRef> item(AdoptCF, searchItems[i].createCFString()); - CFArrayAppendValue(items.get(), item.get()); - } + for (size_t i = 0; i < size; ++i) + CFArrayAppendValue(items.get(), searchItems[i].createCFString().get()); } CFPreferencesSetAppValue(autosaveKey(name).get(), items.get(), kCFPreferencesCurrentApplication); |