Title: [139043] trunk/Source/WebCore
- Revision
- 139043
- Author
- [email protected]
- Date
- 2013-01-08 00:40:10 -0800 (Tue, 08 Jan 2013)
Log Message
REGRESSION(r139036): 'WebCore::DateTimeSymbolicFieldElement::isInRange' hides overloaded virtual function
https://bugs.webkit.org/show_bug.cgi?id=106311
Unreviewed build fix.
* html/shadow/DateTimeSymbolicFieldElement.cpp:
(WebCore::DateTimeSymbolicFieldElement::stepDown):
(WebCore::DateTimeSymbolicFieldElement::stepUp):
* html/shadow/DateTimeSymbolicFieldElement.h:
(WebCore::DateTimeSymbolicFieldElement::indexIsInRange): renamed method to avoid hiding Element::isInRange
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139042 => 139043)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 08:23:01 UTC (rev 139042)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 08:40:10 UTC (rev 139043)
@@ -1,3 +1,16 @@
+2013-01-08 Jochen Eisinger <[email protected]>
+
+ REGRESSION(r139036): 'WebCore::DateTimeSymbolicFieldElement::isInRange' hides overloaded virtual function
+ https://bugs.webkit.org/show_bug.cgi?id=106311
+
+ Unreviewed build fix.
+
+ * html/shadow/DateTimeSymbolicFieldElement.cpp:
+ (WebCore::DateTimeSymbolicFieldElement::stepDown):
+ (WebCore::DateTimeSymbolicFieldElement::stepUp):
+ * html/shadow/DateTimeSymbolicFieldElement.h:
+ (WebCore::DateTimeSymbolicFieldElement::indexIsInRange): renamed method to avoid hiding Element::isInRange
+
2013-01-08 Adam Barth <[email protected]>
HTMLTreeBuilder shouldn't keep a Document pointer
Modified: trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp (139042 => 139043)
--- trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-08 08:23:01 UTC (rev 139042)
+++ trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-08 08:40:10 UTC (rev 139043)
@@ -119,7 +119,7 @@
void DateTimeSymbolicFieldElement::stepDown()
{
if (hasValue()) {
- if (!isInRange(--m_selectedIndex))
+ if (!indexIsInRange(--m_selectedIndex))
m_selectedIndex = m_maximumIndex;
} else
m_selectedIndex = m_maximumIndex;
@@ -129,7 +129,7 @@
void DateTimeSymbolicFieldElement::stepUp()
{
if (hasValue()) {
- if (!isInRange(++m_selectedIndex))
+ if (!indexIsInRange(++m_selectedIndex))
m_selectedIndex = m_minimumIndex;
} else
m_selectedIndex = m_minimumIndex;
Modified: trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h (139042 => 139043)
--- trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-08 08:23:01 UTC (rev 139042)
+++ trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-08 08:40:10 UTC (rev 139043)
@@ -49,7 +49,7 @@
static const int invalidIndex = -1;
String visibleEmptyValue() const;
- bool isInRange(int index) const { return index >= m_minimumIndex && index <= m_maximumIndex; }
+ bool indexIsInRange(int index) const { return index >= m_minimumIndex && index <= m_maximumIndex; }
// DateTimeFieldElement functions.
virtual void handleKeyboardEvent(KeyboardEvent*) OVERRIDE FINAL;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
