Changeset 156210 in webkit

Timestamp:

Sep 20, 2013, 4:59:19 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r156185.
​http://trac.webkit.org/changeset/156185
​https://bugs.webkit.org/show_bug.cgi?id=121727

Caused a lot of crashes in tests (Requested by ap on #webkit).

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::recalcStyle):
(WebCore::Document::updateLayout):

• dom/Document.h:

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt (deleted)
• LayoutTests/fast/dom/HTMLDocument/active-element-gets-unfocusable.html (deleted)
• 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  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r156185.
+        http://trac.webkit.org/changeset/156185
+        https://bugs.webkit.org/show_bug.cgi?id=121727
+
+        Caused a lot of crashes in tests (Requested by ap on #webkit).
+
+        * fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt: Removed.
+        * fast/dom/HTMLDocument/active-element-gets-unfocusable.html: Removed.
+
 2013-09-20  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r156185.
+        http://trac.webkit.org/changeset/156185
+        https://bugs.webkit.org/show_bug.cgi?id=121727
+
+        Caused a lot of crashes in tests (Requested by ap on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::recalcStyle):
+        (WebCore::Document::updateLayout):
+        * dom/Document.h:
+
 2013-09-20  Dean Jackson  <dino@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)
@@ -1829 +1828 @@
     if (m_hoveredElement && !m_hoveredElement->renderer())
         frameView.frame().eventHandler().dispatchFakeMouseMoveEventSoon();
-
-    // Style change may reset the focus, e.g. display: none, visibility: hidden.
-    resetHiddenFocusElementSoon();
 }
 
@@ -1870 +1866 @@
     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();
 }
 
@@ -4694 +4687 @@
 }
 
-void Document::resetHiddenFocusElementSoon()
-{
-    if (!m_resetHiddenFocusElementTimer.isActive() && m_focusedElement && !m_focusedElement->isFocusable())
-        m_resetHiddenFocusElementTimer.startOneShot(0);
-}
-
 void Document::updateFocusAppearanceTimerFired(Timer<Document>*)
 {
@@ -4709 +4696 @@
     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);
@@ -1228 +1226 @@
     void updateBaseURL();
 
-    void resetHiddenFocusElementTimer(Timer<Document>*);
-
     void buildAccessKeyMap(TreeScope* root);
 
@@ -1381 +1377 @@
     
     Timer<Document> m_updateFocusAppearanceTimer;
-    Timer<Document> m_resetHiddenFocusElementTimer;
 
     Element* m_cssTarget;