Changeset 140710 in webkit


Ignore:
Timestamp:
Jan 24, 2013 12:42:52 PM (11 years ago)
Author:
tony@chromium.org
Message:

Remove document as a parameter from a few internals methods
https://bugs.webkit.org/show_bug.cgi?id=107757

Reviewed by Hajime Morita.

Remove document as a parameter since there's already one associated with internals.

Source/WebCore:

No new tests, this refactors some testing code and is covered by
exisiting tests.

  • testing/Internals.cpp:

(WebCore::Internals::isPreloaded):
(WebCore::Internals::createContentElement):
(WebCore::Internals::absoluteCaretBounds):

  • testing/Internals.h:

(Internals):

  • testing/Internals.idl:

LayoutTests:

  • editing/input/editable-container-with-word-wrap-normal.html:
  • editing/selection/caret-alignment-for-vertical-text.html:
  • editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html:
  • editing/selection/caret-in-div-containing-br-in-vertical-mode.html:
  • editing/selection/caret-in-empty-inline-1.html:
  • editing/selection/caret-in-empty-inline-2.html:
  • editing/selection/internal-caret-rect.html:
  • fast/dom/resources/shadow-test-driver.js:

(createContentWithSelect):
(createContentWithText):
(appendShadow):
(appendShadowDeep):

  • fast/dom/shadow/content-element-includer.html:
  • fast/dom/shadow/content-element-renderers.html:
  • fast/dom/shadow/content-selector-query.html:
  • fast/dom/shadow/create-content-element.html:
  • fast/dom/shadow/shadow-contents-fallback-dynamic.html:
  • fast/dom/shadow/shadow-contents-fallback.html:
  • fast/dom/shadow/shadow-contents-select.html:
  • fast/preloader/scan-body-from-head-import.html:
  • http/tests/loading/preload-append-scan.php:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r140709 r140710  
     12013-01-24  Tony Chang  <tony@chromium.org>
     2
     3        Remove document as a parameter from a few internals methods
     4        https://bugs.webkit.org/show_bug.cgi?id=107757
     5
     6        Reviewed by Hajime Morita.
     7
     8        Remove document as a parameter since there's already one associated with internals.
     9
     10        * editing/input/editable-container-with-word-wrap-normal.html:
     11        * editing/selection/caret-alignment-for-vertical-text.html:
     12        * editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html:
     13        * editing/selection/caret-in-div-containing-br-in-vertical-mode.html:
     14        * editing/selection/caret-in-empty-inline-1.html:
     15        * editing/selection/caret-in-empty-inline-2.html:
     16        * editing/selection/internal-caret-rect.html:
     17        * fast/dom/resources/shadow-test-driver.js:
     18        (createContentWithSelect):
     19        (createContentWithText):
     20        (appendShadow):
     21        (appendShadowDeep):
     22        * fast/dom/shadow/content-element-includer.html:
     23        * fast/dom/shadow/content-element-renderers.html:
     24        * fast/dom/shadow/content-selector-query.html:
     25        * fast/dom/shadow/create-content-element.html:
     26        * fast/dom/shadow/shadow-contents-fallback-dynamic.html:
     27        * fast/dom/shadow/shadow-contents-fallback.html:
     28        * fast/dom/shadow/shadow-contents-select.html:
     29        * fast/preloader/scan-body-from-head-import.html:
     30        * http/tests/loading/preload-append-scan.php:
     31
    1322013-01-24  Mike West  <mkwst@chromium.org>
    233
  • trunk/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html

    r124806 r140710  
    2525    editableContainer.focus();
    2626    if (window.internals)
    27         startCaretRect = internals.absoluteCaretBounds(document);
     27        startCaretRect = internals.absoluteCaretBounds();
    2828
    2929    window.getSelection().setPosition(editableContainer,0);
     
    3333    finalCaretRect = {right:-1,left:-1};
    3434    if (window.internals)
    35         finalCaretRect = internals.absoluteCaretBounds(document);
     35        finalCaretRect = internals.absoluteCaretBounds();
    3636
    3737    caretWidth = finalCaretRect.right - finalCaretRect.left;
  • trunk/LayoutTests/editing/selection/caret-alignment-for-vertical-text.html

    r136225 r140710  
    1919    document.getElementById('emptyDiv').focus();
    2020    if (window.internals)
    21         emptyDivCaretRect = internals.absoluteCaretBounds(document);
     21        emptyDivCaretRect = internals.absoluteCaretBounds();
    2222       
    2323    /* Caret rect for am empty line. */
    2424    document.getElementById('emptyLineDiv').focus();
    2525    if (window.internals)
    26         emptyLineCaretRect = internals.absoluteCaretBounds(document);
     26        emptyLineCaretRect = internals.absoluteCaretBounds();
    2727       
    2828    /* Caret rect for the container with some text. */
    2929    document.getElementById('textDiv').focus();
    3030    if (window.internals)
    31         textDivCaretRect = internals.absoluteCaretBounds(document);
     31        textDivCaretRect = internals.absoluteCaretBounds();
    3232       
    3333    debug("The carets on the empty editable boxes should have the same orientation as that on the editable box containing some text. We thus compare the width and the height of the caret rects for verification. Width and height for all the three caret rects should be the same for the test to pass.")
  • trunk/LayoutTests/editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html

    r138169 r140710  
    2424    eventSender.mouseDown();
    2525    eventSender.mouseUp();
    26     caretRectAtStart = internals.absoluteCaretBounds(document);
     26    caretRectAtStart = internals.absoluteCaretBounds();
    2727   
    2828    eventSender.mouseMoveTo(testDiv.offsetLeft + testDiv.offsetWidth - 5, testDiv.offsetTop + testDiv.offsetHeight - 5);
    2929    eventSender.mouseDown();
    3030    eventSender.mouseUp();
    31     caretRectAtEnd = internals.absoluteCaretBounds(document);
     31    caretRectAtEnd = internals.absoluteCaretBounds();
    3232   
    3333    shouldBe("caretRectAtEnd.left", "caretRectAtStart.left");
  • trunk/LayoutTests/editing/selection/caret-in-div-containing-br-in-vertical-mode.html

    r139166 r140710  
    1717    document.getElementById('textDiv').focus();
    1818    if (window.internals)
    19         withTextCaretRect = internals.absoluteCaretBounds(document);
     19        withTextCaretRect = internals.absoluteCaretBounds();
    2020
    2121    document.getElementById('noTextDiv').focus();
    2222    if (window.internals)
    23         withoutTextCaretRect = internals.absoluteCaretBounds(document);
     23        withoutTextCaretRect = internals.absoluteCaretBounds();
    2424
    2525    if (window.internals) {
  • trunk/LayoutTests/editing/selection/caret-in-empty-inline-1.html

    r119884 r140710  
    1919    getSelection().collapse(testInline, 0);
    2020    if (window.internals) {
    21         var caretRect = internals.absoluteCaretBounds(document);
     21        var caretRect = internals.absoluteCaretBounds();
    2222        shouldBe("caretRect.left", "8");
    2323        shouldBe("caretRect.top", "160");
  • trunk/LayoutTests/editing/selection/caret-in-empty-inline-2.html

    r119884 r140710  
    2020    getSelection().collapse(testInline, 0);
    2121    if (window.internals) {
    22         var caretRect = internals.absoluteCaretBounds(document);
     22        var caretRect = internals.absoluteCaretBounds();
    2323        shouldBe("caretRect.left", "268");
    2424        shouldBe("caretRect.top", "180");
  • trunk/LayoutTests/editing/selection/internal-caret-rect.html

    r117610 r140710  
    2121        if (window.internals) {
    2222            var index = caretRects.length;
    23             caretRects.push(internals.absoluteCaretBounds(document));
     23            caretRects.push(internals.absoluteCaretBounds());
    2424            shouldBe("caretRects[" + index + "].left", left.toString());
    2525            shouldBe("caretRects[" + index + "].top", top.toString());
  • trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js

    r120792 r140710  
    7373
    7474function createContentWithSelect(select, fallbackText) {
    75     var content = internals.createContentElement(document);
     75    var content = internals.createContentElement();
    7676    content.setAttribute('select', select);
    7777    if (fallbackText)
     
    8282
    8383function createContentWithText(fallbackText) {
    84     var content = internals.createContentElement(document);
     84    var content = internals.createContentElement();
    8585    if (fallbackText)
    8686        content.innerHTML = fallbackText;
     
    9292    var root = internals.ensureShadowRoot(target);
    9393
    94     var content = internals.createContentElement(document);
     94    var content = internals.createContentElement();
    9595    content.setAttribute('select', select);
    9696    content.appendChild(createSpanWithText("FALLBACK"));
     
    106106    var child = document.createElement("span");
    107107    {
    108         var content = internals.createContentElement(document);
     108        var content = internals.createContentElement();
    109109        content.setAttribute('select', select);
    110110        content.appendChild(createSpanWithText("FALLBACK"));
  • trunk/LayoutTests/fast/dom/shadow/content-element-includer.html

    r105249 r140710  
    3434container.appendChild(elementWithShadowContent);
    3535var shadowRootOfElementWithShadowContent = internals.ensureShadowRoot(elementWithShadowContent);
    36 var shadowContentOfElementWithShadowContent = internals.createContentElement(document);
     36var shadowContentOfElementWithShadowContent = internals.createContentElement();
    3737shadowRootOfElementWithShadowContent.appendChild(shadowContentOfElementWithShadowContent);
    3838var childOfElementWithShadowContent = document.createElement("span");
     
    5959container.appendChild(anotherElementWithShadowContent);
    6060var anotherShadowRootOfElementWithShadowContent = internals.ensureShadowRoot(anotherElementWithShadowContent);
    61 var anotherShadowContentOfElementWithShadowContent = internals.createContentElement(document);
     61var anotherShadowContentOfElementWithShadowContent = internals.createContentElement();
    6262anotherShadowRootOfElementWithShadowContent.appendChild(anotherShadowContentOfElementWithShadowContent);
    6363
  • trunk/LayoutTests/fast/dom/shadow/content-element-renderers.html

    r120792 r140710  
    6363    if (contentPlaceholder) {
    6464        var contentParent = contentPlaceholder.parentNode;
    65         contentParent.replaceChild(window.internals.createContentElement(document), contentPlaceholder);
     65        contentParent.replaceChild(window.internals.createContentElement(), contentPlaceholder);
    6666    };
    6767
  • trunk/LayoutTests/fast/dom/shadow/content-selector-query.html

    r120792 r140710  
    1414var content;
    1515function test(select, valid) {
    16     content = internals.createContentElement(document);
     16    content = internals.createContentElement();
    1717    if (select != null)
    1818        content.setAttribute('select', select);
  • trunk/LayoutTests/fast/dom/shadow/create-content-element.html

    r120792 r140710  
    3030    child0.innerHTML = "Hello,";
    3131    root.appendChild(child0);
    32     root.appendChild(window.internals.createContentElement(document));
     32    root.appendChild(window.internals.createContentElement());
    3333    var child1 = document.createElement("span");
    3434    child1.innerHTML = "World.";
  • trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback-dynamic.html

    r120792 r140710  
    6262    var root = internals.ensureShadowRoot(target);
    6363
    64     var content = internals.createContentElement(document);
     64    var content = internals.createContentElement();
    6565    content.setAttribute('select', select);
    6666    content.appendChild(createSpanWithText("FALLBACK"));
     
    7676    var child = document.createElement("span");
    7777    {
    78         var content = internals.createContentElement(document);
     78        var content = internals.createContentElement();
    7979        content.setAttribute('select', select);
    8080        content.appendChild(createSpanWithText("FALLBACK"));
     
    350350
    351351    var root = internals.ensureShadowRoot(target);
    352     var content1 = internals.createContentElement(document);
     352    var content1 = internals.createContentElement();
    353353    content1.setAttribute('select', 'div');
    354354
     
    361361    var f = (function(target, content1, callIfDone) {
    362362        return function() {
    363             var content2 = internals.createContentElement(document);
     363            var content2 = internals.createContentElement();
    364364            content2.setAttribute('select', 'span');
    365365            content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
     
    381381
    382382    var root = internals.ensureShadowRoot(target);
    383     var content1 = internals.createContentElement(document);
     383    var content1 = internals.createContentElement();
    384384    content1.setAttribute('select', 'div');
    385385
     
    392392    var f = (function(target, content1, callIfDone) {
    393393        return function() {
    394             var content2 = internals.createContentElement(document);
     394            var content2 = internals.createContentElement();
    395395            content2.setAttribute('select', 'div');
    396396            content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
     
    412412
    413413    var root = internals.ensureShadowRoot(target);
    414     var content1 = internals.createContentElement(document);
     414    var content1 = internals.createContentElement();
    415415    content1.setAttribute('select', 'div');
    416416    root.appendChild(content1);
     
    420420    var f = (function(target, content1, callIfDone) {
    421421        return function() {
    422             var content2 = internals.createContentElement(document);
     422            var content2 = internals.createContentElement();
    423423            content2.setAttribute('select', 'div');
    424424            content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
  • trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback.html

    r120792 r140710  
    6363    var root = internals.ensureShadowRoot(target);
    6464
    65     var content = internals.createContentElement(document);
     65    var content = internals.createContentElement();
    6666    content.setAttribute('select', select);
    6767    content.appendChild(createSpanWithText("FALLBACK"));
     
    7777    var child = document.createElement("span");
    7878    {
    79         var content = internals.createContentElement(document);
     79        var content = internals.createContentElement();
    8080        content.setAttribute('select', select);
    8181        content.appendChild(createSpanWithText("FALLBACK"));
     
    232232
    233233    var root = internals.ensureShadowRoot(target);
    234     var content = internals.createContentElement(document);
     234    var content = internals.createContentElement();
    235235    content.setAttribute('select', 'span');
    236236    content.appendChild(createSpanWithText('FALLBACK'));
     
    254254
    255255    var root = internals.ensureShadowRoot(target);
    256     var content2 = internals.createContentElement(document);
     256    var content2 = internals.createContentElement();
    257257    content2.setAttribute('select', 'span');
    258258    content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
    259259
    260     var content1 = internals.createContentElement(document);
     260    var content1 = internals.createContentElement();
    261261    content1.setAttribute('select', 'div');
    262262    content1.appendChild(content2);
     
    277277
    278278    var root = internals.ensureShadowRoot(target);
    279     var content2 = internals.createContentElement(document);
     279    var content2 = internals.createContentElement();
    280280    content2.setAttribute('select', 'div');
    281281    content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
    282282
    283     var content1 = internals.createContentElement(document);
     283    var content1 = internals.createContentElement();
    284284    content1.setAttribute('select', 'div');
    285285    content1.appendChild(content2);
     
    300300
    301301    var root = internals.ensureShadowRoot(target);
    302     var content2 = internals.createContentElement(document);
     302    var content2 = internals.createContentElement();
    303303    content2.setAttribute('select', 'div');
    304304    content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
    305305
    306     var content1 = internals.createContentElement(document);
     306    var content1 = internals.createContentElement();
    307307    content1.setAttribute('select', 'div');
    308308    content1.appendChild(content2);
     
    326326
    327327    var root = internals.ensureShadowRoot(target);
    328     var content2 = internals.createContentElement(document);
     328    var content2 = internals.createContentElement();
    329329    content2.setAttribute('select', 'div');
    330330    content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
    331331
    332     var content1 = internals.createContentElement(document);
     332    var content1 = internals.createContentElement();
    333333    content1.setAttribute('select', 'div');
    334334    content1.appendChild(content2);
  • trunk/LayoutTests/fast/dom/shadow/shadow-contents-select.html

    r105249 r140710  
    1616    root.appendChild(child0);
    1717
    18     var content = internals.createContentElement(document);
     18    var content = internals.createContentElement();
    1919    content.setAttribute('select', select);
    2020    root.appendChild(content);
  • trunk/LayoutTests/fast/preloader/scan-body-from-head-import.html

    r124410 r140710  
    77function checkForPreload() {
    88    var result;
    9     if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/style1.css"))
     9    if (internals.isPreloaded("resources/image1.png") && internals.isPreloaded("resources/style1.css"))
    1010        result = "PASS";
    1111    else
  • trunk/LayoutTests/fast/preloader/scan-body-from-head-script.html

    r124410 r140710  
    77function checkForPreload() {
    88    var result;
    9     if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/script1.js"))
     9    if (internals.isPreloaded("resources/image1.png") && internals.isPreloaded("resources/script1.js"))
    1010        result = "PASS";
    1111    else
  • trunk/LayoutTests/http/tests/loading/preload-append-scan.php

    r120167 r140710  
    1313function checkForPreload() {
    1414    var result;
    15     if (internals.isPreloaded(document, "resources/preload-test.jpg"))
     15    if (internals.isPreloaded("resources/preload-test.jpg"))
    1616        result = "PASS";
    1717    else
  • trunk/Source/WebCore/ChangeLog

    r140709 r140710  
     12013-01-24  Tony Chang  <tony@chromium.org>
     2
     3        Remove document as a parameter from a few internals methods
     4        https://bugs.webkit.org/show_bug.cgi?id=107757
     5
     6        Reviewed by Hajime Morita.
     7
     8        Remove document as a parameter since there's already one associated with internals.
     9
     10        No new tests, this refactors some testing code and is covered by
     11        exisiting tests.
     12
     13        * testing/Internals.cpp:
     14        (WebCore::Internals::isPreloaded):
     15        (WebCore::Internals::createContentElement):
     16        (WebCore::Internals::absoluteCaretBounds):
     17        * testing/Internals.h:
     18        (Internals):
     19        * testing/Internals.idl:
     20
    1212013-01-24  Mike West  <mkwst@chromium.org>
    222
  • trunk/Source/WebCore/testing/Internals.cpp

    r140215 r140710  
    286286}
    287287
    288 bool Internals::isPreloaded(Document* document, const String& url)
    289 {
    290     if (!document)
    291         return false;
    292 
     288bool Internals::isPreloaded(const String& url)
     289{
     290    Document* document = contextDocument();
    293291    return document->cachedResourceLoader()->isPreloaded(url);
    294292}
    295293
    296 PassRefPtr<Element> Internals::createContentElement(Document* document, ExceptionCode& ec)
    297 {
     294PassRefPtr<Element> Internals::createContentElement(ExceptionCode& ec)
     295{
     296    Document* document = contextDocument();
    298297    if (!document) {
    299298        ec = INVALID_ACCESS_ERR;
     
    764763#endif
    765764
    766 PassRefPtr<ClientRect> Internals::absoluteCaretBounds(Document* document, ExceptionCode& ec)
    767 {
     765PassRefPtr<ClientRect> Internals::absoluteCaretBounds(ExceptionCode& ec)
     766{
     767    Document* document = contextDocument();
    768768    if (!document || !document->frame() || !document->frame()->selection()) {
    769769        ec = INVALID_ACCESS_ERR;
  • trunk/Source/WebCore/testing/Internals.h

    r140105 r140710  
    7272    String address(Node*);
    7373
    74     bool isPreloaded(Document*, const String& url);
     74    bool isPreloaded(const String& url);
    7575
    7676    size_t numberOfScopedHTMLStyleChildren(const Node*, ExceptionCode&) const;
     
    9999    bool pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
    100100
    101     PassRefPtr<Element> createContentElement(Document*, ExceptionCode&);
     101    PassRefPtr<Element> createContentElement(ExceptionCode&);
    102102    bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);
    103103    Node* treeScopeRootNode(Node*, ExceptionCode&);
     
    128128#endif
    129129
    130     PassRefPtr<ClientRect> absoluteCaretBounds(Document*, ExceptionCode&);
     130    PassRefPtr<ClientRect> absoluteCaretBounds(ExceptionCode&);
    131131
    132132    PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&);
  • trunk/Source/WebCore/testing/Internals.idl

    r140105 r140710  
    3030
    3131    DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
    32     boolean isPreloaded(in Document document, in DOMString url);
     32    boolean isPreloaded(in DOMString url);
    3333
    3434    unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException);
     
    5757    DOMString shadowPseudoId(in Element element) raises (DOMException);
    5858    void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException);
    59     Element createContentElement(in Document document) raises(DOMException);
     59    Element createContentElement() raises(DOMException);
    6060    boolean isValidContentSelect(in Element contentElement) raises(DOMException);
    6161    Node treeScopeRootNode(in Node node) raises (DOMException);
     
    8888#endif
    8989
    90     ClientRect absoluteCaretBounds(in Document document) raises(DOMException);
     90    ClientRect absoluteCaretBounds() raises(DOMException);
    9191
    9292    ClientRect boundingBox(in Element element) raises(DOMException);
Note: See TracChangeset for help on using the changeset viewer.