Changeset 127398 in webkit

Timestamp:

Sep 2, 2012 9:03:19 PM (12 years ago)

Author:

yosin@chromium.org

Message:

[Forms] AM/PM field of multiple fields time input UI should be fixed width
​https://bugs.webkit.org/show_bug.cgi?id=95542

Reviewed by Kent Tamura.

This patch changes width of AM/PM field of multiple field time input
UI fixed as maximum width of labels or "--".

This patch affects ports which enable both ENABLE_INPUT_TYPE_TIME and
ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS.

No new tests. Once multiple field time input UI uses "lang" HTML
attribute to take time format, we can write a test for this patch.

• css/html.css:

(input::-webkit-datetime-edit-ampm-field): Added "display" property to "inline-block" for setting width.
Added "text-align" property to "center".

• html/shadow/DateTimeSymbolicFieldElement.cpp:

(WebCore::DateTimeSymbolicFieldElement::DateTimeSymbolicFieldElement): Changed to call setHasCustomCallback().
(WebCore::DateTimeSymbolicFieldElement::customStyleForRenderer): Added for setting field with from maximum width of labels.

• html/shadow/DateTimeSymbolicFieldElement.h:

(WebCore::DateTimeSymbolicFieldElement::visibleEmptyValue): Added for using visible empty value in customStyleForRenderer() and visibleValue().
(WebCore::DateTimeSymbolicFieldElement::visibleValue): Changed to call visibleEmptyValue() instead of using literal "--".
(DateTimeSymbolicFieldElement): Added a declaration of customStyleForRenderer().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/html.css (modified) (1 diff)
• html/shadow/DateTimeSymbolicFieldElement.cpp (modified) (3 diffs)
• html/shadow/DateTimeSymbolicFieldElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-02  Yoshifumi Inoue  <yosin@chromium.org>
+
+        [Forms] AM/PM field of multiple fields time input UI should be fixed width
+        https://bugs.webkit.org/show_bug.cgi?id=95542
+
+        Reviewed by Kent Tamura.
+
+        This patch changes width of AM/PM field of multiple field time input
+        UI fixed as maximum width of labels or "--".
+
+        This patch affects ports which enable both ENABLE_INPUT_TYPE_TIME and
+        ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS.
+
+        No new tests. Once multiple field time input UI uses "lang" HTML
+        attribute to take time format, we can write a test for this patch.
+
+        * css/html.css:
+        (input::-webkit-datetime-edit-ampm-field): Added "display" property to "inline-block" for setting width.
+        Added "text-align" property to "center".
+        * html/shadow/DateTimeSymbolicFieldElement.cpp:
+        (WebCore::DateTimeSymbolicFieldElement::DateTimeSymbolicFieldElement): Changed to call setHasCustomCallback().
+        (WebCore::DateTimeSymbolicFieldElement::customStyleForRenderer): Added for setting field with from maximum width of labels.
+        * html/shadow/DateTimeSymbolicFieldElement.h:
+        (WebCore::DateTimeSymbolicFieldElement::visibleEmptyValue): Added for using visible empty value in customStyleForRenderer() and visibleValue().
+        (WebCore::DateTimeSymbolicFieldElement::visibleValue): Changed to call visibleEmptyValue() instead of using literal "--".
+        (DateTimeSymbolicFieldElement): Added a declaration of customStyleForRenderer().
+
 2012-09-02  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/css/html.css

@@ -492 +492 @@
     border: none;
     padding: 0.15em;
+    display: inline-block;
+    text-align: center;
 }
 

trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp

@@ -28 +28 @@
 #include "DateTimeSymbolicFieldElement.h"
 
+#include "FontCache.h"
 #include "KeyboardEvent.h"
+#include "RenderStyle.h"
+#include "StyleResolver.h"
+#include "TextRun.h"
 #include <wtf/unicode/Unicode.h>
 
@@ -39 +43 @@
 {
     ASSERT(!symbols.isEmpty());
+    setHasCustomCallbacks();
+}
+
+PassRefPtr<RenderStyle> DateTimeSymbolicFieldElement::customStyleForRenderer()
+{
+    FontCachePurgePreventer fontCachePurgePreventer;
+    RefPtr<RenderStyle> originalStyle = document()->styleResolver()->styleForElement(this);
+    RefPtr<RenderStyle> style = RenderStyle::clone(originalStyle.get());
+    float maxiumWidth = style->font().width(visibleEmptyValue());
+    for (unsigned index = 0; index < m_symbols.size(); ++index)
+        maxiumWidth = std::max(maxiumWidth, style->font().width(m_symbols[index]));
+    style->setWidth(Length(maxiumWidth, Fixed));
+    return style.release();
 }
 
@@ -99 +116 @@
 }
 
+String DateTimeSymbolicFieldElement::visibleEmptyValue() const
+{
+    // FIXME: Number of dashs should be maximum length of labels.
+    return "--";
+}
+
 String DateTimeSymbolicFieldElement::visibleValue() const
 {
-    return hasValue() ? m_symbols[m_selectedIndex] : "--";
+    return hasValue() ? m_symbols[m_selectedIndex] : visibleEmptyValue();
 }
 

trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h

@@ -44 +44 @@
     static const int invalidIndex = -1;
 
+    virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE FINAL;
+    String visibleEmptyValue() const;
+
     // DateTimeFieldElement functions.
     virtual void handleKeyboardEvent(KeyboardEvent*) OVERRIDE FINAL;