Merge WebKit at r64523 : Provide PopupMenuAndroid and related ChromeClient methods

See http://trac.webkit.org/changeset/64513

Change-Id: I9f55ae27989f7a246c0c1e5f771677c66a9b1556

3 files changed, 66 insertions, 78 deletions

diff --git a/WebCore/platform/android/PopupMenuAndroid.cpp b/WebCore/platform/android/PopupMenuAndroid.cpp
deleted file mode 100644
index 8a1ed07..0000000
--- a/WebCore/platform/android/PopupMenuAndroid.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of the popup menu implementation for <select> elements in WebCore.
- *
- * Copyright 2009, The Android Open Source Project
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-#include "PopupMenu.h"
-
-namespace WebCore {
-
-// Now we handle all of this in WebViewCore.cpp.
-PopupMenu::PopupMenu(PopupMenuClient* menuList)
-    : m_popupClient(menuList)
-{
-}
-
-PopupMenu::~PopupMenu()
-{
-}
-
-void PopupMenu::show(const IntRect&, FrameView*, int)
-{
-}
-
-void PopupMenu::hide()
-{
-}
-
-void PopupMenu::updateFromElement() 
-{
-}
-
-bool PopupMenu::itemWritingDirectionIsNatural()
-{
-    return false;
-}
-
-} // namespace WebCore
diff --git a/WebCore/platform/android/PopupMenuAndroid.h b/WebCore/platform/android/PopupMenuAndroid.h
new file mode 100644
index 0000000..07b1da0
--- /dev/null
+++ b/WebCore/platform/android/PopupMenuAndroid.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PopupMenuAndroid_h
+#define PopupMenuAndroid_h
+
+#include "IntRect.h"
+#include "PopupMenu.h"
+
+namespace WebCore {
+
+class FrameView;
+
+class PopupMenuAndroid : public PopupMenu {
+public:
+    virtual void show(const IntRect&, FrameView*, int) { }
+    virtual void hide() { }
+    virtual void updateFromElement() { }
+    virtual void disconnectClient() { }
+};
+
+}
+
+#endif // PopupMenuAndroid_h
diff --git a/WebCore/platform/android/SearchPopupMenuAndroid.cpp b/WebCore/platform/android/SearchPopupMenuAndroid.h
index 0d67fdd..599a2ac 100644
--- a/WebCore/platform/android/SearchPopupMenuAndroid.cpp
+++ b/WebCore/platform/android/SearchPopupMenuAndroid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, The Android Open Source Project
+ * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,7 +13,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,30 +23,29 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#ifndef SearchPopupMenuAndroid_h
+#define SearchPopupMenuAndroid_h
+
+#include "PopupMenuAndroid.h"
 #include "SearchPopupMenu.h"
 
 namespace WebCore {
 
-// Save the past searches stored in 'searchItems' to a database associated with 'name'
-void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 
-{ 
-}
+class PopupMenuClient;
+class FrameView;
 
-// Load past searches associated with 'name' from the database to 'searchItems'
-void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 
-{ 
-}
+class SearchPopupMenuAndroid : public SearchPopupMenu {
+public:
+    SearchPopupMenuAndroid() : m_popup(adoptRef(new PopupMenuAndroid)) { }
+    virtual PopupMenu* popupMenu() { return m_popup.get(); }
+    virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) { }
+    virtual void loadRecentSearches(const AtomicString&, Vector<String>&) { }
+    virtual bool enabled() { return false; }
+
+private:
+    RefPtr<PopupMenuAndroid> m_popup;
+};
 
-// Create a search popup menu - not sure what else we have to do here
-SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
-    : PopupMenu(client) 
-{ 
-}
-        
-bool SearchPopupMenu::enabled()
-{
-    return false;
 }
 
-}  // namespace WebCore
+#endif // SearchPopupMenuAndroid_h