Changeset 122364 in webkit

Timestamp:

Jul 11, 2012, 1:20:54 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Implement Date/Time picker
​https://bugs.webkit.org/show_bug.cgi?id=90911

Patch by Crystal Zhang <​haizhang@rim.com> on 2012-07-11
Reviewed by Rob Buis.

Source/WebKit:

Add files into make file.

• PlatformBlackBerry.cmake:

Source/WebKit/blackberry:

Implement HTML Date/Time picker, also should delete popup when closing popup.

• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::closePagePopup):

• WebCoreSupport/DatePickerClient.cpp: Added.

(WebCore):
(WebCore::DatePickerClient::DatePickerClient):
(WebCore::DatePickerClient::~DatePickerClient):
(WebCore::DatePickerClient::generateHTML):
(WebCore::DatePickerClient::closePopup):
(WebCore::DatePickerClient::contentSize):
(WebCore::DatePickerClient::htmlSource):
(WebCore::DatePickerClient::setValueAndClosePopup):
(WebCore::DatePickerClient::didClosePopup):
(WebCore::DatePickerClient::writeDocument):

• WebCoreSupport/DatePickerClient.h: Added.

(WebKit):
(WebCore):
(DatePickerClient):

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::openDatePopup):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformBlackBerry.cmake (modified) (1 diff)
• blackberry/ChangeLog (modified) (1 diff)
• blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (1 diff)
• blackberry/WebCoreSupport/DatePickerClient.cpp (added)
• blackberry/WebCoreSupport/DatePickerClient.h (added)
• blackberry/WebKitSupport/InputHandler.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-07-11  Crystal Zhang  <haizhang@rim.com>
+
+        [BlackBerry] Implement Date/Time picker
+        https://bugs.webkit.org/show_bug.cgi?id=90911
+
+        Reviewed by Rob Buis.
+
+        Add files into make file.
+
+        * PlatformBlackBerry.cmake:
+
 2012-07-09  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit/PlatformBlackBerry.cmake

@@ -92 +92 @@
     blackberry/WebCoreSupport/PagePopupBlackBerry.cpp
     blackberry/WebCoreSupport/SelectPopupClient.cpp
+    blackberry/WebCoreSupport/DatePickerClient.cpp
     blackberry/WebKitSupport/BackingStoreCompositingSurface.cpp
     blackberry/WebKitSupport/BackingStoreTile.cpp

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-07-11  Crystal Zhang  <haizhang@rim.com>
+
+        [BlackBerry] Implement Date/Time picker
+        https://bugs.webkit.org/show_bug.cgi?id=90911
+
+        Reviewed by Rob Buis.
+
+        Implement HTML Date/Time picker, also should delete popup when closing popup.
+
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::closePagePopup):
+        * WebCoreSupport/DatePickerClient.cpp: Added.
+        (WebCore):
+        (WebCore::DatePickerClient::DatePickerClient):
+        (WebCore::DatePickerClient::~DatePickerClient):
+        (WebCore::DatePickerClient::generateHTML):
+        (WebCore::DatePickerClient::closePopup):
+        (WebCore::DatePickerClient::contentSize):
+        (WebCore::DatePickerClient::htmlSource):
+        (WebCore::DatePickerClient::setValueAndClosePopup):
+        (WebCore::DatePickerClient::didClosePopup):
+        (WebCore::DatePickerClient::writeDocument):
+        * WebCoreSupport/DatePickerClient.h: Added.
+        (WebKit):
+        (WebCore):
+        (DatePickerClient):
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::openDatePopup):
+
 2012-07-10  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -322 +322 @@
     PagePopupBlackBerry* webPopup = m_webPagePrivate->m_webPage->popup();
     webPopup->closePopup();
+    delete webPopup;
 }
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

@@ -26 +26 @@
 #include "Chrome.h"
 #include "DOMSupport.h"
+#include "DatePickerClient.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -496 +497 @@
         clearCurrentFocusElement();
 
-    m_currentFocusElement = element;
-    m_currentFocusElementType = TextPopup;
-
-    WTF::String value = element->value();
-    WTF::String min = element->getAttribute(HTMLNames::minAttr).string();
-    WTF::String max = element->getAttribute(HTMLNames::maxAttr).string();
-    double step = element->getAttribute(HTMLNames::stepAttr).toDouble();
-    m_webPage->m_client->openDateTimePopup(type, value, min, max, step);
-    return true;
+    switch (type) {
+    case BlackBerry::Platform::InputTypeDate:
+    case BlackBerry::Platform::InputTypeTime:
+    case BlackBerry::Platform::InputTypeDateTime:
+    case BlackBerry::Platform::InputTypeDateTimeLocal: {
+        // Check if popup already exists, close it if does.
+        m_webPage->m_page->chrome()->client()->closePagePopup(0);
+        String value = element->value();
+        String min = element->getAttribute(HTMLNames::minAttr).string();
+        String max = element->getAttribute(HTMLNames::maxAttr).string();
+        double step = element->getAttribute(HTMLNames::stepAttr).toDouble();
+
+        DatePickerClient* client = new DatePickerClient(type, value, min, max, step,  m_webPage, element);
+        // Fail to create HTML popup, use the old path
+        if (!m_webPage->m_page->chrome()->client()->openPagePopup(client,  WebCore::IntRect()))
+            m_webPage->m_client->openDateTimePopup(type, value, min, max, step);
+
+        return true;
+        }
+    default: // Other types not supported
+        return false;
+    }
 }