Changeset 140710 in webkit
- Timestamp:
- Jan 24, 2013 12:42:52 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r140709 r140710 1 2013-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 1 32 2013-01-24 Mike West <mkwst@chromium.org> 2 33 -
trunk/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html
r124806 r140710 25 25 editableContainer.focus(); 26 26 if (window.internals) 27 startCaretRect = internals.absoluteCaretBounds( document);27 startCaretRect = internals.absoluteCaretBounds(); 28 28 29 29 window.getSelection().setPosition(editableContainer,0); … … 33 33 finalCaretRect = {right:-1,left:-1}; 34 34 if (window.internals) 35 finalCaretRect = internals.absoluteCaretBounds( document);35 finalCaretRect = internals.absoluteCaretBounds(); 36 36 37 37 caretWidth = finalCaretRect.right - finalCaretRect.left; -
trunk/LayoutTests/editing/selection/caret-alignment-for-vertical-text.html
r136225 r140710 19 19 document.getElementById('emptyDiv').focus(); 20 20 if (window.internals) 21 emptyDivCaretRect = internals.absoluteCaretBounds( document);21 emptyDivCaretRect = internals.absoluteCaretBounds(); 22 22 23 23 /* Caret rect for am empty line. */ 24 24 document.getElementById('emptyLineDiv').focus(); 25 25 if (window.internals) 26 emptyLineCaretRect = internals.absoluteCaretBounds( document);26 emptyLineCaretRect = internals.absoluteCaretBounds(); 27 27 28 28 /* Caret rect for the container with some text. */ 29 29 document.getElementById('textDiv').focus(); 30 30 if (window.internals) 31 textDivCaretRect = internals.absoluteCaretBounds( document);31 textDivCaretRect = internals.absoluteCaretBounds(); 32 32 33 33 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 24 24 eventSender.mouseDown(); 25 25 eventSender.mouseUp(); 26 caretRectAtStart = internals.absoluteCaretBounds( document);26 caretRectAtStart = internals.absoluteCaretBounds(); 27 27 28 28 eventSender.mouseMoveTo(testDiv.offsetLeft + testDiv.offsetWidth - 5, testDiv.offsetTop + testDiv.offsetHeight - 5); 29 29 eventSender.mouseDown(); 30 30 eventSender.mouseUp(); 31 caretRectAtEnd = internals.absoluteCaretBounds( document);31 caretRectAtEnd = internals.absoluteCaretBounds(); 32 32 33 33 shouldBe("caretRectAtEnd.left", "caretRectAtStart.left"); -
trunk/LayoutTests/editing/selection/caret-in-div-containing-br-in-vertical-mode.html
r139166 r140710 17 17 document.getElementById('textDiv').focus(); 18 18 if (window.internals) 19 withTextCaretRect = internals.absoluteCaretBounds( document);19 withTextCaretRect = internals.absoluteCaretBounds(); 20 20 21 21 document.getElementById('noTextDiv').focus(); 22 22 if (window.internals) 23 withoutTextCaretRect = internals.absoluteCaretBounds( document);23 withoutTextCaretRect = internals.absoluteCaretBounds(); 24 24 25 25 if (window.internals) { -
trunk/LayoutTests/editing/selection/caret-in-empty-inline-1.html
r119884 r140710 19 19 getSelection().collapse(testInline, 0); 20 20 if (window.internals) { 21 var caretRect = internals.absoluteCaretBounds( document);21 var caretRect = internals.absoluteCaretBounds(); 22 22 shouldBe("caretRect.left", "8"); 23 23 shouldBe("caretRect.top", "160"); -
trunk/LayoutTests/editing/selection/caret-in-empty-inline-2.html
r119884 r140710 20 20 getSelection().collapse(testInline, 0); 21 21 if (window.internals) { 22 var caretRect = internals.absoluteCaretBounds( document);22 var caretRect = internals.absoluteCaretBounds(); 23 23 shouldBe("caretRect.left", "268"); 24 24 shouldBe("caretRect.top", "180"); -
trunk/LayoutTests/editing/selection/internal-caret-rect.html
r117610 r140710 21 21 if (window.internals) { 22 22 var index = caretRects.length; 23 caretRects.push(internals.absoluteCaretBounds( document));23 caretRects.push(internals.absoluteCaretBounds()); 24 24 shouldBe("caretRects[" + index + "].left", left.toString()); 25 25 shouldBe("caretRects[" + index + "].top", top.toString()); -
trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js
r120792 r140710 73 73 74 74 function createContentWithSelect(select, fallbackText) { 75 var content = internals.createContentElement( document);75 var content = internals.createContentElement(); 76 76 content.setAttribute('select', select); 77 77 if (fallbackText) … … 82 82 83 83 function createContentWithText(fallbackText) { 84 var content = internals.createContentElement( document);84 var content = internals.createContentElement(); 85 85 if (fallbackText) 86 86 content.innerHTML = fallbackText; … … 92 92 var root = internals.ensureShadowRoot(target); 93 93 94 var content = internals.createContentElement( document);94 var content = internals.createContentElement(); 95 95 content.setAttribute('select', select); 96 96 content.appendChild(createSpanWithText("FALLBACK")); … … 106 106 var child = document.createElement("span"); 107 107 { 108 var content = internals.createContentElement( document);108 var content = internals.createContentElement(); 109 109 content.setAttribute('select', select); 110 110 content.appendChild(createSpanWithText("FALLBACK")); -
trunk/LayoutTests/fast/dom/shadow/content-element-includer.html
r105249 r140710 34 34 container.appendChild(elementWithShadowContent); 35 35 var shadowRootOfElementWithShadowContent = internals.ensureShadowRoot(elementWithShadowContent); 36 var shadowContentOfElementWithShadowContent = internals.createContentElement( document);36 var shadowContentOfElementWithShadowContent = internals.createContentElement(); 37 37 shadowRootOfElementWithShadowContent.appendChild(shadowContentOfElementWithShadowContent); 38 38 var childOfElementWithShadowContent = document.createElement("span"); … … 59 59 container.appendChild(anotherElementWithShadowContent); 60 60 var anotherShadowRootOfElementWithShadowContent = internals.ensureShadowRoot(anotherElementWithShadowContent); 61 var anotherShadowContentOfElementWithShadowContent = internals.createContentElement( document);61 var anotherShadowContentOfElementWithShadowContent = internals.createContentElement(); 62 62 anotherShadowRootOfElementWithShadowContent.appendChild(anotherShadowContentOfElementWithShadowContent); 63 63 -
trunk/LayoutTests/fast/dom/shadow/content-element-renderers.html
r120792 r140710 63 63 if (contentPlaceholder) { 64 64 var contentParent = contentPlaceholder.parentNode; 65 contentParent.replaceChild(window.internals.createContentElement( document), contentPlaceholder);65 contentParent.replaceChild(window.internals.createContentElement(), contentPlaceholder); 66 66 }; 67 67 -
trunk/LayoutTests/fast/dom/shadow/content-selector-query.html
r120792 r140710 14 14 var content; 15 15 function test(select, valid) { 16 content = internals.createContentElement( document);16 content = internals.createContentElement(); 17 17 if (select != null) 18 18 content.setAttribute('select', select); -
trunk/LayoutTests/fast/dom/shadow/create-content-element.html
r120792 r140710 30 30 child0.innerHTML = "Hello,"; 31 31 root.appendChild(child0); 32 root.appendChild(window.internals.createContentElement( document));32 root.appendChild(window.internals.createContentElement()); 33 33 var child1 = document.createElement("span"); 34 34 child1.innerHTML = "World."; -
trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback-dynamic.html
r120792 r140710 62 62 var root = internals.ensureShadowRoot(target); 63 63 64 var content = internals.createContentElement( document);64 var content = internals.createContentElement(); 65 65 content.setAttribute('select', select); 66 66 content.appendChild(createSpanWithText("FALLBACK")); … … 76 76 var child = document.createElement("span"); 77 77 { 78 var content = internals.createContentElement( document);78 var content = internals.createContentElement(); 79 79 content.setAttribute('select', select); 80 80 content.appendChild(createSpanWithText("FALLBACK")); … … 350 350 351 351 var root = internals.ensureShadowRoot(target); 352 var content1 = internals.createContentElement( document);352 var content1 = internals.createContentElement(); 353 353 content1.setAttribute('select', 'div'); 354 354 … … 361 361 var f = (function(target, content1, callIfDone) { 362 362 return function() { 363 var content2 = internals.createContentElement( document);363 var content2 = internals.createContentElement(); 364 364 content2.setAttribute('select', 'span'); 365 365 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); … … 381 381 382 382 var root = internals.ensureShadowRoot(target); 383 var content1 = internals.createContentElement( document);383 var content1 = internals.createContentElement(); 384 384 content1.setAttribute('select', 'div'); 385 385 … … 392 392 var f = (function(target, content1, callIfDone) { 393 393 return function() { 394 var content2 = internals.createContentElement( document);394 var content2 = internals.createContentElement(); 395 395 content2.setAttribute('select', 'div'); 396 396 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); … … 412 412 413 413 var root = internals.ensureShadowRoot(target); 414 var content1 = internals.createContentElement( document);414 var content1 = internals.createContentElement(); 415 415 content1.setAttribute('select', 'div'); 416 416 root.appendChild(content1); … … 420 420 var f = (function(target, content1, callIfDone) { 421 421 return function() { 422 var content2 = internals.createContentElement( document);422 var content2 = internals.createContentElement(); 423 423 content2.setAttribute('select', 'div'); 424 424 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); -
trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback.html
r120792 r140710 63 63 var root = internals.ensureShadowRoot(target); 64 64 65 var content = internals.createContentElement( document);65 var content = internals.createContentElement(); 66 66 content.setAttribute('select', select); 67 67 content.appendChild(createSpanWithText("FALLBACK")); … … 77 77 var child = document.createElement("span"); 78 78 { 79 var content = internals.createContentElement( document);79 var content = internals.createContentElement(); 80 80 content.setAttribute('select', select); 81 81 content.appendChild(createSpanWithText("FALLBACK")); … … 232 232 233 233 var root = internals.ensureShadowRoot(target); 234 var content = internals.createContentElement( document);234 var content = internals.createContentElement(); 235 235 content.setAttribute('select', 'span'); 236 236 content.appendChild(createSpanWithText('FALLBACK')); … … 254 254 255 255 var root = internals.ensureShadowRoot(target); 256 var content2 = internals.createContentElement( document);256 var content2 = internals.createContentElement(); 257 257 content2.setAttribute('select', 'span'); 258 258 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); 259 259 260 var content1 = internals.createContentElement( document);260 var content1 = internals.createContentElement(); 261 261 content1.setAttribute('select', 'div'); 262 262 content1.appendChild(content2); … … 277 277 278 278 var root = internals.ensureShadowRoot(target); 279 var content2 = internals.createContentElement( document);279 var content2 = internals.createContentElement(); 280 280 content2.setAttribute('select', 'div'); 281 281 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); 282 282 283 var content1 = internals.createContentElement( document);283 var content1 = internals.createContentElement(); 284 284 content1.setAttribute('select', 'div'); 285 285 content1.appendChild(content2); … … 300 300 301 301 var root = internals.ensureShadowRoot(target); 302 var content2 = internals.createContentElement( document);302 var content2 = internals.createContentElement(); 303 303 content2.setAttribute('select', 'div'); 304 304 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); 305 305 306 var content1 = internals.createContentElement( document);306 var content1 = internals.createContentElement(); 307 307 content1.setAttribute('select', 'div'); 308 308 content1.appendChild(content2); … … 326 326 327 327 var root = internals.ensureShadowRoot(target); 328 var content2 = internals.createContentElement( document);328 var content2 = internals.createContentElement(); 329 329 content2.setAttribute('select', 'div'); 330 330 content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK')); 331 331 332 var content1 = internals.createContentElement( document);332 var content1 = internals.createContentElement(); 333 333 content1.setAttribute('select', 'div'); 334 334 content1.appendChild(content2); -
trunk/LayoutTests/fast/dom/shadow/shadow-contents-select.html
r105249 r140710 16 16 root.appendChild(child0); 17 17 18 var content = internals.createContentElement( document);18 var content = internals.createContentElement(); 19 19 content.setAttribute('select', select); 20 20 root.appendChild(content); -
trunk/LayoutTests/fast/preloader/scan-body-from-head-import.html
r124410 r140710 7 7 function checkForPreload() { 8 8 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")) 10 10 result = "PASS"; 11 11 else -
trunk/LayoutTests/fast/preloader/scan-body-from-head-script.html
r124410 r140710 7 7 function checkForPreload() { 8 8 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")) 10 10 result = "PASS"; 11 11 else -
trunk/LayoutTests/http/tests/loading/preload-append-scan.php
r120167 r140710 13 13 function checkForPreload() { 14 14 var result; 15 if (internals.isPreloaded( document,"resources/preload-test.jpg"))15 if (internals.isPreloaded("resources/preload-test.jpg")) 16 16 result = "PASS"; 17 17 else -
trunk/Source/WebCore/ChangeLog
r140709 r140710 1 2013-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 1 21 2013-01-24 Mike West <mkwst@chromium.org> 2 22 -
trunk/Source/WebCore/testing/Internals.cpp
r140215 r140710 286 286 } 287 287 288 bool Internals::isPreloaded(Document* document, const String& url) 289 { 290 if (!document) 291 return false; 292 288 bool Internals::isPreloaded(const String& url) 289 { 290 Document* document = contextDocument(); 293 291 return document->cachedResourceLoader()->isPreloaded(url); 294 292 } 295 293 296 PassRefPtr<Element> Internals::createContentElement(Document* document, ExceptionCode& ec) 297 { 294 PassRefPtr<Element> Internals::createContentElement(ExceptionCode& ec) 295 { 296 Document* document = contextDocument(); 298 297 if (!document) { 299 298 ec = INVALID_ACCESS_ERR; … … 764 763 #endif 765 764 766 PassRefPtr<ClientRect> Internals::absoluteCaretBounds(Document* document, ExceptionCode& ec) 767 { 765 PassRefPtr<ClientRect> Internals::absoluteCaretBounds(ExceptionCode& ec) 766 { 767 Document* document = contextDocument(); 768 768 if (!document || !document->frame() || !document->frame()->selection()) { 769 769 ec = INVALID_ACCESS_ERR; -
trunk/Source/WebCore/testing/Internals.h
r140105 r140710 72 72 String address(Node*); 73 73 74 bool isPreloaded( Document*,const String& url);74 bool isPreloaded(const String& url); 75 75 76 76 size_t numberOfScopedHTMLStyleChildren(const Node*, ExceptionCode&) const; … … 99 99 bool pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element*, const String& pseudoId, ExceptionCode&); 100 100 101 PassRefPtr<Element> createContentElement( Document*,ExceptionCode&);101 PassRefPtr<Element> createContentElement(ExceptionCode&); 102 102 bool isValidContentSelect(Element* insertionPoint, ExceptionCode&); 103 103 Node* treeScopeRootNode(Node*, ExceptionCode&); … … 128 128 #endif 129 129 130 PassRefPtr<ClientRect> absoluteCaretBounds( Document*,ExceptionCode&);130 PassRefPtr<ClientRect> absoluteCaretBounds(ExceptionCode&); 131 131 132 132 PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&); -
trunk/Source/WebCore/testing/Internals.idl
r140105 r140710 30 30 31 31 DOMString elementRenderTreeAsText(in Element element) raises(DOMException); 32 boolean isPreloaded(in D ocument document, in DOMString url);32 boolean isPreloaded(in DOMString url); 33 33 34 34 unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException); … … 57 57 DOMString shadowPseudoId(in Element element) raises (DOMException); 58 58 void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException); 59 Element createContentElement( in Document document) raises(DOMException);59 Element createContentElement() raises(DOMException); 60 60 boolean isValidContentSelect(in Element contentElement) raises(DOMException); 61 61 Node treeScopeRootNode(in Node node) raises (DOMException); … … 88 88 #endif 89 89 90 ClientRect absoluteCaretBounds( in Document document) raises(DOMException);90 ClientRect absoluteCaretBounds() raises(DOMException); 91 91 92 92 ClientRect boundingBox(in Element element) raises(DOMException);
Note: See TracChangeset
for help on using the changeset viewer.