Changeset 121713 in webkit

Timestamp:

Jul 2, 2012 5:53:26 PM (12 years ago)

Author:

leandrogracia@chromium.org

Message:

[Chromium] Implement a Layout Test for editing/SurroundingText
​https://bugs.webkit.org/show_bug.cgi?id=82461

Reviewed by Ryosuke Niwa.

Source/WebKit/chromium:

Allow passing nodes as arguments for layout test methods.

• public/WebBindings.h:

(WebBindings):

• src/WebBindings.cpp:

(WebKit::getNodeImpl):
(WebKit):
(WebKit::WebBindings::getNode):

Tools:

Add a new method to the layout test controller in order to retrieve the
text surrounding a provided element.

• DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController):
(LayoutTestController::textSurroundingElement):

• DumpRenderTree/chromium/LayoutTestController.h:

(LayoutTestController):

LayoutTests:

Add a new layout test for the surrounding text feature.

• platform/chromium/editing/surrounding-text/surrounding-text-expected.txt: Added.
• platform/chromium/editing/surrounding-text/surrounding-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/editing/surrounding-text (added)
• LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text-expected.txt (added)
• LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text.html (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebBindings.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebBindings.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/LayoutTestController.cpp (modified) (5 diffs)
• Tools/DumpRenderTree/chromium/LayoutTestController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-02  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        [Chromium] Implement a Layout Test for editing/SurroundingText
+        https://bugs.webkit.org/show_bug.cgi?id=82461
+
+        Reviewed by Ryosuke Niwa.
+
+        Add a new layout test for the surrounding text feature.
+
+        * platform/chromium/editing/surrounding-text/surrounding-text-expected.txt: Added.
+        * platform/chromium/editing/surrounding-text/surrounding-text.html: Added.
+
 2012-07-02  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-07-02  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        [Chromium] Implement a Layout Test for editing/SurroundingText
+        https://bugs.webkit.org/show_bug.cgi?id=82461
+
+        Reviewed by Ryosuke Niwa.
+
+        Allow passing nodes as arguments for layout test methods.
+
+        * public/WebBindings.h:
+        (WebBindings):
+        * src/WebBindings.cpp:
+        (WebKit::getNodeImpl):
+        (WebKit):
+        (WebKit::WebBindings::getNode):
+
 2012-07-02  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/chromium/public/WebBindings.h

@@ -153 +153 @@
     WEBKIT_EXPORT static bool getArrayBufferView(NPObject* arrayBufferView, WebArrayBufferView*);
 
+    // Return true (success) if the given npobj is a node.
+    // If so, return that node as a WebNode object.
+    WEBKIT_EXPORT static bool getNode(NPObject* element, WebNode*);
+
     // Return true (success) if the given npobj is an element.
     // If so, return that element as a WebElement object.

trunk/Source/WebKit/chromium/src/WebBindings.cpp

@@ -224 +224 @@
 }
 
+static bool getNodeImpl(NPObject* object, WebNode* webNode)
+{
+    if (!object || (object->_class != npScriptObjectClass))
+        return false;
+
+    V8NPObject* v8NPObject = reinterpret_cast<V8NPObject*>(object);
+    v8::Handle<v8::Object> v8Object(v8NPObject->v8Object);
+    Node* native = V8Node::HasInstance(v8Object) ? V8Node::toNative(v8Object) : 0;
+    if (!native)
+        return false;
+
+    *webNode = WebNode(native);
+    return true;
+}
+
 static bool getElementImpl(NPObject* object, WebElement* webElement)
 {
@@ -325 +340 @@
 #else
     // Not supported on other ports (JSC, etc).
+    return false;
+#endif
+}
+
+bool WebBindings::getNode(NPObject* node, WebNode* webNode)
+{
+#if USE(V8)
+    return getNodeImpl(node, webNode);
+#else
+    // Not supported on other ports (JSC, etc.).
     return false;
 #endif

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-02  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        [Chromium] Implement a Layout Test for editing/SurroundingText
+        https://bugs.webkit.org/show_bug.cgi?id=82461
+
+        Reviewed by Ryosuke Niwa.
+
+        Add a new method to the layout test controller in order to retrieve the
+        text surrounding a provided element.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::textSurroundingElement):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+        (LayoutTestController):
+
 2012-07-02  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -39 +39 @@
 #include "WebAnimationController.h"
 #include "WebBindings.h"
-#include "WebWorkerInfo.h"
 #include "WebConsoleMessage.h"
-#include "platform/WebData.h"
 #include "WebDeviceOrientation.h"
 #include "WebDeviceOrientationClientMock.h"
@@ -59 +57 @@
 #include "WebScriptSource.h"
 #include "WebSecurityPolicy.h"
+#include "WebSettings.h"
+#include "WebSurroundingText.h"
+#include "WebView.h"
+#include "WebViewHost.h"
+#include "WebWorkerInfo.h"
+#include "platform/WebData.h"
 #include "platform/WebSerializedScriptValue.h"
-#include "WebSettings.h"
 #include "platform/WebSize.h"
 #include "platform/WebURL.h"
-#include "WebView.h"
-#include "WebViewHost.h"
 #include "v8/include/v8.h"
 #include "webkit/support/webkit_support.h"
@@ -73 +74 @@
 #include <limits>
 #include <sstream>
+#include <wtf/OwnArrayPtr.h>
 #include <wtf/text/WTFString.h>
-#include <wtf/OwnArrayPtr.h>
 
 #if OS(LINUX) || OS(ANDROID)
@@ -276 +277 @@
     bindMethod("selectionAsMarkup", &LayoutTestController::selectionAsMarkup);
     bindMethod("setHasCustomFullScreenBehavior", &LayoutTestController::setHasCustomFullScreenBehavior);
-    
+    bindMethod("textSurroundingElement", &LayoutTestController::textSurroundingElement);
+
     // The fallback method is called when an unknown method is invoked.
     bindFallbackMethod(&LayoutTestController::fallbackMethod);
@@ -2344 +2346 @@
 }
 #endif
+
+void LayoutTestController::textSurroundingElement(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+    if (arguments.size() < 3 || !arguments[0].isObject() || !arguments[1].isNumber() || !arguments[2].isNumber())
+        return;
+
+    WebNode node;
+    if (!WebBindings::getNode(arguments[0].value.objectValue, &node))
+        return;
+
+    if (node.isNull() || !node.isTextNode())
+        return;
+
+    unsigned offset = arguments[1].toInt32();
+    if (offset >= node.nodeValue().length()) {
+        result->set(WebString().utf8());
+        return;
+    }
+
+    WebSurroundingText surroundingText;
+    unsigned maxLength = arguments[2].toInt32();
+    surroundingText.initialize(node, offset, maxLength);
+    result->set(surroundingText.textContent().utf8());
+}

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

@@ -456 +456 @@
     // Used to set the device scale factor.
     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*);
 
 public: