Title: [122077] trunk
- Revision
- 122077
- Author
- [email protected]
- Date
- 2012-07-08 20:48:56 -0700 (Sun, 08 Jul 2012)
Log Message
Update the description of LayoutTestController::textSurroundingElement
https://bugs.webkit.org/show_bug.cgi?id=90620
Reviewed by Adam Barth.
Tools:
Rename and fix the description of the method as its behaviour changed
during the review of https://bugs.webkit.org/show_bug.cgi?id=82461
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::LayoutTestController):
(LayoutTestController::textSurroundingNode):
* DumpRenderTree/chromium/LayoutTestController.h:
(LayoutTestController):
LayoutTests:
Rename textSurroundingElement to match is real behaviour.
* platform/chromium/editing/surrounding-text/surrounding-text.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (122076 => 122077)
--- trunk/LayoutTests/ChangeLog 2012-07-09 03:38:48 UTC (rev 122076)
+++ trunk/LayoutTests/ChangeLog 2012-07-09 03:48:56 UTC (rev 122077)
@@ -1,3 +1,14 @@
+2012-07-08 Leandro Gracia Gil <[email protected]>
+
+ Update the description of LayoutTestController::textSurroundingElement
+ https://bugs.webkit.org/show_bug.cgi?id=90620
+
+ Reviewed by Adam Barth.
+
+ Rename textSurroundingElement to match is real behaviour.
+
+ * platform/chromium/editing/surrounding-text/surrounding-text.html:
+
2012-07-08 Hayato Ito <[email protected]>
Unreviewed gardening.
Modified: trunk/LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text.html (122076 => 122077)
--- trunk/LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text.html 2012-07-09 03:38:48 UTC (rev 122076)
+++ trunk/LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text.html 2012-07-09 03:48:56 UTC (rev 122077)
@@ -20,7 +20,7 @@
if (node == null)
throw 'No node after "here" element';
- var text = window.testRunner.textSurroundingElement(node, offset, maxLength);
+ var text = window.testRunner.textSurroundingNode(node, offset, maxLength);
return text.replace(/\s+/g, ' ').replace(/^\s*|\s*$/g, '');
}
Modified: trunk/Tools/ChangeLog (122076 => 122077)
--- trunk/Tools/ChangeLog 2012-07-09 03:38:48 UTC (rev 122076)
+++ trunk/Tools/ChangeLog 2012-07-09 03:48:56 UTC (rev 122077)
@@ -1,3 +1,19 @@
+2012-07-08 Leandro Gracia Gil <[email protected]>
+
+ Update the description of LayoutTestController::textSurroundingElement
+ https://bugs.webkit.org/show_bug.cgi?id=90620
+
+ Reviewed by Adam Barth.
+
+ Rename and fix the description of the method as its behaviour changed
+ during the review of https://bugs.webkit.org/show_bug.cgi?id=82461
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::LayoutTestController):
+ (LayoutTestController::textSurroundingNode):
+ * DumpRenderTree/chromium/LayoutTestController.h:
+ (LayoutTestController):
+
2012-07-08 Kent Tamura <[email protected]>
Improve the template generated by prepare-ChangeLog
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (122076 => 122077)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-07-09 03:38:48 UTC (rev 122076)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-07-09 03:48:56 UTC (rev 122077)
@@ -276,7 +276,7 @@
bindMethod("setFixedLayoutSize", &LayoutTestController::setFixedLayoutSize);
bindMethod("selectionAsMarkup", &LayoutTestController::selectionAsMarkup);
bindMethod("setHasCustomFullScreenBehavior", &LayoutTestController::setHasCustomFullScreenBehavior);
- bindMethod("textSurroundingElement", &LayoutTestController::textSurroundingElement);
+ bindMethod("textSurroundingNode", &LayoutTestController::textSurroundingNode);
// The fallback method is called when an unknown method is invoked.
bindFallbackMethod(&LayoutTestController::fallbackMethod);
@@ -2346,7 +2346,7 @@
}
#endif
-void LayoutTestController::textSurroundingElement(const CppArgumentList& arguments, CppVariant* result)
+void LayoutTestController::textSurroundingNode(const CppArgumentList& arguments, CppVariant* result)
{
result->setNull();
if (arguments.size() < 3 || !arguments[0].isObject() || !arguments[1].isNumber() || !arguments[2].isNumber())
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (122076 => 122077)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-07-09 03:38:48 UTC (rev 122076)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-07-09 03:48:56 UTC (rev 122077)
@@ -457,9 +457,9 @@
void setBackingScaleFactor(const CppArgumentList&, CppVariant*);
// Retrieves the text surrounding a position in a text node.
- // The first child of the element given y its id will be used as reference,
- // or its next sibling if not present. It must be a text node.
- void textSurroundingElement(const CppArgumentList&, CppVariant*);
+ // Expects the first argument to be a text node, the second to be an offset
+ // in the node contents and the third the maximum text length to retrieve.
+ void textSurroundingNode(const CppArgumentList&, CppVariant*);
public:
// The following methods are not exposed to _javascript_.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
