Changeset 52535 in webkit


Ignore:
Timestamp:
Dec 23, 2009 5:15:10 PM (14 years ago)
Author:
levin@chromium.org
Message:

2009-12-23 David Levin <​levin@chromium.org>

REGRESSION (r52494): Assertion failure in Frame::caretBlinkTimerFired() (selection()->isCaret())
​https://bugs.webkit.org/show_bug.cgi?id=32903

No review but ok'ed by Darin Adler. Rolling out r52494 due to above regression.

LayoutTests:

  • fast/forms/selection-layout-reentry-strange-case-expected.txt: Removed.
  • fast/forms/selection-layout-reentry-strange-case.html: Removed.
  • platform/mac/accessibility/frame-with-title-expected.txt:

WebCore:

  • editing/SelectionController.cpp: (WebCore::SelectionController::SelectionController): (WebCore::SelectionController::setSelection):
  • editing/SelectionController.h:
  • page/Frame.cpp: (WebCore::Frame::setCaretVisible): (WebCore::Frame::selectionLayoutChanged):
  • page/FrameView.cpp: (WebCore::FrameView::needsLayout):
Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r52534 r52535  
     12009-12-23  David Levin  <levin@chromium.org>
     2
     3        REGRESSION (r52494): Assertion failure in Frame::caretBlinkTimerFired() (selection()->isCaret())
     4        https://bugs.webkit.org/show_bug.cgi?id=32903
     5
     6        No review but ok'ed by Darin Adler. Rolling out r52494 due to above regression.
     7
     8        * fast/forms/selection-layout-reentry-strange-case-expected.txt: Removed.
     9        * fast/forms/selection-layout-reentry-strange-case.html: Removed.
     10        * platform/mac/accessibility/frame-with-title-expected.txt:
     11
    1122009-12-23  Nikolas Zimmermann  <nzimmermann@rim.com>
    213

  • trunk/LayoutTests/platform/mac/accessibility/frame-with-title-expected.txt

    r52494 r52535  
    2222AXLinkUIElements: <array of size 0>
    2323AXLoaded: 1
    24 AXLayoutCount: 4
     24AXLayoutCount: 3
    2525AXURL: about:blank
    2626
    … …  
    4949AXLinkUIElements: <array of size 0>
    5050AXLoaded: 1
    51 AXLayoutCount: 5
     51AXLayoutCount: 4
    5252AXURL: about:blank
    5353

  • trunk/WebCore/ChangeLog

    r52534 r52535  
     12009-12-23  David Levin  <levin@chromium.org>
     2
     3        REGRESSION (r52494): Assertion failure in Frame::caretBlinkTimerFired() (selection()->isCaret())
     4        https://bugs.webkit.org/show_bug.cgi?id=32903
     5
     6        No review but ok'ed by Darin Adler. Rolling out r52494 due to above regression.
     7
     8        * editing/SelectionController.cpp:
     9        (WebCore::SelectionController::SelectionController):
     10        (WebCore::SelectionController::setSelection):
     11        * editing/SelectionController.h:
     12        * page/Frame.cpp:
     13        (WebCore::Frame::setCaretVisible):
     14        (WebCore::Frame::selectionLayoutChanged):
     15        * page/FrameView.cpp:
     16        (WebCore::FrameView::needsLayout):
     17
    1182009-12-23  Nikolas Zimmermann  <nzimmermann@rim.com>
    219

  • trunk/WebCore/editing/SelectionController.cpp

    r52494 r52535  
    11/*
    2  * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved.
     2 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    7171    , m_isCaretBlinkingSuspended(false)
    7272    , m_focused(frame && frame->page() && frame->page()->focusController()->focusedFrame() == frame)
    73     , m_needsDisplayUpdate(false)
    7473{
    7574}
    … …  
    147146        m_frame->setFocusedNodeIfNeeded();
    148147   
    149     setNeedsDisplayUpdate();
    150 
     148    m_frame->selectionLayoutChanged();
    151149    // Always clear the x position used for vertical arrow navigation.
    152150    // It will be restored by the vertical arrow navigation code if necessary.
    … …  
    13041302}
    13051303
    1306 void SelectionController::setNeedsDisplayUpdate(bool needsUpdate)
    1307 {
    1308     if (m_needsDisplayUpdate == needsUpdate)
    1309         return;
    1310     m_needsDisplayUpdate = needsUpdate;
    1311 
    1312     if (!m_needsDisplayUpdate)
    1313         return;
    1314     FrameView* view = m_frame->view();
    1315     if (!view)
    1316         return;
    1317     view->scheduleRelayout();
    1318 }
    1319 
    13201304#ifndef NDEBUG
    13211305

  • trunk/WebCore/editing/SelectionController.h

    r52494 r52535  
    11/*
    2  * Copyright (C) 2004, 2009 Apple Inc. All rights reserved.
     2 * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    125125    void pageActivationChanged();
    126126
    127     // Selection display machinery
    128     void setNeedsDisplayUpdate(bool = true);
    129     bool needsDisplayUpdate() const { return m_needsDisplayUpdate; }
    130 
    131127#ifndef NDEBUG
    132128    void formatForDebugger(char* buffer, unsigned length) const;
    … …  
    179175    bool m_isCaretBlinkingSuspended : 1;
    180176    bool m_focused : 1;
    181     bool m_needsDisplayUpdate : 1;
     177
    182178};
    183179

  • trunk/WebCore/page/Frame.cpp

    r52494 r52535  
    564564    clearCaretRectIfNeeded();
    565565    m_caretVisible = flag;
    566     selection()->setNeedsDisplayUpdate();
     566    selectionLayoutChanged();
    567567}
    568568
    … …  
    631631void Frame::selectionLayoutChanged()
    632632{
    633     selection()->setNeedsDisplayUpdate(false);
    634 
    635633    bool caretRectChanged = selection()->recomputeCaretRect();
    636634

  • trunk/WebCore/page/FrameView.cpp

    r52494 r52535  
    11991199        || (document && document->childNeedsStyleRecalc()) // can occur when using WebKit ObjC interface
    12001200        || m_frame->needsReapplyStyles()
    1201         || (m_deferSetNeedsLayouts && m_setNeedsLayoutWasDeferred)
    1202         || m_frame->selection()->needsDisplayUpdate();
     1201        || (m_deferSetNeedsLayouts && m_setNeedsLayoutWasDeferred);
    12031202}
    12041203
Note: See TracChangeset for help on using the changeset viewer.