[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

morrita at google.com morrita at google.com
Wed Dec 22 14:42:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8334623ab6d0d687d7a82deb2446736ae07e7152
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 11:46:15 2010 +0000

    2010-10-18  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Kent Tamura.
    
            TextInputController.hasSpellingMarkers() should be owned by LayoutTestController
            https://bugs.webkit.org/show_bug.cgi?id=47659
    
            Changed the reciever of hasSpellingMarkers from
            textInputController to layoutTestController.
    
            * editing/spelling/design-mode-spellcheck-off.html:
            * editing/spelling/script-tests/spelling-backspace-between-lines.js:
            (testWithDelete):
            (testWithForwardDelete):
            * editing/spelling/spelling-backspace-between-lines-expected.txt:
            * editing/spelling/spelling-contenteditable.html:
            * editing/spelling/spelling-textarea.html:
    2010-10-18  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Kent Tamura.
    
            TextInputController.hasSpellingMarkers() should be owned by LayoutTestController
            https://bugs.webkit.org/show_bug.cgi?id=47659
    
            Moved hasSpellingMarkers() from TextInputController to
            LayoutTestController.  Currently the implementation is available
            only for Mac and for Chromium.
    
            * DumpRenderTree/LayoutTestController.cpp:
            (hasSpellingMarkerCallback):
            (LayoutTestController::staticFunctions):
            * DumpRenderTree/LayoutTestController.h:
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::LayoutTestController):
            (LayoutTestController::hasSpellingMarker):
            * DumpRenderTree/chromium/LayoutTestController.h:
            * DumpRenderTree/chromium/TextInputController.cpp:
            (TextInputController::TextInputController):
            (TextInputController::makeAttributedString):
            * DumpRenderTree/chromium/TextInputController.h:
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
            (LayoutTestController::hasSpellingMarker):
            * DumpRenderTree/mac/LayoutTestControllerMac.mm:
            (LayoutTestController::hasSpellingMarker):
            * DumpRenderTree/mac/TextInputController.m:
            (+[TextInputController isSelectorExcludedFromWebScript:]):
            (+[TextInputController webScriptNameForSelector:]):
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::hasSpellingMarker):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
            * DumpRenderTree/win/LayoutTestControllerWin.cpp:
            (LayoutTestController::hasSpellingMarker):
            * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
            (LayoutTestController::hasSpellingMarker):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f7feb56..f2b7544 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-18  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Kent Tamura.
+
+        TextInputController.hasSpellingMarkers() should be owned by LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=47659
+        
+        Changed the reciever of hasSpellingMarkers from
+        textInputController to layoutTestController.
+
+        * editing/spelling/design-mode-spellcheck-off.html:
+        * editing/spelling/script-tests/spelling-backspace-between-lines.js:
+        (testWithDelete):
+        (testWithForwardDelete):
+        * editing/spelling/spelling-backspace-between-lines-expected.txt:
+        * editing/spelling/spelling-contenteditable.html:
+        * editing/spelling/spelling-textarea.html:
+
 2010-10-18  Alejandro G. Castro  <alex at igalia.com>
 
         Unreviewed, skip another mathml flaky test, check bug:
diff --git a/LayoutTests/editing/spelling/design-mode-spellcheck-off.html b/LayoutTests/editing/spelling/design-mode-spellcheck-off.html
index 30ce58d..e7128e5 100644
--- a/LayoutTests/editing/spelling/design-mode-spellcheck-off.html
+++ b/LayoutTests/editing/spelling/design-mode-spellcheck-off.html
@@ -18,7 +18,7 @@ else if (window.layoutTestController && window.eventSender) {
     document.body.addEventListener('mousedown', function() {
         if (document.activeElement != document.body)
             document.body.appendChild(document.createTextNode('FAIL: active element after click is not body element'));
-        else if (window.textInputController && textInputController.hasSpellingMarker && textInputController.hasSpellingMarker(0, 4))
+        else if (layoutTestController.hasSpellingMarker(0, 4))
             document.body.appendChild(document.createTextNode('FAIL: spell check was invoked'));
         else
             document.body.appendChild(document.createTextNode('PASS'));
diff --git a/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js b/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js
index d3663d2..88a2bfd 100644
--- a/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js
+++ b/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js
@@ -26,7 +26,7 @@ function testWithDelete()
 
     shouldBe("firstLineText()", "'OK'");
     shouldBe("sel.anchorNode.data", "'OK zz OK'");
-    shouldBe("textInputController.hasSpellingMarker(3, 2)", "1");
+    shouldBeTrue("layoutTestController.hasSpellingMarker(3, 2)");
 
     sel.modify("move", "left", "lineboundary");
     document.execCommand("Delete", false);
@@ -34,7 +34,7 @@ function testWithDelete()
 
     shouldBe("sel.anchorNode.data", "'OK zz OK'");
     shouldBe("firstLineText()", "'OKOK zz OK'");
-    shouldBe("textInputController.hasSpellingMarker(3, 2)", "1");
+    shouldBeTrue("layoutTestController.hasSpellingMarker(3, 2)");
 }
 
 function testWithForwardDelete()
@@ -47,7 +47,7 @@ function testWithForwardDelete()
 
     shouldBe("firstLineText()", "'OK'");
     shouldBe("sel.anchorNode.data", "'OK zz OK'");
-    shouldBe("textInputController.hasSpellingMarker(3, 2)", "1");
+    shouldBeTrue("layoutTestController.hasSpellingMarker(3, 2)");
 
     sel.modify("move", "left", "line");
     document.execCommand("ForwardDelete", false);
@@ -55,7 +55,7 @@ function testWithForwardDelete()
 
     shouldBe("firstLineText()", "'OKOK zz OK'");
     shouldBe("sel.anchorNode.data", "'OK zz OK'");
-    shouldBe("textInputController.hasSpellingMarker(3, 2)", "1");
+    shouldBeTrue("layoutTestController.hasSpellingMarker(3, 2)");
 }
 
 testWithDelete();
diff --git a/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt b/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt
index 03841f3..9404ad4 100644
--- a/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt
+++ b/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt
@@ -5,16 +5,16 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS firstLineText() is 'OK'
 PASS sel.anchorNode.data is 'OK zz OK'
-PASS textInputController.hasSpellingMarker(3, 2) is 1
+PASS layoutTestController.hasSpellingMarker(3, 2) is true
 PASS sel.anchorNode.data is 'OK zz OK'
 PASS firstLineText() is 'OKOK zz OK'
-PASS textInputController.hasSpellingMarker(3, 2) is 1
+PASS layoutTestController.hasSpellingMarker(3, 2) is true
 PASS firstLineText() is 'OK'
 PASS sel.anchorNode.data is 'OK zz OK'
-PASS textInputController.hasSpellingMarker(3, 2) is 1
+PASS layoutTestController.hasSpellingMarker(3, 2) is true
 PASS firstLineText() is 'OKOK zz OK'
 PASS sel.anchorNode.data is 'OK zz OK'
-PASS textInputController.hasSpellingMarker(3, 2) is 1
+PASS layoutTestController.hasSpellingMarker(3, 2) is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/editing/spelling/spelling-contenteditable.html b/LayoutTests/editing/spelling/spelling-contenteditable.html
index 51d28d1..d2369c3 100644
--- a/LayoutTests/editing/spelling/spelling-contenteditable.html
+++ b/LayoutTests/editing/spelling/spelling-contenteditable.html
@@ -28,8 +28,7 @@ if (window.layoutTestController) {
 
     // Test the above 'zz' is marked as misspelled. We test it only on platforms that implement
     // textInputController.hasSpellingMarker() to avoid exceptions.
-    if (textInputController && textInputController.hasSpellingMarker)
-        logResult(textInputController.hasSpellingMarker(0, 2));
+    logResult(layoutTestController.hasSpellingMarker(0, 2));
 }
 
 var successfullyParsed = true;
diff --git a/LayoutTests/editing/spelling/spelling-textarea.html b/LayoutTests/editing/spelling/spelling-textarea.html
index 43925b9..be416b5 100644
--- a/LayoutTests/editing/spelling/spelling-textarea.html
+++ b/LayoutTests/editing/spelling/spelling-textarea.html
@@ -28,8 +28,7 @@ if (window.layoutTestController) {
 
     // Test the above 'zz' is marked as misspelled. We test it only on platforms that implement
     // textInputController.hasSpellingMarker() to avoid exceptions.
-    if (textInputController && textInputController.hasSpellingMarker)
-        logResult(textInputController.hasSpellingMarker(0, 2));
+    logResult(layoutTestController.hasSpellingMarker(0, 2));
 }
 
 var successfullyParsed = true;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1aa7e96..75bf66c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,41 @@
+2010-10-18  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Kent Tamura.
+
+        TextInputController.hasSpellingMarkers() should be owned by LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=47659
+        
+        Moved hasSpellingMarkers() from TextInputController to
+        LayoutTestController.  Currently the implementation is available
+        only for Mac and for Chromium.
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (hasSpellingMarkerCallback):
+        (LayoutTestController::staticFunctions):
+        * DumpRenderTree/LayoutTestController.h:
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::hasSpellingMarker):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+        * DumpRenderTree/chromium/TextInputController.cpp:
+        (TextInputController::TextInputController):
+        (TextInputController::makeAttributedString):
+        * DumpRenderTree/chromium/TextInputController.h:
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::hasSpellingMarker):
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+        (LayoutTestController::hasSpellingMarker):
+        * DumpRenderTree/mac/TextInputController.m:
+        (+[TextInputController isSelectorExcludedFromWebScript:]):
+        (+[TextInputController webScriptNameForSelector:]):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::hasSpellingMarker):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::hasSpellingMarker):
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::hasSpellingMarker):
+
 2010-10-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index 0a7c11f..b5cc874 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -1723,6 +1723,19 @@ static JSValueRef abortModalCallback(JSContextRef context, JSObjectRef function,
     return JSValueMakeUndefined(context);
 }
 
+static JSValueRef hasSpellingMarkerCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    if (argumentCount != 2)
+        return JSValueMakeUndefined(context);
+
+    int from = JSValueToNumber(context, arguments[0], 0);
+    int length = JSValueToNumber(context, arguments[1], 0);
+    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    bool ok = controller->hasSpellingMarker(from, length);
+
+    return JSValueMakeBoolean(context, ok);
+}
+
 static JSValueRef markerTextForListItemCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
@@ -1891,6 +1904,7 @@ JSStaticFunction* LayoutTestController::staticFunctions()
         { "execCommand", execCommandCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "counterValueForElementById", counterValueForElementByIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "grantDesktopNotificationPermission", grantDesktopNotificationPermissionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 
+        { "hasSpellingMarker", hasSpellingMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "isPageBoxVisible", isPageBoxVisibleCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.h b/WebKitTools/DumpRenderTree/LayoutTestController.h
index 755a2b2..689e114 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.h
@@ -279,6 +279,8 @@ public:
 
     void abortModal();
 
+    bool hasSpellingMarker(int from, int length);
+
     // The following API test functions should probably be moved to platform-specific 
     // unit tests outside of DRT once they exist.
     void apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL);
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index d7774e9..d85f0ca 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -108,6 +108,7 @@ LayoutTestController::LayoutTestController(TestShell* shell)
     bindMethod("isCommandEnabled", &LayoutTestController::isCommandEnabled);
     bindMethod("layerTreeAsText", &LayoutTestController::layerTreeAsText);
     bindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
+    bindMethod("hasSpellingMarker", &LayoutTestController::hasSpellingMarker);
     bindMethod("notifyDone", &LayoutTestController::notifyDone);
     bindMethod("numberOfActiveAnimations", &LayoutTestController::numberOfActiveAnimations);
     bindMethod("numberOfPages", &LayoutTestController::numberOfPages);
@@ -1558,3 +1559,10 @@ WebDeviceOrientationClient* LayoutTestController::deviceOrientationClient()
         m_deviceOrientationClientMock.set(WebDeviceOrientationClientMock::create());
     return m_deviceOrientationClientMock.get();
 }
+
+void LayoutTestController::hasSpellingMarker(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
+        return;
+    result->set(m_shell->webView()->mainFrame()->selectionStartHasSpellingMarkerFor(arguments[0].toInt32(), arguments[1].toInt32()));
+}
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
index c836149..82d727c 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
@@ -328,6 +328,7 @@ public:
     void layerTreeAsText(const CppArgumentList& args, CppVariant* result);
 
     void markerTextForListItem(const CppArgumentList&, CppVariant*);
+    void hasSpellingMarker(const CppArgumentList&, CppVariant*);
 
 public:
     // The following methods are not exposed to JavaScript.
diff --git a/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp b/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
index 4f06874..c247c63 100644
--- a/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
@@ -58,7 +58,6 @@ TextInputController::TextInputController(TestShell* shell)
     bindMethod("doCommand", &TextInputController::doCommand);
     bindMethod("firstRectForCharacterRange", &TextInputController::firstRectForCharacterRange);
     bindMethod("hasMarkedText", &TextInputController::hasMarkedText);
-    bindMethod("hasSpellingMarker", &TextInputController::hasSpellingMarker);
     bindMethod("insertText", &TextInputController::insertText);
     bindMethod("makeAttributedString", &TextInputController::makeAttributedString);
     bindMethod("markedRange", &TextInputController::markedRange);
@@ -233,14 +232,3 @@ void TextInputController::makeAttributedString(const CppArgumentList&, CppVarian
     // FIXME: Implement this.
     result->setNull();
 }
-
-void TextInputController::hasSpellingMarker(const CppArgumentList& arguments, CppVariant* result)
-{
-    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
-        return;
-    WebFrame* mainFrame = getMainFrame();
-    if (!mainFrame)
-        return;
-    // Returns as a number for a compatibility reason.
-    result->set(mainFrame->selectionStartHasSpellingMarkerFor(arguments[0].toInt32(), arguments[1].toInt32()) ? 1 : 0);
-}
diff --git a/WebKitTools/DumpRenderTree/chromium/TextInputController.h b/WebKitTools/DumpRenderTree/chromium/TextInputController.h
index ddacefe..9896be5 100644
--- a/WebKitTools/DumpRenderTree/chromium/TextInputController.h
+++ b/WebKitTools/DumpRenderTree/chromium/TextInputController.h
@@ -61,7 +61,6 @@ public:
     void characterIndexForPoint(const CppArgumentList&, CppVariant*);
     void validAttributesForMarkedText(const CppArgumentList&, CppVariant*);
     void makeAttributedString(const CppArgumentList&, CppVariant*);
-    void hasSpellingMarker(const CppArgumentList&, CppVariant*);
 
 private:
     // Returns the test shell's main WebFrame.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 50b6179..004df4d 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -808,3 +808,9 @@ void LayoutTestController::setEditingBehavior(const char* editingBehavior)
 void LayoutTestController::abortModal()
 {
 }
+
+bool LayoutTestController::hasSpellingMarker(int, int)
+{
+    // FIXME: Implement this.
+    return false;
+}
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index c66c9da..c5d5a90 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -944,3 +944,8 @@ void LayoutTestController::abortModal()
 {
     [NSApp abortModal];
 }
+
+bool LayoutTestController::hasSpellingMarker(int from, int length)
+{
+    return [mainFrame hasSpellingMarker:from length:length];
+}
diff --git a/WebKitTools/DumpRenderTree/mac/TextInputController.m b/WebKitTools/DumpRenderTree/mac/TextInputController.m
index a049ac5..f780794 100644
--- a/WebKitTools/DumpRenderTree/mac/TextInputController.m
+++ b/WebKitTools/DumpRenderTree/mac/TextInputController.m
@@ -170,8 +170,7 @@
             || aSelector == @selector(characterIndexForPointX:Y:)
             || aSelector == @selector(validAttributesForMarkedText)
             || aSelector == @selector(attributedStringWithString:)
-            || aSelector == @selector(setInputMethodHandler:)
-            || aSelector == @selector(hasSpellingMarker:length:))
+            || aSelector == @selector(setInputMethodHandler:))
         return NO;
     return YES;
 }
@@ -196,8 +195,6 @@
         return @"makeAttributedString"; // just a factory method, doesn't call into NSTextInput
     else if (aSelector == @selector(setInputMethodHandler:))
         return @"setInputMethodHandler"; 
-    else if (aSelector == @selector(hasSpellingMarker:length:))
-        return @"hasSpellingMarker";
 
     return nil;
 }
@@ -431,9 +428,4 @@
     return YES;
 }
 
-- (BOOL)hasSpellingMarker:(int)from length:(int)length
-{
-    return [[webView mainFrame] hasSpellingMarker:from length:length];
-}
-
 @end
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index c262425..d36a074 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -798,5 +798,11 @@ void LayoutTestController::removeAllVisitedLinks()
     DumpRenderTreeSupportQt::dumpVisitedLinksCallbacks(true);
 }
 
+bool LayoutTestController::hasSpellingMarker(int, int)
+{
+    // FIXME: Implement.
+    return false;
+}
+
 const unsigned LayoutTestController::maxViewWidth = 800;
 const unsigned LayoutTestController::maxViewHeight = 600;
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index ec89acb..3684946 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -219,6 +219,7 @@ public slots:
 
     // Empty stub method to keep parity with object model exposed by global LayoutTestController.
     void abortModal() {}
+    bool hasSpellingMarker(int from, int length);
 
     /*
         Policy values: 'on', 'auto' or 'off'.
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index 6dd609c..d2140d1 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -1390,3 +1390,9 @@ void LayoutTestController::setEditingBehavior(const char* editingBehavior)
 void LayoutTestController::abortModal()
 {
 }
+
+bool LayoutTestController::hasSpellingMarker(int, int)
+{
+    // FIXME: Implement this.
+    return false;
+}
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 5fba1cf..eefc587 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -505,6 +505,12 @@ void LayoutTestController::abortModal()
 {
 }
 
+bool LayoutTestController::hasSpellingMarker(int, int)
+{
+    // FIXME: Implement
+    return false;
+}
+
 JSRetainPtr<JSStringRef> LayoutTestController::pageProperty(const char* propertyName, int pageNumber) const
 {
     // FIXME: Implement

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list