Changeset 156185 in webkit

Timestamp:

Sep 20, 2013 12:06:52 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Hiding a focused element should unfocus it and fire a blur event
​https://bugs.webkit.org/show_bug.cgi?id=29241

Patch by Arunprasad Rajkumar <​ararunprasad@gmail.com> on 2013-09-20
Reviewed by Darin Adler.

Source/WebCore:

Test: fast/dom/HTMLDocument/active-element-gets-unfocusable.html

We check whether the current focus element is really focusable after
the style recalculation and layout change. If it is not focusable then schedule a
timer to reset it asynchronously.

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::recalcStyle): Check isFocusable() on the focus element after
style recalculation.
(WebCore::Document::updateLayout): Check isFocusable() on the focus element after
layout.
(WebCore::Document::resetHiddenFocusElementSoon):
(WebCore::Document::resetHiddenFocusElementTimer):

• dom/Document.h:

LayoutTests:

• fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt: Added.
• fast/dom/HTMLDocument/active-element-gets-unfocusable.html: Added.

LayoutTest reused from ​https://chromium.googlesource.com/chromium/blink/+/c58f636fd18fc27944c42e27d6a92a36867c57e1
with little modification.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt (added)
• LayoutTests/fast/dom/HTMLDocument/active-element-gets-unfocusable.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (5 diffs)
• Source/WebCore/dom/Document.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-20  Arunprasad Rajkumar  <ararunprasad@gmail.com>
+
+        Hiding a focused element should unfocus it and fire a blur event
+        https://bugs.webkit.org/show_bug.cgi?id=29241
+
+        Reviewed by Darin Adler.
+
+        * fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt: Added.
+        * fast/dom/HTMLDocument/active-element-gets-unfocusable.html: Added.
+
+        LayoutTest reused from https://chromium.googlesource.com/chromium/blink/+/c58f636fd18fc27944c42e27d6a92a36867c57e1
+        with little modification.
+
 2013-09-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-20  Arunprasad Rajkumar  <ararunprasad@gmail.com>
+
+        Hiding a focused element should unfocus it and fire a blur event
+        https://bugs.webkit.org/show_bug.cgi?id=29241
+
+        Reviewed by Darin Adler.
+
+        Test: fast/dom/HTMLDocument/active-element-gets-unfocusable.html
+
+        We check whether the current focus element is really focusable after
+        the style recalculation and layout change. If it is not focusable then schedule a
+        timer to reset it asynchronously.
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::recalcStyle): Check isFocusable() on the focus element after
+        style recalculation.
+        (WebCore::Document::updateLayout): Check isFocusable() on the focus element after
+        layout.
+        (WebCore::Document::resetHiddenFocusElementSoon):
+        (WebCore::Document::resetHiddenFocusElementTimer):
+        * dom/Document.h:
+
 2013-09-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -440 +440 @@
     , m_markers(adoptPtr(new DocumentMarkerController))
     , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired)
+    , m_resetHiddenFocusElementTimer(this, &Document::resetHiddenFocusElementTimer)
     , m_cssTarget(0)
     , m_processingLoadEvent(false)
@@ -1828 +1829 @@
     if (m_hoveredElement && !m_hoveredElement->renderer())
         frameView.frame().eventHandler().dispatchFakeMouseMoveEventSoon();
+
+    // Style change may reset the focus, e.g. display: none, visibility: hidden.
+    resetHiddenFocusElementSoon();
 }
 
@@ -1866 +1870 @@
     if (frameView && renderView() && (frameView->layoutPending() || renderView()->needsLayout()))
         frameView->layout();
+
+    // Active focus element's isFocusable() state may change after Layout. e.g. width: 0px or height: 0px.
+    resetHiddenFocusElementSoon();
 }
 
@@ -4687 +4694 @@
 }
 
+void Document::resetHiddenFocusElementSoon()
+{
+    if (!m_resetHiddenFocusElementTimer.isActive() && m_focusedElement && !m_focusedElement->isFocusable())
+        m_resetHiddenFocusElementTimer.startOneShot(0);
+}
+
 void Document::updateFocusAppearanceTimerFired(Timer<Document>*)
 {
@@ -4696 +4709 @@
     if (element->isFocusable())
         element->updateFocusAppearance(m_updateFocusAppearanceRestoresSelection);
+}
+
+void Document::resetHiddenFocusElementTimer(Timer<Document>*)
+{
+    if (m_focusedElement && !m_focusedElement->isFocusable())
+        setFocusedElement(0);
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -919 +919 @@
     void updateFocusAppearanceSoon(bool restorePreviousSelection);
     void cancelFocusAppearanceUpdate();
-        
+
+    void resetHiddenFocusElementSoon();
+
     // Extension for manipulating canvas drawing contexts for use in CSS
     CanvasRenderingContext* getCSSCanvasContext(const String& type, const String& name, int width, int height);
@@ -1226 +1228 @@
     void updateBaseURL();
 
+    void resetHiddenFocusElementTimer(Timer<Document>*);
+
     void buildAccessKeyMap(TreeScope* root);
 
@@ -1377 +1381 @@
     
     Timer<Document> m_updateFocusAppearanceTimer;
+    Timer<Document> m_resetHiddenFocusElementTimer;
 
     Element* m_cssTarget;