Diff
Modified: trunk/LayoutTests/ChangeLog (140709 => 140710)
--- trunk/LayoutTests/ChangeLog 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/ChangeLog 2013-01-24 20:42:52 UTC (rev 140710)
@@ -1,3 +1,34 @@
+2013-01-24 Tony Chang <t...@chromium.org>
+
+ 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.
+
+ * 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:
+
2013-01-24 Mike West <mk...@chromium.org>
Web Inspector: 'console.debug' should generate messages at DebugMessageLevel.
Modified: trunk/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html (140709 => 140710)
--- trunk/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/input/editable-container-with-word-wrap-normal.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -24,7 +24,7 @@
editableContainer = document.getElementById('test');
editableContainer.focus();
if (window.internals)
- startCaretRect = internals.absoluteCaretBounds(document);
+ startCaretRect = internals.absoluteCaretBounds();
window.getSelection().setPosition(editableContainer,0);
if (window.testRunner)
@@ -32,7 +32,7 @@
finalCaretRect = {right:-1,left:-1};
if (window.internals)
- finalCaretRect = internals.absoluteCaretBounds(document);
+ finalCaretRect = internals.absoluteCaretBounds();
caretWidth = finalCaretRect.right - finalCaretRect.left;
Modified: trunk/LayoutTests/editing/selection/caret-alignment-for-vertical-text.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/caret-alignment-for-vertical-text.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/caret-alignment-for-vertical-text.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -18,17 +18,17 @@
/* Caret rect for the empty container. */
document.getElementById('emptyDiv').focus();
if (window.internals)
- emptyDivCaretRect = internals.absoluteCaretBounds(document);
+ emptyDivCaretRect = internals.absoluteCaretBounds();
/* Caret rect for am empty line. */
document.getElementById('emptyLineDiv').focus();
if (window.internals)
- emptyLineCaretRect = internals.absoluteCaretBounds(document);
+ emptyLineCaretRect = internals.absoluteCaretBounds();
/* Caret rect for the container with some text. */
document.getElementById('textDiv').focus();
if (window.internals)
- textDivCaretRect = internals.absoluteCaretBounds(document);
+ textDivCaretRect = internals.absoluteCaretBounds();
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.")
Modified: trunk/LayoutTests/editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/caret-at-end-of-text-line-followed-by-block-in-vertical-mode.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -23,12 +23,12 @@
eventSender.mouseMoveTo(testDiv.offsetLeft + testDiv.offsetWidth - 5, testDiv.offsetTop);
eventSender.mouseDown();
eventSender.mouseUp();
- caretRectAtStart = internals.absoluteCaretBounds(document);
+ caretRectAtStart = internals.absoluteCaretBounds();
eventSender.mouseMoveTo(testDiv.offsetLeft + testDiv.offsetWidth - 5, testDiv.offsetTop + testDiv.offsetHeight - 5);
eventSender.mouseDown();
eventSender.mouseUp();
- caretRectAtEnd = internals.absoluteCaretBounds(document);
+ caretRectAtEnd = internals.absoluteCaretBounds();
shouldBe("caretRectAtEnd.left", "caretRectAtStart.left");
shouldBe("caretRectAtEnd.width", "caretRectAtStart.width");
Modified: trunk/LayoutTests/editing/selection/caret-in-div-containing-br-in-vertical-mode.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/caret-in-div-containing-br-in-vertical-mode.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/caret-in-div-containing-br-in-vertical-mode.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -16,11 +16,11 @@
document.getElementById('textDiv').focus();
if (window.internals)
- withTextCaretRect = internals.absoluteCaretBounds(document);
+ withTextCaretRect = internals.absoluteCaretBounds();
document.getElementById('noTextDiv').focus();
if (window.internals)
- withoutTextCaretRect = internals.absoluteCaretBounds(document);
+ withoutTextCaretRect = internals.absoluteCaretBounds();
if (window.internals) {
shouldBe("withTextCaretRect.top", "withoutTextCaretRect.top");
Modified: trunk/LayoutTests/editing/selection/caret-in-empty-inline-1.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/caret-in-empty-inline-1.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/caret-in-empty-inline-1.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -18,7 +18,7 @@
var testInline = document.getElementById("testInline");
getSelection().collapse(testInline, 0);
if (window.internals) {
- var caretRect = internals.absoluteCaretBounds(document);
+ var caretRect = internals.absoluteCaretBounds();
shouldBe("caretRect.left", "8");
shouldBe("caretRect.top", "160");
shouldBe("caretRect.width", "1");
Modified: trunk/LayoutTests/editing/selection/caret-in-empty-inline-2.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/caret-in-empty-inline-2.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/caret-in-empty-inline-2.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -19,7 +19,7 @@
var testInline = document.getElementById("testInline");
getSelection().collapse(testInline, 0);
if (window.internals) {
- var caretRect = internals.absoluteCaretBounds(document);
+ var caretRect = internals.absoluteCaretBounds();
shouldBe("caretRect.left", "268");
shouldBe("caretRect.top", "180");
shouldBe("caretRect.width", "1");
Modified: trunk/LayoutTests/editing/selection/internal-caret-rect.html (140709 => 140710)
--- trunk/LayoutTests/editing/selection/internal-caret-rect.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/editing/selection/internal-caret-rect.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -20,7 +20,7 @@
{
if (window.internals) {
var index = caretRects.length;
- caretRects.push(internals.absoluteCaretBounds(document));
+ caretRects.push(internals.absoluteCaretBounds());
shouldBe("caretRects[" + index + "].left", left.toString());
shouldBe("caretRects[" + index + "].top", top.toString());
shouldBe("caretRects[" + index + "].width", width.toString());
Modified: trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js (140709 => 140710)
--- trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js 2013-01-24 20:42:52 UTC (rev 140710)
@@ -72,7 +72,7 @@
}
function createContentWithSelect(select, fallbackText) {
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
if (fallbackText)
content.appendChild(createSpanWithText(fallbackText));
@@ -81,7 +81,7 @@
}
function createContentWithText(fallbackText) {
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
if (fallbackText)
content.innerHTML = fallbackText;
@@ -91,7 +91,7 @@
function appendShadow(target, select) {
var root = internals.ensureShadowRoot(target);
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
@@ -105,7 +105,7 @@
var child = document.createElement("span");
{
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
Modified: trunk/LayoutTests/fast/dom/shadow/content-element-includer.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/content-element-includer.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/content-element-includer.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -33,7 +33,7 @@
var elementWithShadowContent = document.createElement("div");
container.appendChild(elementWithShadowContent);
var shadowRootOfElementWithShadowContent = internals.ensureShadowRoot(elementWithShadowContent);
-var shadowContentOfElementWithShadowContent = internals.createContentElement(document);
+var shadowContentOfElementWithShadowContent = internals.createContentElement();
shadowRootOfElementWithShadowContent.appendChild(shadowContentOfElementWithShadowContent);
var childOfElementWithShadowContent = document.createElement("span");
elementWithShadowContent.appendChild(childOfElementWithShadowContent);
@@ -58,7 +58,7 @@
var anotherElementWithShadowContent = document.createElement("div");
container.appendChild(anotherElementWithShadowContent);
var anotherShadowRootOfElementWithShadowContent = internals.ensureShadowRoot(anotherElementWithShadowContent);
-var anotherShadowContentOfElementWithShadowContent = internals.createContentElement(document);
+var anotherShadowContentOfElementWithShadowContent = internals.createContentElement();
anotherShadowRootOfElementWithShadowContent.appendChild(anotherShadowContentOfElementWithShadowContent);
anotherElementWithShadowContent.appendChild(movingChild);
Modified: trunk/LayoutTests/fast/dom/shadow/content-element-renderers.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/content-element-renderers.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/content-element-renderers.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -62,7 +62,7 @@
var contentPlaceholder = root.getElementsByTagName("CONTENT")[0];
if (contentPlaceholder) {
var contentParent = contentPlaceholder.parentNode;
- contentParent.replaceChild(window.internals.createContentElement(document), contentPlaceholder);
+ contentParent.replaceChild(window.internals.createContentElement(), contentPlaceholder);
};
return root;
Modified: trunk/LayoutTests/fast/dom/shadow/content-selector-query.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/content-selector-query.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/content-selector-query.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -13,7 +13,7 @@
var content;
function test(select, valid) {
- content = internals.createContentElement(document);
+ content = internals.createContentElement();
if (select != null)
content.setAttribute('select', select);
Modified: trunk/LayoutTests/fast/dom/shadow/create-content-element.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/create-content-element.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/create-content-element.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -29,7 +29,7 @@
var child0 = document.createElement("span");
child0.innerHTML = "Hello,";
root.appendChild(child0);
- root.appendChild(window.internals.createContentElement(document));
+ root.appendChild(window.internals.createContentElement());
var child1 = document.createElement("span");
child1.innerHTML = "World.";
root.appendChild(child1);
Modified: trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback-dynamic.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback-dynamic.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback-dynamic.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -61,7 +61,7 @@
function appendShadow(target, select) {
var root = internals.ensureShadowRoot(target);
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
@@ -75,7 +75,7 @@
var child = document.createElement("span");
{
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
@@ -349,7 +349,7 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
root.appendChild(document.createTextNode("{SHADOW: "));
@@ -360,7 +360,7 @@
var f = (function(target, content1, callIfDone) {
return function() {
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'span');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
content1.appendChild(content2);
@@ -380,7 +380,7 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
root.appendChild(document.createTextNode("{SHADOW: "));
@@ -391,7 +391,7 @@
var f = (function(target, content1, callIfDone) {
return function() {
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'div');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
content1.appendChild(content2);
@@ -411,7 +411,7 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
root.appendChild(content1);
@@ -419,7 +419,7 @@
var f = (function(target, content1, callIfDone) {
return function() {
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'div');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
content1.appendChild(content2);
Modified: trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/shadow-contents-fallback.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -62,7 +62,7 @@
function appendShadow(target, select) {
var root = internals.ensureShadowRoot(target);
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
@@ -76,7 +76,7 @@
var child = document.createElement("span");
{
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
content.appendChild(createSpanWithText("FALLBACK"));
@@ -231,7 +231,7 @@
target.appendChild(span3);
var root = internals.ensureShadowRoot(target);
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', 'span');
content.appendChild(createSpanWithText('FALLBACK'));
@@ -253,11 +253,11 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'span');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
content1.appendChild(content2);
@@ -276,11 +276,11 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'div');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
content1.appendChild(content2);
@@ -299,11 +299,11 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'div');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
content1.appendChild(content2);
@@ -325,11 +325,11 @@
target.appendChild(createSpanWithText('S2'));
var root = internals.ensureShadowRoot(target);
- var content2 = internals.createContentElement(document);
+ var content2 = internals.createContentElement();
content2.setAttribute('select', 'div');
content2.appendChild(createSpanWithText('CONTENT 2 FALLBACK'));
- var content1 = internals.createContentElement(document);
+ var content1 = internals.createContentElement();
content1.setAttribute('select', 'div');
content1.appendChild(content2);
Modified: trunk/LayoutTests/fast/dom/shadow/shadow-contents-select.html (140709 => 140710)
--- trunk/LayoutTests/fast/dom/shadow/shadow-contents-select.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/dom/shadow/shadow-contents-select.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -15,7 +15,7 @@
child0.innerHTML = "Hello,";
root.appendChild(child0);
- var content = internals.createContentElement(document);
+ var content = internals.createContentElement();
content.setAttribute('select', select);
root.appendChild(content);
Modified: trunk/LayoutTests/fast/preloader/scan-body-from-head-import.html (140709 => 140710)
--- trunk/LayoutTests/fast/preloader/scan-body-from-head-import.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/preloader/scan-body-from-head-import.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -6,7 +6,7 @@
function checkForPreload() {
var result;
- if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/style1.css"))
+ if (internals.isPreloaded("resources/image1.png") && internals.isPreloaded("resources/style1.css"))
result = "PASS";
else
result = "FAIL";
Modified: trunk/LayoutTests/fast/preloader/scan-body-from-head-script.html (140709 => 140710)
--- trunk/LayoutTests/fast/preloader/scan-body-from-head-script.html 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/fast/preloader/scan-body-from-head-script.html 2013-01-24 20:42:52 UTC (rev 140710)
@@ -6,7 +6,7 @@
function checkForPreload() {
var result;
- if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/script1.js"))
+ if (internals.isPreloaded("resources/image1.png") && internals.isPreloaded("resources/script1.js"))
result = "PASS";
else
result = "FAIL";
Modified: trunk/LayoutTests/http/tests/loading/preload-append-scan.php (140709 => 140710)
--- trunk/LayoutTests/http/tests/loading/preload-append-scan.php 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/LayoutTests/http/tests/loading/preload-append-scan.php 2013-01-24 20:42:52 UTC (rev 140710)
@@ -12,7 +12,7 @@
function checkForPreload() {
var result;
- if (internals.isPreloaded(document, "resources/preload-test.jpg"))
+ if (internals.isPreloaded("resources/preload-test.jpg"))
result = "PASS";
else
result = "FAIL";
Modified: trunk/Source/WebCore/ChangeLog (140709 => 140710)
--- trunk/Source/WebCore/ChangeLog 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/Source/WebCore/ChangeLog 2013-01-24 20:42:52 UTC (rev 140710)
@@ -1,3 +1,23 @@
+2013-01-24 Tony Chang <t...@chromium.org>
+
+ 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.
+
+ 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:
+
2013-01-24 Mike West <mk...@chromium.org>
Web Inspector: 'console.debug' should generate messages at DebugMessageLevel.
Modified: trunk/Source/WebCore/testing/Internals.cpp (140709 => 140710)
--- trunk/Source/WebCore/testing/Internals.cpp 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-01-24 20:42:52 UTC (rev 140710)
@@ -285,16 +285,15 @@
return String(buf);
}
-bool Internals::isPreloaded(Document* document, const String& url)
+bool Internals::isPreloaded(const String& url)
{
- if (!document)
- return false;
-
+ Document* document = contextDocument();
return document->cachedResourceLoader()->isPreloaded(url);
}
-PassRefPtr<Element> Internals::createContentElement(Document* document, ExceptionCode& ec)
+PassRefPtr<Element> Internals::createContentElement(ExceptionCode& ec)
{
+ Document* document = contextDocument();
if (!document) {
ec = INVALID_ACCESS_ERR;
return 0;
@@ -763,8 +762,9 @@
}
#endif
-PassRefPtr<ClientRect> Internals::absoluteCaretBounds(Document* document, ExceptionCode& ec)
+PassRefPtr<ClientRect> Internals::absoluteCaretBounds(ExceptionCode& ec)
{
+ Document* document = contextDocument();
if (!document || !document->frame() || !document->frame()->selection()) {
ec = INVALID_ACCESS_ERR;
return ClientRect::create();
Modified: trunk/Source/WebCore/testing/Internals.h (140709 => 140710)
--- trunk/Source/WebCore/testing/Internals.h 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/Source/WebCore/testing/Internals.h 2013-01-24 20:42:52 UTC (rev 140710)
@@ -71,7 +71,7 @@
String address(Node*);
- bool isPreloaded(Document*, const String& url);
+ bool isPreloaded(const String& url);
size_t numberOfScopedHTMLStyleChildren(const Node*, ExceptionCode&) const;
@@ -98,7 +98,7 @@
bool pauseAnimationAtTimeOnPseudoElement(const String& animationName, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
bool pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
- PassRefPtr<Element> createContentElement(Document*, ExceptionCode&);
+ PassRefPtr<Element> createContentElement(ExceptionCode&);
bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);
Node* treeScopeRootNode(Node*, ExceptionCode&);
Node* parentTreeScope(Node*, ExceptionCode&);
@@ -127,7 +127,7 @@
PassRefPtr<PagePopupController> pagePopupController();
#endif
- PassRefPtr<ClientRect> absoluteCaretBounds(Document*, ExceptionCode&);
+ PassRefPtr<ClientRect> absoluteCaretBounds(ExceptionCode&);
PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/Internals.idl (140709 => 140710)
--- trunk/Source/WebCore/testing/Internals.idl 2013-01-24 20:40:23 UTC (rev 140709)
+++ trunk/Source/WebCore/testing/Internals.idl 2013-01-24 20:42:52 UTC (rev 140710)
@@ -29,7 +29,7 @@
DOMString address(in Node node);
DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
- boolean isPreloaded(in Document document, in DOMString url);
+ boolean isPreloaded(in DOMString url);
unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException);
@@ -56,7 +56,7 @@
Element includerFor(in Node node) raises (DOMException);
DOMString shadowPseudoId(in Element element) raises (DOMException);
void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException);
- Element createContentElement(in Document document) raises(DOMException);
+ Element createContentElement() raises(DOMException);
boolean isValidContentSelect(in Element contentElement) raises(DOMException);
Node treeScopeRootNode(in Node node) raises (DOMException);
Node parentTreeScope(in Node node) raises (DOMException);
@@ -87,7 +87,7 @@
readonly attribute PagePopupController pagePopupController;
#endif
- ClientRect absoluteCaretBounds(in Document document) raises(DOMException);
+ ClientRect absoluteCaretBounds() raises(DOMException);
ClientRect boundingBox(in Element element) raises(DOMException);
