Changeset 60189 in webkit

Timestamp:

May 25, 2010 3:14:47 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

[Qt] Expose the editing behavior setting in DRT to test all editing code paths
​https://bugs.webkit.org/show_bug.cgi?id=39680

Reviewed by Ojan Vafai.
Patch by Antonio Gomes <​tonikitoo@webkit.org>

WebKit/qt:

Add support to Qt's DRT to setting the editing behavior. Patch is a follow up of
bug 38603, which just stubbed out the Qt bits of it.

• WebCoreSupport/DumpRenderTreeSupportQt.cpp: Implementation of editing behavior control.

(DumpRenderTreeSupportQt::setEditingBehavior):

• WebCoreSupport/DumpRenderTreeSupportQt.h:

WebKitTools:

Implement LayoutTestController::setEditingBehavior in Qt's DRT.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::setEditingBehavior):

Location:

trunk

Files:

• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-05-25  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Ojan Vafai.
+
+        [Qt] Expose the editing behavior setting in DRT to test all editing code paths
+        https://bugs.webkit.org/show_bug.cgi?id=39680
+
+        Add support to Qt's DRT to setting the editing behavior. Patch is a follow up of
+        bug 38603, which just stubbed out the Qt bits of it.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp: Implementation of editing behavior control.
+        (DumpRenderTreeSupportQt::setEditingBehavior):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2010-05-24  Robert Hogan  <robert@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -472 +472 @@
 }
 
+void DumpRenderTreeSupportQt::setEditingBehavior(QWebPage* page, const QString& editingBehavior)
+{
+    WebCore::EditingBehavior coreEditingBehavior;
+
+    if (editingBehavior == "win")
+        coreEditingBehavior = EditingWindowsBehavior;
+    else if (editingBehavior == "mac")
+        coreEditingBehavior = EditingMacBehavior;
+
+    Page* corePage = QWebPagePrivate::core(page);
+    if (!corePage)
+        return;
+
+    corePage->settings()->setEditingBehavior(coreEditingBehavior);
+}
+
 void DumpRenderTreeSupportQt::dumpFrameLoader(bool b)
 {

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -79 +79 @@
     static bool hasDocumentElement(QWebFrame* frame);
     static bool elementDoesAutoCompleteForElementWithId(QWebFrame* frame, const QString& elementId);
+    static void setEditingBehavior(QWebPage* page, const QString& editingBehavior);
 
     static void whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-05-25  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Ojan Vafai.
+
+        [Qt] Expose the editing behavior setting in DRT to test all editing code paths
+        https://bugs.webkit.org/show_bug.cgi?id=39680
+
+        Implement LayoutTestController::setEditingBehavior in Qt's DRT.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setEditingBehavior):
+
 2010-05-25  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -458 +458 @@
     DumpRenderTreeSupportQt::resetOriginAccessWhiteLists();
 
+    // Qt defaults to Windows editing behavior.
+    DumpRenderTreeSupportQt::setEditingBehavior(m_page, "win");
+
     QLocale::setDefault(QLocale::c());
     setlocale(LC_ALL, "");

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -641 +641 @@
 void LayoutTestController::setEditingBehavior(const QString& editingBehavior)
 {
-    // FIXME: Implement.
+    DumpRenderTreeSupportQt::setEditingBehavior(m_drt->webPage(), editingBehavior);
 }