Changeset 156210 in webkit


Ignore:
Timestamp:
Sep 20, 2013 4:59:19 PM (11 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:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r156203 r156210  
     12013-09-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r156185.
     4        http://trac.webkit.org/changeset/156185
     5        https://bugs.webkit.org/show_bug.cgi?id=121727
     6
     7        Caused a lot of crashes in tests (Requested by ap on #webkit).
     8
     9        * fast/dom/HTMLDocument/active-element-gets-unfocusable-expected.txt: Removed.
     10        * fast/dom/HTMLDocument/active-element-gets-unfocusable.html: Removed.
     11
    1122013-09-20  Mario Sanchez Prada  <mario.prada@samsung.com>
    213
  • trunk/Source/WebCore/ChangeLog

    r156205 r156210  
     12013-09-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r156185.
     4        http://trac.webkit.org/changeset/156185
     5        https://bugs.webkit.org/show_bug.cgi?id=121727
     6
     7        Caused a lot of crashes in tests (Requested by ap on #webkit).
     8
     9        * dom/Document.cpp:
     10        (WebCore::Document::Document):
     11        (WebCore::Document::recalcStyle):
     12        (WebCore::Document::updateLayout):
     13        * dom/Document.h:
     14
    1152013-09-20  Dean Jackson  <dino@apple.com>
    216
  • trunk/Source/WebCore/dom/Document.cpp

    r156185 r156210  
    440440    , m_markers(adoptPtr(new DocumentMarkerController))
    441441    , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired)
    442     , m_resetHiddenFocusElementTimer(this, &Document::resetHiddenFocusElementTimer)
    443442    , m_cssTarget(0)
    444443    , m_processingLoadEvent(false)
     
    18291828    if (m_hoveredElement && !m_hoveredElement->renderer())
    18301829        frameView.frame().eventHandler().dispatchFakeMouseMoveEventSoon();
    1831 
    1832     // Style change may reset the focus, e.g. display: none, visibility: hidden.
    1833     resetHiddenFocusElementSoon();
    18341830}
    18351831
     
    18701866    if (frameView && renderView() && (frameView->layoutPending() || renderView()->needsLayout()))
    18711867        frameView->layout();
    1872 
    1873     // Active focus element's isFocusable() state may change after Layout. e.g. width: 0px or height: 0px.
    1874     resetHiddenFocusElementSoon();
    18751868}
    18761869
     
    46944687}
    46954688
    4696 void Document::resetHiddenFocusElementSoon()
    4697 {
    4698     if (!m_resetHiddenFocusElementTimer.isActive() && m_focusedElement && !m_focusedElement->isFocusable())
    4699         m_resetHiddenFocusElementTimer.startOneShot(0);
    4700 }
    4701 
    47024689void Document::updateFocusAppearanceTimerFired(Timer<Document>*)
    47034690{
     
    47094696    if (element->isFocusable())
    47104697        element->updateFocusAppearance(m_updateFocusAppearanceRestoresSelection);
    4711 }
    4712 
    4713 void Document::resetHiddenFocusElementTimer(Timer<Document>*)
    4714 {
    4715     if (m_focusedElement && !m_focusedElement->isFocusable())
    4716         setFocusedElement(0);
    47174698}
    47184699
  • trunk/Source/WebCore/dom/Document.h

    r156185 r156210  
    919919    void updateFocusAppearanceSoon(bool restorePreviousSelection);
    920920    void cancelFocusAppearanceUpdate();
    921 
    922     void resetHiddenFocusElementSoon();
    923 
     921       
    924922    // Extension for manipulating canvas drawing contexts for use in CSS
    925923    CanvasRenderingContext* getCSSCanvasContext(const String& type, const String& name, int width, int height);
     
    12281226    void updateBaseURL();
    12291227
    1230     void resetHiddenFocusElementTimer(Timer<Document>*);
    1231 
    12321228    void buildAccessKeyMap(TreeScope* root);
    12331229
     
    13811377   
    13821378    Timer<Document> m_updateFocusAppearanceTimer;
    1383     Timer<Document> m_resetHiddenFocusElementTimer;
    13841379
    13851380    Element* m_cssTarget;
Note: See TracChangeset for help on using the changeset viewer.