Changeset 84011 in webkit

Timestamp:

Apr 15, 2011 12:24:16 PM (13 years ago)

Author:

beidson@apple.com

Message:

<rdar://problem/9287880> and ​https://bugs.webkit.org/show_bug.cgi?id=58596
WK2: Past searches not remembered for <input type=search results="5" autosave="foo">

Reviewed by Sam Weinig.

Add SaveRecentSearches and LoadRecentSearches messages:

• UIProcess/WebPageProxy.messages.in:
• UIProcess/WebPageProxy.h:

Message up to the UIProcess for the save/load operations:

• WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:

(WebKit::WebSearchPopupMenu::saveRecentSearches):
(WebKit::WebSearchPopupMenu::loadRecentSearches):

• WebProcess/WebCoreSupport/WebPopupMenu.h:

(WebKit::WebPopupMenu::page):

Save the values to disk CFPreference-style:

• UIProcess/cf/WebPageProxyCF.cpp:

(WebKit::autosaveKey):
(WebKit::WebPageProxy::saveRecentSearches):
(WebKit::WebPageProxy::loadRecentSearches):

Stubbed out for non-CF platforms:

• UIProcess/gtk/WebPageProxyGtk.cpp:

(WebKit::WebPageProxy::saveRecentSearches):
(WebKit::WebPageProxy::loadRecentSearches):

• UIProcess/qt/WebPageProxyQt.cpp:

(WebKit::WebPageProxy::saveRecentSearches):
(WebKit::WebPageProxy::loadRecentSearches):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/cf/WebPageProxyCF.cpp (modified) (1 diff)
• UIProcess/gtk/WebPageProxyGtk.cpp (modified) (2 diffs)
• UIProcess/qt/WebPageProxyQt.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebPopupMenu.h (modified) (1 diff)
• WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-15  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/9287880> and https://bugs.webkit.org/show_bug.cgi?id=58596
+        WK2: Past searches not remembered for <input type=search results="5" autosave="foo">
+
+        Add SaveRecentSearches and LoadRecentSearches messages:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/WebPageProxy.h:
+
+        Message up to the UIProcess for the save/load operations:
+        * WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:
+        (WebKit::WebSearchPopupMenu::saveRecentSearches):
+        (WebKit::WebSearchPopupMenu::loadRecentSearches):
+        * WebProcess/WebCoreSupport/WebPopupMenu.h:
+        (WebKit::WebPopupMenu::page):
+
+        Save the values to disk CFPreference-style:
+        * UIProcess/cf/WebPageProxyCF.cpp:
+        (WebKit::autosaveKey):
+        (WebKit::WebPageProxy::saveRecentSearches):
+        (WebKit::WebPageProxy::loadRecentSearches):
+
+        Stubbed out for non-CF platforms:
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::saveRecentSearches):
+        (WebKit::WebPageProxy::loadRecentSearches):
+        * UIProcess/qt/WebPageProxyQt.cpp:
+        (WebKit::WebPageProxy::saveRecentSearches):
+        (WebKit::WebPageProxy::loadRecentSearches):
+
 2011-04-14  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -626 +626 @@
     void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuState&, const Vector<WebContextMenuItemData>&, CoreIPC::ArgumentDecoder*);
 
+    // Search popup results
+    void saveRecentSearches(const String&, const Vector<String>&);
+    void loadRecentSearches(const String&, Vector<String>&);
+
 #if PLATFORM(MAC)
     // Speech.

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -239 +239 @@
     SetGestureReachedScrollingLimit(bool limitReached)
 #endif
+
+    # Search popup menus
+    SaveRecentSearches(WTF::String name, Vector<String> searchItems)
+    LoadRecentSearches(WTF::String name) -> (Vector<String> result)
 }

trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp

@@ -181 +181 @@
 }
 
+static RetainPtr<CFStringRef> autosaveKey(const String& name)
+{
+    String key = "com.apple.WebKit.searchField:" + name;
+    return RetainPtr<CFStringRef>(AdoptCF, key.createCFString());
+}
+
+void WebPageProxy::saveRecentSearches(const String& name, const Vector<String>& searchItems)
+{
+    // The WebProcess shouldn't have bothered to send this message if the name was empty.
+    ASSERT(!name.isEmpty());
+
+    RetainPtr<CFMutableArrayRef> items;
+
+    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());
+        }
+    }
+
+    CFPreferencesSetAppValue(autosaveKey(name).get(), items.get(), kCFPreferencesCurrentApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+}
+
+void WebPageProxy::loadRecentSearches(const String& name, Vector<String>& searchItems)
+{
+    // The WebProcess shouldn't have bothered to send this message if the name was empty.
+    ASSERT(!name.isEmpty());
+
+    searchItems.clear();
+    RetainPtr<CFArrayRef> items(AdoptCF, reinterpret_cast<CFArrayRef>(CFPreferencesCopyAppValue(autosaveKey(name).get(), kCFPreferencesCurrentApplication)));
+
+    if (!items || CFGetTypeID(items.get()) != CFArrayGetTypeID())
+        return;
+
+    size_t size = CFArrayGetCount(items.get());
+    for (size_t i = 0; i < size; ++i) {
+        CFStringRef item = (CFStringRef)CFArrayGetValueAtIndex(items.get(), i);
+        if (CFGetTypeID(item) == CFStringGetTypeID())
+            searchItems.append(item);
+    }
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -29 +29 @@
 
 #include "NativeWebKeyboardEvent.h"
+#include "NotImplemented.h"
 #include "PageClient.h"
 
@@ -44 +45 @@
 }
 
+void WebPageProxy::saveRecentSearches(const String&, const Vector<String>&)
+{
+    notImplemented();
+}
+
+void WebPageProxy::loadRecentSearches(const String&, Vector<String>&)
+{
+    notImplemented();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp

@@ -27 +27 @@
 #include "WebPageProxy.h"
 
+#include <WebCore/NotImplemented.h>
+
 namespace WebKit {
 
@@ -35 +37 @@
 }
 
+void WebPageProxy::saveRecentSearches(const String&, const Vector<String>&)
+{
+    notImplemented();
+}
+
+void WebPageProxy::loadRecentSearches(const String&, Vector<String>&)
+{
+    notImplemented();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h

@@ -44 +44 @@
     ~WebPopupMenu();
 
+    WebPage* page() { return m_page; }
+
     void disconnectFromPage() { m_page = 0; }
     void didChangeSelectedIndex(int newIndex);

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp

@@ -24 +24 @@
 #include "WebSearchPopupMenu.h"
 
+#include "WebPage.h"
+#include "WebPageProxyMessages.h"
+#include "WebProcess.h"
+#include <wtf/text/AtomicString.h>
+
 using namespace WebCore;
 
@@ -43 +48 @@
 }
 
-void WebSearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&)
+void WebSearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
 {
+    if (name.isEmpty())
+        return;
+
+    WebPage* page = m_popup->page();
+    if (!page)
+        return;
+
+    WebProcess::shared().connection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
 }
 
-void WebSearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&)
+void WebSearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& resultItems)
 {
+    if (name.isEmpty())
+        return;
+
+    WebPage* page = m_popup->page();
+    if (!page)
+        return;
+
+    WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
 }