Changeset 142987 in webkit

Timestamp:

Feb 15, 2013 5:36:51 AM (11 years ago)

Author:

keishi@webkit.org

Message:

Add setValue and closePopup methods to PagePopupController
​https://bugs.webkit.org/show_bug.cgi?id=109897

Reviewed by Kent Tamura.

.:

• ManualTests/forms/calendar-picker.html: Added mock setValue and closePopup implementation.
• ManualTests/forms/color-suggestion-picker.html: Ditto.

Source/WebCore:

The new calendar picker (Bug 109439) needs to set a value without
closing the popup. We can't do that with the existing
setValueAndClosePopup.

No new tests. Existing calendar picker and color suggestion picker tests
that closing and setting values work properly.

• Resources/pagepopups/pickerCommon.js:

(Picker.prototype.submitValue): Stop using setValueAndClosePopup.
(Picker.prototype.handleCancel): Ditto.

• page/PagePopupClient.h:

(PagePopupClient):

• page/PagePopupController.cpp:

(WebCore::PagePopupController::setValue): Sets value to element without closing popup.
(WebCore):
(WebCore::PagePopupController::closePopup): Just closes popup.

• page/PagePopupController.h:

(PagePopupController):

• page/PagePopupController.idl:

Source/WebKit/blackberry:

• WebCoreSupport/ColorPickerClient.cpp:

(WebCore::ColorPickerClient::setValue): Added empty implementation.
(WebCore):

• WebCoreSupport/ColorPickerClient.h:

(ColorPickerClient):

• WebCoreSupport/DatePickerClient.cpp:

(WebCore::DatePickerClient::setValue): Ditto.
(WebCore):

• WebCoreSupport/DatePickerClient.h:

(DatePickerClient):

• WebCoreSupport/SelectPopupClient.cpp:

(WebCore::SelectPopupClient::setValue): Ditto.
(WebCore):

• WebCoreSupport/SelectPopupClient.h:

(SelectPopupClient):

Source/WebKit/chromium:

• src/ColorChooserPopupUIController.cpp:

(WebKit::ColorChooserPopupUIController::setValue):
(WebKit):

• src/ColorChooserPopupUIController.h:

(ColorChooserPopupUIController):

• src/DateTimeChooserImpl.cpp:

(WebKit::DateTimeChooserImpl::setValueAndClosePopup): Use setValue and closePopup.
(WebKit):
(WebKit::DateTimeChooserImpl::setValue):
(WebKit::DateTimeChooserImpl::closePopup):

• src/DateTimeChooserImpl.h:

(DateTimeChooserImpl):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/forms/calendar-picker.html (modified) (1 diff)
• ManualTests/forms/color-suggestion-picker.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Resources/pagepopups/pickerCommon.js (modified) (1 diff)
• Source/WebCore/page/PagePopupClient.h (modified) (1 diff)
• Source/WebCore/page/PagePopupController.cpp (modified) (1 diff)
• Source/WebCore/page/PagePopupController.h (modified) (1 diff)
• Source/WebCore/page/PagePopupController.idl (modified) (1 diff)
• Source/WebKit/blackberry/ChangeLog (modified) (1 diff)
• Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp (modified) (2 diffs)
• Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.h (modified) (1 diff)
• Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.cpp (modified) (2 diffs)
• Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.h (modified) (1 diff)
• Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp (modified) (2 diffs)
• Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/ColorChooserPopupUIController.h (modified) (1 diff)
• Source/WebKit/chromium/src/DateTimeChooserImpl.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/DateTimeChooserImpl.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-02-15  Keishi Hattori  <keishi@webkit.org>
+
+        Add setValue and closePopup methods to PagePopupController
+        https://bugs.webkit.org/show_bug.cgi?id=109897
+
+        Reviewed by Kent Tamura.
+
+        * ManualTests/forms/calendar-picker.html: Added mock setValue and closePopup implementation.
+        * ManualTests/forms/color-suggestion-picker.html: Ditto.
+
 2013-02-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/ManualTests/forms/calendar-picker.html

@@ -295 +295 @@
                 window.document.getElementById('date').value = stringValue;
         },
+        setValue: function(value) {
+            window.log('value="' + value + '"');
+            window.document.getElementById('date').value = value;
+        },
+        closePopup: function() {
+        },
         localizeNumberString: function(numString) {
             if (typeof numString == "number")

trunk/ManualTests/forms/color-suggestion-picker.html

@@ -57 +57 @@
             if (numValue === 0)
                 window.document.getElementById('color').value = stringValue;
-        }
+        },
+        setValue: function(value) {
+            window.log('value="' + value + '"');
+            window.document.getElementById('color').value = value;
+        },
+        closePopup: function() {
+        },
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Keishi Hattori  <keishi@webkit.org>
+
+        Add setValue and closePopup methods to PagePopupController
+        https://bugs.webkit.org/show_bug.cgi?id=109897
+
+        Reviewed by Kent Tamura.
+
+        The new calendar picker (Bug 109439) needs to set a value without
+        closing the popup. We can't do that with the existing
+        setValueAndClosePopup.
+
+        No new tests. Existing calendar picker and color suggestion picker tests
+        that closing and setting values work properly.
+
+        * Resources/pagepopups/pickerCommon.js:
+        (Picker.prototype.submitValue): Stop using setValueAndClosePopup.
+        (Picker.prototype.handleCancel): Ditto.
+        * page/PagePopupClient.h:
+        (PagePopupClient):
+        * page/PagePopupController.cpp:
+        (WebCore::PagePopupController::setValue): Sets value to element without closing popup.
+        (WebCore):
+        (WebCore::PagePopupController::closePopup): Just closes popup.
+        * page/PagePopupController.h:
+        (PagePopupController):
+        * page/PagePopupController.idl:
+
 2013-02-15  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/Resources/pagepopups/pickerCommon.js

@@ -243 +243 @@
  */
 Picker.prototype.submitValue = function(value) {
-    window.pagePopupController.setValueAndClosePopup(Picker.Actions.SetValue, value);
+    window.pagePopupController.setValue(value);
+    window.pagePopupController.closePopup();
 }
 
 Picker.prototype.handleCancel = function() {
-    window.pagePopupController.setValueAndClosePopup(Picker.Actions.Cancel, "");
+    window.pagePopupController.closePopup();
 }
 

trunk/Source/WebCore/page/PagePopupClient.h

@@ -61 +61 @@
     virtual void setValueAndClosePopup(int numValue, const String& stringValue) = 0;
 
+    // This is called by the content HTML of a PagePopup.
+    virtual void setValue(const String&) = 0;
+
+    // This is called by the content HTML of a PagePopup.
+    virtual void closePopup() = 0;
+
     // This is called whenever a PagePopup was closed.
     virtual void didClosePopup() = 0;

trunk/Source/WebCore/page/PagePopupController.cpp

@@ -56 +56 @@
 }
 
+void PagePopupController::setValue(const String& value)
+{
+    if (m_popupClient)
+        m_popupClient->setValue(value);
+}
+
+void PagePopupController::closePopup()
+{
+    if (m_popupClient)
+        m_popupClient->closePopup();
+}
+
 String PagePopupController::localizeNumberString(const String& numberString)
 {

trunk/Source/WebCore/page/PagePopupController.h

@@ -45 +45 @@
     static PassRefPtr<PagePopupController> create(PagePopupClient*);
     void setValueAndClosePopup(int numValue, const String& stringValue);
+    void setValue(const String&);
+    void closePopup();
     String localizeNumberString(const String&);
 #if ENABLE(CALENDAR_PICKER)

trunk/Source/WebCore/page/PagePopupController.idl

@@ -34 +34 @@
 ] interface PagePopupController {
     void setValueAndClosePopup(in long numberValue, in DOMString stringValue);
+    void setValue(DOMString value);
+    void closePopup();
     DOMString localizeNumberString(in DOMString numberString);
     [Conditional=CALENDAR_PICKER] DOMString formatMonth(in long year, in long zeroBaseMonth);

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-02-15  Keishi Hattori  <keishi@webkit.org>
+
+        Add setValue and closePopup methods to PagePopupController
+        https://bugs.webkit.org/show_bug.cgi?id=109897
+
+        Reviewed by Kent Tamura.
+
+        * WebCoreSupport/ColorPickerClient.cpp:
+        (WebCore::ColorPickerClient::setValue): Added empty implementation.
+        (WebCore):
+        * WebCoreSupport/ColorPickerClient.h:
+        (ColorPickerClient):
+        * WebCoreSupport/DatePickerClient.cpp:
+        (WebCore::DatePickerClient::setValue): Ditto.
+        (WebCore):
+        * WebCoreSupport/DatePickerClient.h:
+        (DatePickerClient):
+        * WebCoreSupport/SelectPopupClient.cpp:
+        (WebCore::SelectPopupClient::setValue): Ditto.
+        (WebCore):
+        * WebCoreSupport/SelectPopupClient.h:
+        (SelectPopupClient):
+
 2013-02-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

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

@@ -25 +25 @@
 #include "DocumentWriter.h"
 #include "HTMLInputElement.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "PagePopup.h"
@@ -99 +100 @@
 }
 
+void ColorPickerClient::setValue(const String&)
+{
+    notImplemented();
+}
+
 void ColorPickerClient::didClosePopup()
 {

trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.h

@@ -47 +47 @@
     virtual Localizer& localizer();
     void setValueAndClosePopup(int, const String&);
+    void setValue(const String&);
+    void closePopup();
     void didClosePopup();
 
 private:
-    void closePopup();
-
     String m_source;
     BlackBerry::WebKit::WebPagePrivate* m_webPage;

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

@@ -26 +26 @@
 #include "Frame.h"
 #include "HTMLInputElement.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "PagePopup.h"
@@ -138 +139 @@
 }
 
+void DatePickerClient::setValue(int, const String& value)
+{
+    notImplemented();
+}
+
 void DatePickerClient::didClosePopup()
 {

trunk/Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.h

@@ -49 +49 @@
     virtual Localizer& localizer();
     void setValueAndClosePopup(int, const String&);
+    void setValue(const String&);
     void didClosePopup();
     void closePopup();

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

@@ -27 +27 @@
 #include "HTMLOptionElement.h"
 #include "HTMLSelectElement.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "PagePopup.h"
@@ -196 +197 @@
 }
 
+void SelectPopupClient::setValue(const String&)
+{
+    notImplemented();
+}
+
 void SelectPopupClient::didClosePopup()
 {

trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.h

@@ -56 +56 @@
     virtual Localizer& localizer();
     virtual void setValueAndClosePopup(int, const String&);
+    virtual void setValue(const String&);
+    virtual void closePopup();
     virtual void didClosePopup();
-    void closePopup();
 
     bool m_multiple;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-15  Keishi Hattori  <keishi@webkit.org>
+
+        Add setValue and closePopup methods to PagePopupController
+        https://bugs.webkit.org/show_bug.cgi?id=109897
+
+        Reviewed by Kent Tamura.
+
+        * src/ColorChooserPopupUIController.cpp:
+        (WebKit::ColorChooserPopupUIController::setValue):
+        (WebKit):
+        * src/ColorChooserPopupUIController.h:
+        (ColorChooserPopupUIController):
+        * src/DateTimeChooserImpl.cpp:
+        (WebKit::DateTimeChooserImpl::setValueAndClosePopup): Use setValue and closePopup.
+        (WebKit):
+        (WebKit::DateTimeChooserImpl::setValue):
+        (WebKit::DateTimeChooserImpl::closePopup):
+        * src/DateTimeChooserImpl.h:
+        (DateTimeChooserImpl):
+
 2013-02-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp

@@ -123 +123 @@
 }
 
+void ColorChooserPopupUIController::setValue(const String& value)
+{
+    ASSERT(m_client);
+    m_client->didChooseColor(Color(value));
+}
+
 void ColorChooserPopupUIController::didClosePopup()
 {

trunk/Source/WebKit/chromium/src/ColorChooserPopupUIController.h

@@ -55 +55 @@
     virtual WebCore::Locale& locale() OVERRIDE;
     virtual void setValueAndClosePopup(int, const String&) OVERRIDE;
+    virtual void setValue(const String&) OVERRIDE;
+    virtual void closePopup() OVERRIDE;
     virtual void didClosePopup() OVERRIDE;
 
 private:
     void openPopup();
-    void closePopup();
 
     ChromeClientImpl* m_chromeClient;

trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp

@@ -170 +170 @@
     RefPtr<DateTimeChooserImpl> protector(this);
     if (numValue >= 0)
-        m_client->didChooseValue(stringValue);
+        setValue(stringValue);
+    endChooser();
+}
+
+void DateTimeChooserImpl::setValue(const String& value)
+{
+    m_client->didChooseValue(value);
+}
+
+void DateTimeChooserImpl::closePopup()
+{
     endChooser();
 }

trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.h

@@ -60 +60 @@
     virtual WebCore::Locale& locale() OVERRIDE;
     virtual void setValueAndClosePopup(int, const String&) OVERRIDE;
+    virtual void setValue(const String&) OVERRIDE;
+    virtual void closePopup() OVERRIDE;
     virtual void didClosePopup() OVERRIDE;