Title: [123255] trunk/Source/WebKit/blackberry
- Revision
- 123255
- Author
- [email protected]
- Date
- 2012-07-20 13:42:13 -0700 (Fri, 20 Jul 2012)
Log Message
[BlackBerry] Add Cancel button for Select popup
https://bugs.webkit.org/show_bug.cgi?id=91887
Patch by Crystal Zhang <[email protected]> on 2012-07-20
Reviewed by Yong Li.
PR 177706
* WebCoreSupport/SelectPopupClient.cpp:
(WebCore::SelectPopupClient::generateHTML):
(WebCore::SelectPopupClient::setValueAndClosePopup):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (123254 => 123255)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-20 20:24:29 UTC (rev 123254)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-20 20:42:13 UTC (rev 123255)
@@ -1,3 +1,16 @@
+2012-07-20 Crystal Zhang <[email protected]>
+
+ [BlackBerry] Add Cancel button for Select popup
+ https://bugs.webkit.org/show_bug.cgi?id=91887
+
+ Reviewed by Yong Li.
+
+ PR 177706
+
+ * WebCoreSupport/SelectPopupClient.cpp:
+ (WebCore::SelectPopupClient::generateHTML):
+ (WebCore::SelectPopupClient::setValueAndClosePopup):
+
2012-07-19 Mary Wu <[email protected]>
[BlackBerry] Make sure to send favicon when go back/forward
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp (123254 => 123255)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp 2012-07-20 20:24:29 UTC (rev 123254)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp 2012-07-20 20:42:13 UTC (rev 123255)
@@ -115,6 +115,7 @@
source.append(", ");
}
source.append("] ");
+ source.append(", 'Cancel'");
// If multi-select, add OK button for confirm.
if (m_multiple)
source.append(", 'OK'");
@@ -145,8 +146,13 @@
void SelectPopupClient::setValueAndClosePopup(int, const String& stringValue)
{
ASSERT(m_element);
- ASSERT(m_size == stringValue.length());
+ static const char* cancelValue = "-1";
+ if (stringValue == cancelValue) {
+ closePopup();
+ return;
+ }
+
if (m_size > 0) {
bool selecteds[m_size];
for (unsigned i = 0; i < m_size; i++)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes