Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes

1 files changed, 12 insertions, 2 deletions

diff --git a/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp b/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
index ea6741d65..b3f5413bc 100644
--- a/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
+++ b/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
@@ -404,6 +404,14 @@ void InputHandler::learnText()
     sendLearnTextDetails(textInField);
 }
 
+
+void InputHandler::spellCheckingRequestProcessed(int32_t id, spannable_string_t* spannableString)
+{
+    UNUSED_PARAM(id);
+    UNUSED_PARAM(spannableString);
+    // TODO implement.
+}
+
 void InputHandler::setElementUnfocused(bool refocusOccuring)
 {
     if (isActiveTextEdit()) {
@@ -1174,8 +1182,10 @@ bool InputHandler::openSelectPopup(HTMLSelectElement* select)
     }
 
     SelectPopupClient* selectClient = new SelectPopupClient(multiple, size, labels, enableds, itemTypes, selecteds, m_webPage, select);
-    WebCore::IntRect elementRectInRootView = select->document()->view()->contentsToRootView(select->getRect());
-    m_webPage->m_page->chrome()->client()->openPagePopup(selectClient, elementRectInRootView);
+    WebCore::IntRect elementRectInRootView = select->document()->view()->contentsToRootView(enclosingIntRect(select->getRect()));
+    // Fail to create HTML popup, use the old path
+    if (!m_webPage->m_page->chrome()->client()->openPagePopup(selectClient, elementRectInRootView))
+        m_webPage->m_client->openPopupList(multiple, size, labels, enableds, itemTypes, selecteds);
     return true;
 }