Changeset 57963 in webkit

Timestamp:

Apr 21, 2010 3:54:46 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Unskip a bunch of now passing tests, which was skipped because of
missing LayoutTestController::computedStyleIncludingVisitedInfo
​https://bugs.webkit.org/show_bug.cgi?id=37759

• platform/qt/Skipped:

2010-04-21 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Add LayoutTestController interface: computedStyleIncludingVisitedInfo
​https://bugs.webkit.org/show_bug.cgi?id=37759

• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo):
• WebCoreSupport/DumpRenderTreeSupportQt.h:

2010-04-21 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Add LayoutTestController interface: computedStyleIncludingVisitedInfo
​https://bugs.webkit.org/show_bug.cgi?id=37759

• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::computedStyleIncludingVisitedInfo):
• DumpRenderTree/qt/LayoutTestControllerQt.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-21  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Unskip a bunch of now passing tests, which was skipped because of 
+        missing LayoutTestController::computedStyleIncludingVisitedInfo
+        https://bugs.webkit.org/show_bug.cgi?id=37759
+
+        * platform/qt/Skipped:
+
 2010-04-21  Alejandro G. Castro  <alex@igalia.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -337 +337 @@
 # Missing layoutTestController.evaluateScriptInIsolatedWorld()
 storage/open-database-creation-callback-isolated-world.html
-
-# Missing layoutTestController.computedStyleIncludingVisitedInfo()
-fast/history/multiple-classes-visited.html
-fast/history/nested-visited-test.html
-fast/history/self-is-visited.html
-fast/history/sibling-visited-test.html
 
 # Missing layoutTestController.dumpWillCacheResponse

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-21  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add LayoutTestController interface: computedStyleIncludingVisitedInfo
+        https://bugs.webkit.org/show_bug.cgi?id=37759
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2010-04-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -24 +24 @@
 #include "DumpRenderTreeSupportQt.h"
 
+#include "CSSComputedStyleDeclaration.h"
 #include "ContextMenu.h"
 #include "ContextMenuClientQt.h"
@@ -365 +366 @@
     return page->handle()->page->focusController()->focusedOrMainFrame()->editor()->command(name).isEnabled();
 }
+
+QVariantMap DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(QWebFrame* frame, const QString& id)
+{
+    QVariantMap ret;
+    Frame* coreFrame = QWebFramePrivate::core(frame);
+    if (!coreFrame)
+        return ret;
+
+    Element* element = coreFrame->document()->getElementById(AtomicString(id));
+    if (!element)
+        return ret;
+
+    RefPtr<CSSComputedStyleDeclaration> style = computedStyle(element, true);
+    for (int i = 0; i < style->length(); i++) {
+        QString name = style->item(i);
+        QString value = (static_cast<CSSStyleDeclaration*>(style.get()))->getPropertyValue(name);
+        ret[name] = QVariant(value);
+    }
+    return ret;
+}
+

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -25 +25 @@
 
 #include "qwebkitglobal.h"
+#include <QVariant>
 
 class QWebPage;
@@ -79 +80 @@
 
     static int workerThreadCount();
+    static QVariantMap computedStyleIncludingVisitedInfo(QWebFrame* frame, const QString& id);
 };
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add LayoutTestController interface: computedStyleIncludingVisitedInfo
+        https://bugs.webkit.org/show_bug.cgi?id=37759
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::computedStyleIncludingVisitedInfo):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -36 +36 @@
 #include <QDir>
 #include <QLocale>
+#include <QMap>
 #include <qwebsettings.h>
 
@@ -610 +611 @@
 }
 
+QVariantMap LayoutTestController::computedStyleIncludingVisitedInfo(const QVariant& obj) const
+{
+    QMap<QString, QVariant> map = obj.toMap();
+    QString id = map.value("id").toString();
+
+    return DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(m_drt->webPage()->mainFrame(), id);
+}
+
 const unsigned LayoutTestController::maxViewWidth = 800;
 const unsigned LayoutTestController::maxViewHeight = 600;

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -176 +176 @@
     int numberOfPages(float width = maxViewWidth, float height = maxViewHeight);
     bool callShouldCloseOnWebView();
+    QVariantMap computedStyleIncludingVisitedInfo(const QVariant& obj) const;
 
     /*