[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [141200] branches/chromium/1364/Source/WebCore/html/shadow
From: tkent () chromium ! org
Date: 2013-01-30 2:19:31
Message-ID: 20130130021931.ABE433010F7 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141200] branches/chromium/1364/Source/WebCore/html/shadow</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/141200">141200</a></dd> \
<dt>Author</dt> <dd>tkent@chromium.org</dd> <dt>Date</dt> <dd>2013-01-29 18:19:31 \
-0800 (Tue, 29 Jan 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Merge 140791
> INPUT_MULTIPLE_FIELDS_UI: Refactoring: Remove confusing minimum() and maximum() \
of DateTimeSymbolicFieldElement > https://bugs.webkit.org/show_bug.cgi?id=107918
>
> Reviewed by Kentaro Hara.
>
> DateTimeSymbolicFieldElement::minimum() and maximum() are very
> confusing. They don't return minimum/maximum value of 0-based symbol
> index though valueAsInteger is 0-based. These functions are used only
> for ARIA attributes in DateTimeFieldElement::initialize().
>
> - Remove DateTimeFieldElement::minimum() and maximum(), and pass
> minimum/maximum values for ARIA attributes as function arguments.
> - DateTimeNumericFieldElement::maximum() is now non-virtual.
> It is called by subclasses.
>
> No new tests. This should not change any behavior.
>
> * html/shadow/DateTimeFieldElement.cpp:
> (WebCore::DateTimeFieldElement::initialize):
> Add axMimimum/axMaximum arguments. Don't use minimum() and maximum().
> * html/shadow/DateTimeFieldElement.h:
> (DateTimeFieldElement): Ditto.
> * html/shadow/DateTimeNumericFieldElement.cpp:
> (WebCore::DateTimeNumericFieldElement::initialize):
> Pass m_range.minimum and maximum to DateTimeFieldElement::initialize().
> * html/shadow/DateTimeNumericFieldElement.h:
> (DateTimeNumericFieldElement):
> - Add initialize()
> - Make maximum() non-virtual
> - Remove minimum().
> * html/shadow/DateTimeSymbolicFieldElement.cpp:
> (WebCore::DateTimeSymbolicFieldElement::initialize):
> Pass m_minimumIndex + 1 and m_maximumIndex + 1 to
> DateTimeFieldElement::initialize().
> * html/shadow/DateTimeSymbolicFieldElement.h:
> (DateTimeSymbolicFieldElement):
> Add initialize() and remove minimum() and maximum().
TBR=tkent@chromium.org
BUG=crbug.com/172199
Review URL: https://codereview.chromium.org/12079062</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeFieldElementcpp">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp</a></li>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeFieldElementh">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h</a></li>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeNumericFieldElementc \
pp">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp</a></li>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeNumericFieldElementh \
">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h</a></li>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeSymbolicFieldElement \
cpp">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp</a></li>
<li><a href="#brancheschromium1364SourceWebCorehtmlshadowDateTimeSymbolicFieldElement \
h">branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium1364SourceWebCorehtmlshadowDateTimeFieldElementcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp (141199 => \
141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -140,11 +140,11 @@
</span><span class="cx"> m_fieldOwner->focusOnNextField(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DateTimeFieldElement::initialize(const AtomicString& pseudo, \
const String& axHelpText) </del><ins>+void DateTimeFieldElement::initialize(const \
AtomicString& pseudo, const String& axHelpText, int axMinimum, int axMaximum) \
</ins><span class="cx"> { </span><span class="cx"> setAttribute(aria_helpAttr, \
axHelpText); </span><del>- setAttribute(aria_valueminAttr, \
String::number(minimum()));
- setAttribute(aria_valuemaxAttr, String::number(maximum()));
</del><ins>+ setAttribute(aria_valueminAttr, String::number(axMinimum));
+ setAttribute(aria_valuemaxAttr, String::number(axMaximum));
</ins><span class="cx"> setPseudo(pseudo);
</span><span class="cx"> appendChild(Text::create(document(), visibleValue()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="brancheschromium1364SourceWebCorehtmlshadowDateTimeFieldElementh"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h (141199 => \
141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -82,11 +82,9 @@
</span><span class="cx"> virtual void didFocus();
</span><span class="cx"> void focusOnNextField();
</span><span class="cx"> virtual void handleKeyboardEvent(KeyboardEvent*) = 0;
</span><del>- void initialize(const AtomicString& pseudo, const String& \
axHelpText); </del><ins>+ void initialize(const AtomicString& pseudo, const \
String& axHelpText, int axMinimum, int axMaximum); </ins><span class="cx"> \
Locale& localeForOwner() const; </span><span class="cx"> AtomicString \
localeIdentifier() const; </span><del>- virtual int maximum() const = 0;
- virtual int minimum() const = 0;
</del><span class="cx"> void updateVisibleValue(EventBehavior);
</span><span class="cx"> virtual int valueAsInteger() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="brancheschromium1364SourceWebCorehtmlshadowDateTimeNumericFieldElementcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp \
(141199 => 141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -162,14 +162,14 @@
</span><span class="cx"> return m_hasValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int DateTimeNumericFieldElement::maximum() const
</del><ins>+void DateTimeNumericFieldElement::initialize(const AtomicString& \
pseudo, const String& axHelpText) </ins><span class="cx"> {
</span><del>- return m_range.maximum;
</del><ins>+ DateTimeFieldElement::initialize(pseudo, axHelpText, m_range.minimum, \
m_range.maximum); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-int DateTimeNumericFieldElement::minimum() const
</del><ins>+int DateTimeNumericFieldElement::maximum() const
</ins><span class="cx"> {
</span><del>- return m_range.minimum;
</del><ins>+ return m_range.maximum;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
DateTimeNumericFieldElement::setEmptyValue(EventBehavior eventBehavior) \
</span></span></pre></div> <a \
id="brancheschromium1364SourceWebCorehtmlshadowDateTimeNumericFieldElementh"></a> \
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h \
(141199 => 141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -68,7 +68,8 @@
</span><span class="cx">
</span><span class="cx"> // DateTimeFieldElement functions.
</span><span class="cx"> virtual bool hasValue() const OVERRIDE FINAL;
</span><del>- virtual int maximum() const OVERRIDE FINAL;
</del><ins>+ void initialize(const AtomicString& pseudo, const String& \
axHelpText); + int maximum() const;
</ins><span class="cx"> virtual void setEmptyValue(EventBehavior = \
DispatchNoEvent) OVERRIDE FINAL; </span><span class="cx"> virtual void \
setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE; </span><span \
class="cx"> virtual int valueAsInteger() const OVERRIDE FINAL; </span><span \
class="lines">@@ -79,7 +80,6 @@ </span><span class="cx"> virtual void didBlur() \
OVERRIDE FINAL; </span><span class="cx"> virtual void \
handleKeyboardEvent(KeyboardEvent*) OVERRIDE FINAL; </span><span class="cx"> \
virtual float maximumWidth(const Font&) OVERRIDE; </span><del>- virtual int \
minimum() const OVERRIDE FINAL; </del><span class="cx"> virtual void stepDown() \
OVERRIDE FINAL; </span><span class="cx"> virtual void stepUp() OVERRIDE FINAL;
</span><span class="cx"> virtual String value() const OVERRIDE FINAL;
</span></span></pre></div>
<a id="brancheschromium1364SourceWebCorehtmlshadowDateTimeSymbolicFieldElementcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp \
(141199 => 141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -87,16 +87,14 @@
</span><span class="cx"> return m_selectedIndex >= 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int DateTimeSymbolicFieldElement::maximum() const
</del><ins>+void DateTimeSymbolicFieldElement::initialize(const AtomicString& \
pseudo, const String& axHelpText) </ins><span class="cx"> {
</span><del>- return static_cast<int>(m_symbols.size());
</del><ins>+ // The minimum and maximum below are exposed to users, and 1-based \
numbers + // are natural for symbolic fields. For example, the minimum value of a
+ // month field should be 1, not 0.
+ DateTimeFieldElement::initialize(pseudo, axHelpText, 1, \
static_cast<int>(m_symbols.size())); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-int DateTimeSymbolicFieldElement::minimum() const
-{
- return 1;
-}
-
</del><span class="cx"> void \
DateTimeSymbolicFieldElement::setEmptyValue(EventBehavior eventBehavior) </span><span \
class="cx"> { </span><span class="cx"> if (isReadOnly())
</span></span></pre></div>
<a id="brancheschromium1364SourceWebCorehtmlshadowDateTimeSymbolicFieldElementh"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h \
(141199 => 141200)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-30 \
02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-30 \
02:19:31 UTC (rev 141200) </span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> DateTimeSymbolicFieldElement(Document*, FieldOwner&, \
const Vector<String>&); </span><span class="cx"> size_t symbolsSize() \
const { return m_symbols.size(); } </span><span class="cx"> virtual bool \
hasValue() const OVERRIDE FINAL; </span><ins>+ void initialize(const \
AtomicString& pseudo, const String& axHelpText); </ins><span class="cx"> \
virtual void setEmptyValue(EventBehavior = DispatchNoEvent) OVERRIDE FINAL; \
</span><span class="cx"> virtual void setValueAsInteger(int, EventBehavior = \
DispatchNoEvent) OVERRIDE FINAL; </span><span class="cx"> virtual int \
valueAsInteger() const OVERRIDE FINAL; </span><span class="lines">@@ -52,9 +53,7 @@
</span><span class="cx">
</span><span class="cx"> // DateTimeFieldElement functions.
</span><span class="cx"> virtual void handleKeyboardEvent(KeyboardEvent*) \
OVERRIDE FINAL; </span><del>- virtual int maximum() const OVERRIDE FINAL;
</del><span class="cx"> virtual float maximumWidth(const Font&) OVERRIDE;
</span><del>- virtual int minimum() const OVERRIDE FINAL;
</del><span class="cx"> virtual void stepDown() OVERRIDE FINAL;
</span><span class="cx"> virtual void stepUp() OVERRIDE FINAL;
</span><span class="cx"> virtual String value() const OVERRIDE FINAL;
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic