Title: [151572] trunk/Source/WebCore
- Revision
- 151572
- Author
- [email protected]
- Date
- 2013-06-13 15:47:26 -0700 (Thu, 13 Jun 2013)
Log Message
Move Node::shouldUseInputMethod() to Element.
<http://webkit.org/b/117603>
Reviewed by Antti Koivisto.
This method is only ever called on Elements, so move it off of Node.
* dom/Element.cpp:
(WebCore::Element::shouldUseInputMethod):
* dom/Element.h:
* dom/Node.cpp:
* dom/Node.h:
* html/HTMLInputElement.h:
* html/HTMLTextAreaElement.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151571 => 151572)
--- trunk/Source/WebCore/ChangeLog 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/ChangeLog 2013-06-13 22:47:26 UTC (rev 151572)
@@ -1,3 +1,20 @@
+2013-06-13 Andreas Kling <[email protected]>
+
+ Move Node::shouldUseInputMethod() to Element.
+ <http://webkit.org/b/117603>
+
+ Reviewed by Antti Koivisto.
+
+ This method is only ever called on Elements, so move it off of Node.
+
+ * dom/Element.cpp:
+ (WebCore::Element::shouldUseInputMethod):
+ * dom/Element.h:
+ * dom/Node.cpp:
+ * dom/Node.h:
+ * html/HTMLInputElement.h:
+ * html/HTMLTextAreaElement.h:
+
2013-06-13 Max Vujovic <[email protected]>
[CSS Regions] Selection dragged from a region paints its background
Modified: trunk/Source/WebCore/dom/Element.cpp (151571 => 151572)
--- trunk/Source/WebCore/dom/Element.cpp 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-06-13 22:47:26 UTC (rev 151572)
@@ -269,6 +269,11 @@
return isFocusable();
}
+bool Element::shouldUseInputMethod()
+{
+ return isContentEditable(UserSelectAllIsAlwaysNonEditable);
+}
+
void Element::dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions eventOptions, SimulatedClickVisualOptions visualOptions)
{
EventDispatcher::dispatchSimulatedClick(this, underlyingEvent, eventOptions, visualOptions);
Modified: trunk/Source/WebCore/dom/Element.h (151571 => 151572)
--- trunk/Source/WebCore/dom/Element.h 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/dom/Element.h 2013-06-13 22:47:26 UTC (rev 151572)
@@ -442,6 +442,8 @@
virtual bool isKeyboardFocusable(KeyboardEvent*) const;
virtual bool isMouseFocusable() const;
+ virtual bool shouldUseInputMethod();
+
virtual short tabIndex() const;
virtual Element* focusDelegate();
Modified: trunk/Source/WebCore/dom/Node.cpp (151571 => 151572)
--- trunk/Source/WebCore/dom/Node.cpp 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/dom/Node.cpp 2013-06-13 22:47:26 UTC (rev 151572)
@@ -733,11 +733,6 @@
return false;
}
-bool Node::shouldUseInputMethod()
-{
- return isContentEditable(UserSelectAllIsAlwaysNonEditable);
-}
-
RenderBox* Node::renderBox() const
{
RenderObject* renderer = this->renderer();
Modified: trunk/Source/WebCore/dom/Node.h (151571 => 151572)
--- trunk/Source/WebCore/dom/Node.h 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/dom/Node.h 2013-06-13 22:47:26 UTC (rev 151572)
@@ -398,7 +398,6 @@
return false;
}
- virtual bool shouldUseInputMethod();
virtual LayoutRect boundingBox() const;
IntRect pixelSnappedBoundingBox() const { return pixelSnappedIntRect(boundingBox()); }
LayoutRect renderRect(bool* isReplaced);
Modified: trunk/Source/WebCore/html/HTMLInputElement.h (151571 => 151572)
--- trunk/Source/WebCore/html/HTMLInputElement.h 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2013-06-13 22:47:26 UTC (rev 151572)
@@ -328,7 +328,7 @@
virtual bool isEnumeratable() const;
virtual bool supportLabels() const OVERRIDE;
virtual void updateFocusAppearance(bool restorePreviousSelection);
- virtual bool shouldUseInputMethod();
+ virtual bool shouldUseInputMethod() OVERRIDE FINAL;
virtual bool isTextFormControl() const { return isTextField(); }
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.h (151571 => 151572)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.h 2013-06-13 22:32:50 UTC (rev 151571)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.h 2013-06-13 22:47:26 UTC (rev 151572)
@@ -110,7 +110,7 @@
virtual void accessKeyAction(bool sendMouseEvents);
- virtual bool shouldUseInputMethod();
+ virtual bool shouldUseInputMethod() OVERRIDE;
virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
virtual bool matchesReadOnlyPseudoClass() const OVERRIDE;
virtual bool matchesReadWritePseudoClass() const OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
