Changeset 66661 in webkit


Ignore:
Timestamp:
Sep 2, 2010 4:45:15 AM (14 years ago)
Author:
andreas.kling@nokia.com
Message:

2010-09-02 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r66655.
http://trac.webkit.org/changeset/66655
https://bugs.webkit.org/show_bug.cgi?id=45104

broke some editing tests (Requested by kling on #webkit).

  • page/DOMSelection.cpp: (WebCore::DOMSelection::collapse): (WebCore::DOMSelection::selectAllChildren):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r66660 r66661  
     12010-09-02  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r66655.
     4        http://trac.webkit.org/changeset/66655
     5        https://bugs.webkit.org/show_bug.cgi?id=45104
     6
     7        broke some editing tests (Requested by kling on #webkit).
     8
     9        * page/DOMSelection.cpp:
     10        (WebCore::DOMSelection::collapse):
     11        (WebCore::DOMSelection::selectAllChildren):
     12
    1132010-09-02  Sheriff Bot  <webkit.review.bot@gmail.com>
    214
  • trunk/WebCore/page/DOMSelection.cpp

    r66655 r66661  
    201201void DOMSelection::collapse(Node* node, int offset, ExceptionCode& ec)
    202202{
    203     Document* selectionDocument = m_frame ? m_frame->document() : 0;
    204     Document* nodeDocument = node ? node->document() : 0;
    205 
    206     if (selectionDocument != nodeDocument) {
    207         ec = WRONG_DOCUMENT_ERR;
    208         return;
    209     }
     203    if (!m_frame)
     204        return;
    210205
    211206    if (offset < 0) {
     
    213208        return;
    214209    }
    215 
    216     if (!m_frame)
    217         return;
    218210
    219211    if (!isValidForPosition(node))
     
    497489        return;
    498490
    499     Document* selectionDocument = m_frame ? m_frame->document() : 0;
    500 
    501     if (selectionDocument != n->document()) {
    502         ec = WRONG_DOCUMENT_ERR;
    503         return;
    504     }
    505 
    506491    // This doesn't (and shouldn't) select text node characters.
    507492    setBaseAndExtent(n, 0, n, n->childNodeCount(), ec);
Note: See TracChangeset for help on using the changeset viewer.