Changeset 64812 in webkit

Timestamp:

Aug 5, 2010 7:51:19 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

Make SearchPopupMenuWin more portable
​https://bugs.webkit.org/show_bug.cgi?id=43527

Add #if PLATFORM(CF) around CoreFoundation code.

• platform/win/SearchPopupMenuWin.cpp: (WebCore::SearchPopupMenuWin::enabled): (WebCore::SearchPopupMenuWin::saveRecentSearches): (WebCore::SearchPopupMenuWin::loadRecentSearches):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/SearchPopupMenuWin.cpp (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        Make SearchPopupMenuWin more portable
+        https://bugs.webkit.org/show_bug.cgi?id=43527
+
+        Add #if PLATFORM(CF) around CoreFoundation code.
+
+        * platform/win/SearchPopupMenuWin.cpp:
+        (WebCore::SearchPopupMenuWin::enabled):
+        (WebCore::SearchPopupMenuWin::saveRecentSearches):
+        (WebCore::SearchPopupMenuWin::loadRecentSearches):
+
 2010-08-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/platform/win/SearchPopupMenuWin.cpp

@@ -23 +23 @@
 
 #include "AtomicString.h"
+
+#if PLATFORM(CF)
 #include <wtf/RetainPtr.h>
+#endif
 
 namespace WebCore {
@@ -39 +42 @@
 bool SearchPopupMenuWin::enabled()
 {
+#if PLATFORM(CF)
     return true;
+#else
+    return false;
+#endif
 }
 
+#if PLATFORM(CF)
 static RetainPtr<CFStringRef> autosaveKey(const String& name)
 {
@@ -47 +55 @@
     return RetainPtr<CFStringRef>(AdoptCF, key.createCFString());
 }
+#endif
 
 void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
@@ -53 +62 @@
         return;
 
+#if PLATFORM(CF)
     RetainPtr<CFMutableArrayRef> items;
 
@@ -66 +76 @@
     CFPreferencesSetAppValue(autosaveKey(name).get(), items.get(), kCFPreferencesCurrentApplication);
     CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+#endif
 }
 
@@ -73 +84 @@
         return;
 
+#if PLATFORM(CF)
     searchItems.clear();
     RetainPtr<CFArrayRef> items(AdoptCF, reinterpret_cast<CFArrayRef>(CFPreferencesCopyAppValue(autosaveKey(name).get(), kCFPreferencesCurrentApplication)));
@@ -85 +97 @@
             searchItems.append(item);
     }
+#endif
 }