Changeset 122550 in webkit

Timestamp:

Jul 13, 2012 1:06:58 AM (12 years ago)

Author:

dmazzoni@google.com

Message:

Should be possible to focus elements within canvas fallback content
​https://bugs.webkit.org/show_bug.cgi?id=87898

Reviewed by Chris Fleizach.

Source/WebCore:

Patches isFocusable in dom/Node.cpp and html/HTMLFormControlElement.cpp
to make elements focusable if they're a descendent of a canvas element
if they would otherwise have been focusable but just didn't have
a renderer. Adds a bit to ElementRareData to efficiently keep track
of elements in a canvas subtree.

Test: fast/canvas/fallback-content.html

• dom/Element.cpp:

(WebCore::Element::attach):
(WebCore::Element::detach):
(WebCore::Element::setIsInCanvasSubtree):
(WebCore):
(WebCore::Element::isInCanvasSubtree):

• dom/Element.h:

(Element):

• dom/ElementRareData.h:

(ElementRareData):
(WebCore::ElementRareData::ElementRareData):

• dom/Node.cpp:

(WebCore::Node::isFocusable):

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::attach):
(WebCore):

• html/HTMLCanvasElement.h:

(HTMLCanvasElement):

• html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::isFocusable):

LayoutTests:

• fast/canvas/fallback-content-expected.txt: Added.
• fast/canvas/fallback-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/fallback-content-expected.txt (added)
• LayoutTests/fast/canvas/fallback-content.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (3 diffs)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/ElementRareData.h (modified) (2 diffs)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLFormControlElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-13  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Should be possible to focus elements within canvas fallback content
+        https://bugs.webkit.org/show_bug.cgi?id=87898
+
+        Reviewed by Chris Fleizach.
+
+        * fast/canvas/fallback-content-expected.txt: Added.
+        * fast/canvas/fallback-content.html: Added.
+
 2012-07-13  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-13  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Should be possible to focus elements within canvas fallback content
+        https://bugs.webkit.org/show_bug.cgi?id=87898
+
+        Reviewed by Chris Fleizach.
+
+        Patches isFocusable in dom/Node.cpp and html/HTMLFormControlElement.cpp
+        to make elements focusable if they're a descendent of a canvas element
+        if they would otherwise have been focusable but just didn't have
+        a renderer. Adds a bit to ElementRareData to efficiently keep track
+        of elements in a canvas subtree.
+
+        Test: fast/canvas/fallback-content.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::attach):
+        (WebCore::Element::detach):
+        (WebCore::Element::setIsInCanvasSubtree):
+        (WebCore):
+        (WebCore::Element::isInCanvasSubtree):
+        * dom/Element.h:
+        (Element):
+        * dom/ElementRareData.h:
+        (ElementRareData):
+        (WebCore::ElementRareData::ElementRareData):
+        * dom/Node.cpp:
+        (WebCore::Node::isFocusable):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::attach):
+        (WebCore):
+        * html/HTMLCanvasElement.h:
+        (HTMLCanvasElement):
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::isFocusable):
+
 2012-07-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -939 +939 @@
     StyleResolverParentPusher parentPusher(this);
 
+    if (parentElement() && parentElement()->isInCanvasSubtree())
+        setIsInCanvasSubtree(true);
+
     // When a shadow root exists, it does the work of attaching the children.
     if (ElementShadow* shadow = this->shadow()) {
@@ -977 +980 @@
     unregisterNamedFlowContentNode();
     cancelFocusAppearanceUpdate();
-    if (hasRareData())
+    if (hasRareData()) {
+        setIsInCanvasSubtree(false);
         elementRareData()->resetComputedStyle();
+    }
 
     if (ElementShadow* shadow = this->shadow()) {
@@ -1671 +1676 @@
 }
 
+void Element::setIsInCanvasSubtree(bool isInCanvasSubtree)
+{
+    ElementRareData* data = ensureElementRareData();
+    data->m_isInCanvasSubtree = isInCanvasSubtree;
+}
+
+bool Element::isInCanvasSubtree() const
+{
+    return hasRareData() && elementRareData()->m_isInCanvasSubtree;
+}
+
 AtomicString Element::computeInheritedLanguage() const
 {

trunk/Source/WebCore/dom/Element.h

@@ -284 +284 @@
     bool styleAffectedByEmpty() const;
 
+    void setIsInCanvasSubtree(bool);
+    bool isInCanvasSubtree() const;
+
     AtomicString computeInheritedLanguage() const;
 

trunk/Source/WebCore/dom/ElementRareData.h

@@ -77 +77 @@
     OwnPtr<NamedNodeMap> m_attributeMap;
 
-    bool m_styleAffectedByEmpty;
+    bool m_styleAffectedByEmpty : 1;
+    bool m_isInCanvasSubtree : 1;
 
     IntSize m_savedLayerScrollOffset;
@@ -95 +96 @@
     , m_minimumSizeForResizing(defaultMinimumSizeForResizing())
     , m_styleAffectedByEmpty(false)
+    , m_isInCanvasSubtree(false)
 #if ENABLE(FULLSCREEN_API)
     , m_containsFullScreenElement(false)

trunk/Source/WebCore/dom/Node.cpp

@@ -919 +919 @@
         // the whole document is actually up to date.
         ASSERT(!document()->childNeedsStyleRecalc());
-    
+
+    // Elements in canvas fallback content are not rendered, but they are allowed to be
+    // focusable as long as their canvas is displayed and visible.
+    if (isElementNode() && toElement(this)->isInCanvasSubtree()) {
+        const Element* e = toElement(this);
+        while (e && !e->hasLocalName(canvasTag))
+            e = e->parentElement();
+        ASSERT(e);
+        return e->renderer() && e->renderer()->style()->visibility() == VISIBLE;
+    }
+
     // FIXME: Even if we are not visible, we might have a child that is visible.
     // Hyatt wants to fix that some day with a "has visible content" flag or the like.

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -136 +136 @@
 }
 
+void HTMLCanvasElement::attach()
+{
+    setIsInCanvasSubtree(true);
+    HTMLElement::attach();
+}
+
 void HTMLCanvasElement::addObserver(CanvasObserver* observer)
 {

trunk/Source/WebCore/html/HTMLCanvasElement.h

@@ -143 +143 @@
     virtual void parseAttribute(const Attribute&) OVERRIDE;
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+    virtual void attach();
 
     void reset();

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -313 +313 @@
 bool HTMLFormControlElement::isFocusable() const
 {
-    if (!renderer() || !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
+    // If there's a renderer, make sure the size isn't empty, but if there's no renderer,
+    // it might still be focusable if it's in a canvas subtree (handled in Node::isFocusable).
+    if (renderer() && (!renderer()->isBox() || toRenderBox(renderer())->size().isEmpty()))
         return false;
     // HTMLElement::isFocusable handles visibility and calls suportsFocus which