Changeset 94805 in webkit


Ignore:
Timestamp:
Sep 8, 2011 2:52:10 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r94781.
​http://trac.webkit.org/changeset/94781
​https://bugs.webkit.org/show_bug.cgi?id=67806

Broke Objective-C binding on Mac (Requested by rniwa on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-08

Source/WebCore:

  • dom/Element.idl:
  • dom/Node.cpp:

(WebCore::Node::contains):

  • dom/Node.idl:
  • editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::mergeParagraphs):

LayoutTests:

  • fast/dom/Element/contains-method-expected.txt: Added.
  • fast/dom/Element/contains-method.html: Renamed from LayoutTests/fast/dom/Node/contains-method.html.
  • fast/dom/Element/script-tests/contains-method.js: Added.
  • fast/dom/Node/contains-method-expected.txt: Removed.
  • fast/dom/Node/script-tests/contains-method.js: Removed.
  • fast/dom/Window/window-properties-expected.txt:
  • perf/document-contains-expected.txt: Removed.
  • perf/document-contains.html: Removed.
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/mac/fast/dom/Window/window-properties-expected.txt:
  • platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
  • platform/qt/fast/dom/Window/window-properties-expected.txt:
Location:
trunk
Files:
2 added
4 deleted
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r94799 r94805  
     12011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94781.
     4        http://trac.webkit.org/changeset/94781
     5        https://bugs.webkit.org/show_bug.cgi?id=67806
     6
     7        Broke Objective-C binding on Mac (Requested by rniwa on
     8        #webkit).
     9
     10        * fast/dom/Element/contains-method-expected.txt: Added.
     11        * fast/dom/Element/contains-method.html: Renamed from LayoutTests/fast/dom/Node/contains-method.html.
     12        * fast/dom/Element/script-tests/contains-method.js: Added.
     13        * fast/dom/Node/contains-method-expected.txt: Removed.
     14        * fast/dom/Node/script-tests/contains-method.js: Removed.
     15        * fast/dom/Window/window-properties-expected.txt:
     16        * perf/document-contains-expected.txt: Removed.
     17        * perf/document-contains.html: Removed.
     18        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     19        * platform/mac/fast/dom/Window/window-properties-expected.txt:
     20        * platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
     21        * platform/qt/fast/dom/Window/window-properties-expected.txt:
     22
    1232011-09-08  Csaba Osztrogonác  <ossy@webkit.org>
    224

  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r94781 r94805  
    2727window.Attr.prototype.cloneNode [function]
    2828window.Attr.prototype.compareDocumentPosition [function]
    29 window.Attr.prototype.contains [function]
    3029window.Attr.prototype.dispatchEvent [function]
    3130window.Attr.prototype.hasAttributes [function]
    … …  
    181180window.CDATASection.prototype.cloneNode [function]
    182181window.CDATASection.prototype.compareDocumentPosition [function]
    183 window.CDATASection.prototype.contains [function]
    184182window.CDATASection.prototype.deleteData [function]
    185183window.CDATASection.prototype.dispatchEvent [function]
    … …  
    453451window.CharacterData.prototype.cloneNode [function]
    454452window.CharacterData.prototype.compareDocumentPosition [function]
    455 window.CharacterData.prototype.contains [function]
    456453window.CharacterData.prototype.deleteData [function]
    457454window.CharacterData.prototype.dispatchEvent [function]
    … …  
    625622window.Document.prototype.cloneNode [function]
    626623window.Document.prototype.compareDocumentPosition [function]
    627 window.Document.prototype.contains [function]
    628624window.Document.prototype.createAttribute [function]
    629625window.Document.prototype.createAttributeNS [function]
    … …  
    700696window.DocumentFragment.prototype.cloneNode [function]
    701697window.DocumentFragment.prototype.compareDocumentPosition [function]
    702 window.DocumentFragment.prototype.contains [function]
    703698window.DocumentFragment.prototype.dispatchEvent [function]
    704699window.DocumentFragment.prototype.hasAttributes [function]
    … …  
    741736window.DocumentType.prototype.cloneNode [function]
    742737window.DocumentType.prototype.compareDocumentPosition [function]
    743 window.DocumentType.prototype.contains [function]
    744738window.DocumentType.prototype.dispatchEvent [function]
    745739window.DocumentType.prototype.hasAttributes [function]
    … …  
    849843window.Entity.prototype.cloneNode [function]
    850844window.Entity.prototype.compareDocumentPosition [function]
    851 window.Entity.prototype.contains [function]
    852845window.Entity.prototype.dispatchEvent [function]
    853846window.Entity.prototype.hasAttributes [function]
    … …  
    888881window.EntityReference.prototype.cloneNode [function]
    889882window.EntityReference.prototype.compareDocumentPosition [function]
    890 window.EntityReference.prototype.contains [function]
    891883window.EntityReference.prototype.dispatchEvent [function]
    892884window.EntityReference.prototype.hasAttributes [function]
    … …  
    12611253window.Node.prototype.cloneNode [function]
    12621254window.Node.prototype.compareDocumentPosition [function]
    1263 window.Node.prototype.contains [function]
    12641255window.Node.prototype.dispatchEvent [function]
    12651256window.Node.prototype.hasAttributes [function]

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r94781 r94805  
    2727window.Attr.prototype.cloneNode [function]
    2828window.Attr.prototype.compareDocumentPosition [function]
    29 window.Attr.prototype.contains [function]
    3029window.Attr.prototype.dispatchEvent [function]
    3130window.Attr.prototype.hasAttributes [function]
    … …  
    181180window.CDATASection.prototype.cloneNode [function]
    182181window.CDATASection.prototype.compareDocumentPosition [function]
    183 window.CDATASection.prototype.contains [function]
    184182window.CDATASection.prototype.deleteData [function]
    185183window.CDATASection.prototype.dispatchEvent [function]
    … …  
    453451window.CharacterData.prototype.cloneNode [function]
    454452window.CharacterData.prototype.compareDocumentPosition [function]
    455 window.CharacterData.prototype.contains [function]
    456453window.CharacterData.prototype.deleteData [function]
    457454window.CharacterData.prototype.dispatchEvent [function]
    … …  
    678675window.Document.prototype.cloneNode [function]
    679676window.Document.prototype.compareDocumentPosition [function]
    680 window.Document.prototype.contains [function]
    681677window.Document.prototype.createAttribute [function]
    682678window.Document.prototype.createAttributeNS [function]
    … …  
    753749window.DocumentFragment.prototype.cloneNode [function]
    754750window.DocumentFragment.prototype.compareDocumentPosition [function]
    755 window.DocumentFragment.prototype.contains [function]
    756751window.DocumentFragment.prototype.dispatchEvent [function]
    757752window.DocumentFragment.prototype.hasAttributes [function]
    … …  
    794789window.DocumentType.prototype.cloneNode [function]
    795790window.DocumentType.prototype.compareDocumentPosition [function]
    796 window.DocumentType.prototype.contains [function]
    797791window.DocumentType.prototype.dispatchEvent [function]
    798792window.DocumentType.prototype.hasAttributes [function]
    … …  
    902896window.Entity.prototype.cloneNode [function]
    903897window.Entity.prototype.compareDocumentPosition [function]
    904 window.Entity.prototype.contains [function]
    905898window.Entity.prototype.dispatchEvent [function]
    906899window.Entity.prototype.hasAttributes [function]
    … …  
    941934window.EntityReference.prototype.cloneNode [function]
    942935window.EntityReference.prototype.compareDocumentPosition [function]
    943 window.EntityReference.prototype.contains [function]
    944936window.EntityReference.prototype.dispatchEvent [function]
    945937window.EntityReference.prototype.hasAttributes [function]
    … …  
    13421334window.Node.prototype.cloneNode [function]
    13431335window.Node.prototype.compareDocumentPosition [function]
    1344 window.Node.prototype.contains [function]
    13451336window.Node.prototype.dispatchEvent [function]
    13461337window.Node.prototype.hasAttributes [function]

  • trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt

    r94781 r94805  
    2727window.Attr.prototype.cloneNode [function]
    2828window.Attr.prototype.compareDocumentPosition [function]
    29 window.Attr.prototype.contains [function]
    3029window.Attr.prototype.dispatchEvent [function]
    3130window.Attr.prototype.hasAttributes [function]
    … …  
    181180window.CDATASection.prototype.cloneNode [function]
    182181window.CDATASection.prototype.compareDocumentPosition [function]
    183 window.CDATASection.prototype.contains [function]
    184182window.CDATASection.prototype.deleteData [function]
    185183window.CDATASection.prototype.dispatchEvent [function]
    … …  
    453451window.CharacterData.prototype.cloneNode [function]
    454452window.CharacterData.prototype.compareDocumentPosition [function]
    455 window.CharacterData.prototype.contains [function]
    456453window.CharacterData.prototype.deleteData [function]
    457454window.CharacterData.prototype.dispatchEvent [function]
    … …  
    678675window.Document.prototype.cloneNode [function]
    679676window.Document.prototype.compareDocumentPosition [function]
    680 window.Document.prototype.contains [function]
    681677window.Document.prototype.createAttribute [function]
    682678window.Document.prototype.createAttributeNS [function]
    … …  
    753749window.DocumentFragment.prototype.cloneNode [function]
    754750window.DocumentFragment.prototype.compareDocumentPosition [function]
    755 window.DocumentFragment.prototype.contains [function]
    756751window.DocumentFragment.prototype.dispatchEvent [function]
    757752window.DocumentFragment.prototype.hasAttributes [function]
    … …  
    794789window.DocumentType.prototype.cloneNode [function]
    795790window.DocumentType.prototype.compareDocumentPosition [function]
    796 window.DocumentType.prototype.contains [function]
    797791window.DocumentType.prototype.dispatchEvent [function]
    798792window.DocumentType.prototype.hasAttributes [function]
    … …  
    902896window.Entity.prototype.cloneNode [function]
    903897window.Entity.prototype.compareDocumentPosition [function]
    904 window.Entity.prototype.contains [function]
    905898window.Entity.prototype.dispatchEvent [function]
    906899window.Entity.prototype.hasAttributes [function]
    … …  
    941934window.EntityReference.prototype.cloneNode [function]
    942935window.EntityReference.prototype.compareDocumentPosition [function]
    943 window.EntityReference.prototype.contains [function]
    944936window.EntityReference.prototype.dispatchEvent [function]
    945937window.EntityReference.prototype.hasAttributes [function]
    … …  
    13401332window.Node.prototype.cloneNode [function]
    13411333window.Node.prototype.compareDocumentPosition [function]
    1342 window.Node.prototype.contains [function]
    13431334window.Node.prototype.dispatchEvent [function]
    13441335window.Node.prototype.hasAttributes [function]

  • trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt

    r94781 r94805  
    2727window.Attr.prototype.cloneNode [function]
    2828window.Attr.prototype.compareDocumentPosition [function]
    29 window.Attr.prototype.contains [function]
    3029window.Attr.prototype.dispatchEvent [function]
    3130window.Attr.prototype.hasAttributes [function]
    … …  
    179178window.CDATASection.prototype.cloneNode [function]
    180179window.CDATASection.prototype.compareDocumentPosition [function]
    181 window.CDATASection.prototype.contains [function]
    182180window.CDATASection.prototype.deleteData [function]
    183181window.CDATASection.prototype.dispatchEvent [function]
    … …  
    451449window.CharacterData.prototype.cloneNode [function]
    452450window.CharacterData.prototype.compareDocumentPosition [function]
    453 window.CharacterData.prototype.contains [function]
    454451window.CharacterData.prototype.deleteData [function]
    455452window.CharacterData.prototype.dispatchEvent [function]
    … …  
    623620window.Document.prototype.cloneNode [function]
    624621window.Document.prototype.compareDocumentPosition [function]
    625 window.Document.prototype.contains [function]
    626622window.Document.prototype.createAttribute [function]
    627623window.Document.prototype.createAttributeNS [function]
    … …  
    699695window.DocumentFragment.prototype.cloneNode [function]
    700696window.DocumentFragment.prototype.compareDocumentPosition [function]
    701 window.DocumentFragment.prototype.contains [function]
    702697window.DocumentFragment.prototype.dispatchEvent [function]
    703698window.DocumentFragment.prototype.hasAttributes [function]
    … …  
    740735window.DocumentType.prototype.cloneNode [function]
    741736window.DocumentType.prototype.compareDocumentPosition [function]
    742 window.DocumentType.prototype.contains [function]
    743737window.DocumentType.prototype.dispatchEvent [function]
    744738window.DocumentType.prototype.hasAttributes [function]
    … …  
    845839window.Entity.prototype.cloneNode [function]
    846840window.Entity.prototype.compareDocumentPosition [function]
    847 window.Entity.prototype.contains [function]
    848841window.Entity.prototype.dispatchEvent [function]
    849842window.Entity.prototype.hasAttributes [function]
    … …  
    884877window.EntityReference.prototype.cloneNode [function]
    885878window.EntityReference.prototype.compareDocumentPosition [function]
    886 window.EntityReference.prototype.contains [function]
    887879window.EntityReference.prototype.dispatchEvent [function]
    888880window.EntityReference.prototype.hasAttributes [function]
    … …  
    12571249window.Node.prototype.cloneNode [function]
    12581250window.Node.prototype.compareDocumentPosition [function]
    1259 window.Node.prototype.contains [function]
    12601251window.Node.prototype.dispatchEvent [function]
    12611252window.Node.prototype.hasAttributes [function]

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt

    r94781 r94805  
    2727window.Attr.prototype.cloneNode [function]
    2828window.Attr.prototype.compareDocumentPosition [function]
    29 window.Attr.prototype.contains [function]
    3029window.Attr.prototype.dispatchEvent [function]
    3130window.Attr.prototype.hasAttributes [function]
    … …  
    179178window.CDATASection.prototype.cloneNode [function]
    180179window.CDATASection.prototype.compareDocumentPosition [function]
    181 window.CDATASection.prototype.contains [function]
    182180window.CDATASection.prototype.deleteData [function]
    183181window.CDATASection.prototype.dispatchEvent [function]
    … …  
    451449window.CharacterData.prototype.cloneNode [function]
    452450window.CharacterData.prototype.compareDocumentPosition [function]
    453 window.CharacterData.prototype.contains [function]
    454451window.CharacterData.prototype.deleteData [function]
    455452window.CharacterData.prototype.dispatchEvent [function]
    … …  
    676673window.Document.prototype.cloneNode [function]
    677674window.Document.prototype.compareDocumentPosition [function]
    678 window.Document.prototype.contains [function]
    679675window.Document.prototype.createAttribute [function]
    680676window.Document.prototype.createAttributeNS [function]
    … …  
    752748window.DocumentFragment.prototype.cloneNode [function]
    753749window.DocumentFragment.prototype.compareDocumentPosition [function]
    754 window.DocumentFragment.prototype.contains [function]
    755750window.DocumentFragment.prototype.dispatchEvent [function]
    756751window.DocumentFragment.prototype.hasAttributes [function]
    … …  
    793788window.DocumentType.prototype.cloneNode [function]
    794789window.DocumentType.prototype.compareDocumentPosition [function]
    795 window.DocumentType.prototype.contains [function]
    796790window.DocumentType.prototype.dispatchEvent [function]
    797791window.DocumentType.prototype.hasAttributes [function]
    … …  
    898892window.Entity.prototype.cloneNode [function]
    899893window.Entity.prototype.compareDocumentPosition [function]
    900 window.Entity.prototype.contains [function]
    901894window.Entity.prototype.dispatchEvent [function]
    902895window.Entity.prototype.hasAttributes [function]
    … …  
    937930window.EntityReference.prototype.cloneNode [function]
    938931window.EntityReference.prototype.compareDocumentPosition [function]
    939 window.EntityReference.prototype.contains [function]
    940932window.EntityReference.prototype.dispatchEvent [function]
    941933window.EntityReference.prototype.hasAttributes [function]
    … …  
    13361328window.Node.prototype.cloneNode [function]
    13371329window.Node.prototype.compareDocumentPosition [function]
    1338 window.Node.prototype.contains [function]
    13391330window.Node.prototype.dispatchEvent [function]
    13401331window.Node.prototype.hasAttributes [function]

  • trunk/Source/WebCore/ChangeLog

    r94800 r94805  
     12011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94781.
     4        http://trac.webkit.org/changeset/94781
     5        https://bugs.webkit.org/show_bug.cgi?id=67806
     6
     7        Broke Objective-C binding on Mac (Requested by rniwa on
     8        #webkit).
     9
     10        * dom/Element.idl:
     11        * dom/Node.cpp:
     12        (WebCore::Node::contains):
     13        * dom/Node.idl:
     14        * editing/DeleteSelectionCommand.cpp:
     15        (WebCore::DeleteSelectionCommand::mergeParagraphs):
     16
    1172011-09-08  Eric Seidel  <eric@webkit.org>
    218

  • trunk/Source/WebCore/dom/Element.idl

    r94781 r94805  
    8585        void blur();
    8686        void scrollIntoView(in [Optional] boolean alignWithTop);
     87
     88        // IE extensions
     89
     90        boolean contains(in [Optional=CallWithDefaultValue] Element element);
    8791
    8892        // WebKit extensions

  • trunk/Source/WebCore/dom/Node.cpp

    r94781 r94805  
    13391339    if (!node)
    13401340        return false;
    1341     if (document() == this)
    1342         return node->document() == this && node->inDocument();
    13431341    return this == node || node->isDescendantOf(this);
    13441342}

  • trunk/Source/WebCore/dom/Node.idl

    r94781 r94805  
    119119        unsigned short     compareDocumentPosition(in [Optional=CallWithDefaultValue] Node other);
    120120
    121         // Introduced in DOM4
    122         boolean contains(in [Optional=CallWithDefaultValue] Node other);
    123 
    124121#if 0
    125122        DOMObject          getFeature(in DOMString feature,

  • trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

    r94781 r94805  
    606606    // move, so just remove it.
    607607    Element* endBlock = static_cast<Element*>(enclosingBlock(m_downstreamEnd.deprecatedNode()));
    608     if (!endBlock || !endBlock->contains(startOfParagraphToMove.deepEquivalent().deprecatedNode()) || !startOfParagraphToMove.deepEquivalent().deprecatedNode()) {
     608    if (!startOfParagraphToMove.deepEquivalent().deprecatedNode() || !endBlock->contains(startOfParagraphToMove.deepEquivalent().deprecatedNode())) {
    609609        removeNode(enclosingBlock(m_downstreamEnd.deprecatedNode()));
    610610        return;
Note: See TracChangeset for help on using the changeset viewer.