Changeset 150697 in webkit

Timestamp:

May 25, 2013 7:22:04 PM (11 years ago)

Author:

akling@apple.com

Message:

Move Node::focusDelegate() to Element.
<​http://webkit.org/b/116768>

Reviewed by Anders Carlsson.

Only Element can be a focus delegate (it's currently only ever HTMLInputElement actually)
so move Node::focusDelegate() to Element. Sprinkled isElementNode() checks as needed.

• dom/Node.cpp:
• dom/Node.h:
• dom/Element.h:
• dom/Element.cpp:
• html/shadow/SliderThumbElement.cpp:

(WebCore::SliderThumbElement::focusDelegate):

• html/shadow/SliderThumbElement.h:
• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::isFocused):

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintSliderThumb):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (1 diff)
• html/shadow/SliderThumbElement.cpp (modified) (1 diff)
• html/shadow/SliderThumbElement.h (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        Move Node::focusDelegate() to Element.
+        <http://webkit.org/b/116768>
+
+        Reviewed by Anders Carlsson.
+
+        Only Element can be a focus delegate (it's currently only ever HTMLInputElement actually)
+        so move Node::focusDelegate() to Element. Sprinkled isElementNode() checks as needed.
+
+        * dom/Node.cpp:
+        * dom/Node.h:
+        * dom/Element.h:
+        * dom/Element.cpp:
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::focusDelegate):
+        * html/shadow/SliderThumbElement.h:
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isFocused):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSliderThumb):
+
 2013-05-25  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -245 +245 @@
 }
 
+Element* Element::focusDelegate()
+{
+    return this;
+}
+
 short Element::tabIndex() const
 {

trunk/Source/WebCore/dom/Element.h

@@ -436 +436 @@
     virtual bool isMouseFocusable() const;
 
+    virtual Element* focusDelegate();
+
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
 

trunk/Source/WebCore/dom/Node.cpp

@@ -886 +886 @@
 }
 
-Node* Node::focusDelegate()
-{
-    return this;
-}
-
 unsigned Node::nodeIndex() const
 {

trunk/Source/WebCore/dom/Node.h

@@ -407 +407 @@
     // Whether the node can actually be focused.
     virtual bool isFocusable() const;
-    virtual Node* focusDelegate();
 
     enum UserSelectAllTreatment {

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

@@ -238 +238 @@
 }
 
-Node* SliderThumbElement::focusDelegate()
+Element* SliderThumbElement::focusDelegate()
 {
     return hostInput();

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

@@ -69 +69 @@
     virtual bool matchesReadOnlyPseudoClass() const OVERRIDE;
     virtual bool matchesReadWritePseudoClass() const OVERRIDE;
-    virtual Node* focusDelegate();
+    virtual Element* focusDelegate() OVERRIDE;
     void startDragging();
     void stopDragging();

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -795 +795 @@
 {
     Node* node = o->node();
-    if (!node)
-        return false;
-
-    node = node->focusDelegate();
-    Document* document = node->document();
+    if (!node || !node->isElementNode())
+        return false;
+
+    Element* focusDelegate = toElement(node)->focusDelegate();
+    Document* document = focusDelegate->document();
     Frame* frame = document->frame();
-    return node == document->focusedNode() && frame && frame->selection()->isFocusedAndActive();
+    return focusDelegate == document->focusedNode() && frame && frame->selection()->isFocusedAndActive();
 }
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1763 +1763 @@
     updateActiveState(sliderThumbCell, o);
     updateEnabledState(sliderThumbCell, o);
-    updateFocusedState(sliderThumbCell, (o->node() && o->node()->focusDelegate()->renderer()) ? o->node()->focusDelegate()->renderer() : o);
+    Element* focusDelegate = (o->node() && o->node()->isElementNode()) ? toElement(o->node())->focusDelegate() : 0;
+    updateFocusedState(sliderThumbCell, focusDelegate ? focusDelegate->renderer() : 0);
 
     // Update the pressed state using the NSCell tracking methods, since that's how NSSliderCell keeps track of it.