Changeset 110960 in webkit

Timestamp:

Mar 16, 2012, 1:00:22 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Gtk] Add computedStyleIncludingVisitedInfo to DumpRenderTreeSupport
​https://bugs.webkit.org/show_bug.cgi?id=81232

Patch by Zan Dobersek <​zandobersek@gmail.com> on 2012-03-16
Reviewed by Philippe Normand.

Source/WebKit/gtk:

Add computedStyleIncludingVisitedInfo helper method to
DumpRenderTreeSupportGtk.

• WebCoreSupport/DumpRenderTreeSupportGtk.cpp:

(DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo):

• WebCoreSupport/DumpRenderTreeSupportGtk.h:

(DumpRenderTreeSupportGtk):

Tools:

Use the newly-added helper method in DumpRenderTreeSupportGtk.

• DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:

(LayoutTestController::computedStyleIncludingVisitedInfo):

LayoutTests:

Unskip now-passing tests.

• platform/gtk/Skipped:
• platform/gtk/fast/history/nested-visited-test-expected.txt: Removed.
• platform/gtk/fast/history/self-is-visited-expected.txt: Removed.
• platform/gtk/fast/history/sibling-visited-test-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/gtk/fast/history/nested-visited-test-expected.txt (deleted)
• LayoutTests/platform/gtk/fast/history/self-is-visited-expected.txt (deleted)
• LayoutTests/platform/gtk/fast/history/sibling-visited-test-expected.txt (deleted)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (modified) (3 diffs)
• Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-16  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Add computedStyleIncludingVisitedInfo to DumpRenderTreeSupport
+        https://bugs.webkit.org/show_bug.cgi?id=81232
+
+        Reviewed by Philippe Normand.
+
+        Unskip now-passing tests.
+
+        * platform/gtk/Skipped:
+        * platform/gtk/fast/history/nested-visited-test-expected.txt: Removed.
+        * platform/gtk/fast/history/self-is-visited-expected.txt: Removed.
+        * platform/gtk/fast/history/sibling-visited-test-expected.txt: Removed.
+
 2012-03-16  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1139 +1139 @@
 animations/stop-animation-on-suspend.html
 
-# computedStyleIncludingVisitedInfo is not implemented
-# https://bugs.webkit.org/show_bug.cgi?id=37336
-fast/history/nested-visited-test.html
-fast/history/self-is-visited.html
-fast/history/sibling-visited-test.html
-fast/history/multiple-classes-visited.html
-fast/loader/stateobjects/state-url-sets-links-visited.html
-
 # Rounding color problems inside pixman
 # https://bugs.webkit.org/show_bug.cgi?id=49964

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-03-16  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Add computedStyleIncludingVisitedInfo to DumpRenderTreeSupport
+        https://bugs.webkit.org/show_bug.cgi?id=81232
+
+        Reviewed by Philippe Normand.
+
+        Add computedStyleIncludingVisitedInfo helper method to
+        DumpRenderTreeSupportGtk.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo):
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+        (DumpRenderTreeSupportGtk):
+
 2012-03-16  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

@@ -27 +27 @@
 #include "AccessibilityObject.h"
 #include "AnimationController.h"
+#include "CSSComputedStyleDeclaration.h"
 #include "DOMWrapperWorld.h"
 #include "Document.h"
@@ -42 +43 @@
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
+#include "JSCSSStyleDeclaration.h"
 #include "JSDOMWindow.h"
 #include "JSDocument.h"
@@ -889 +891 @@
 }
 
+JSValueRef DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo(JSContextRef context, JSValueRef nodeObject)
+{
+    JSC::ExecState* exec = toJS(context);
+    if (!nodeObject)
+        return JSValueMakeUndefined(context);
+
+    JSValue jsValue = toJS(exec, nodeObject);
+    if (!jsValue.inherits(&JSElement::s_info))
+        return JSValueMakeUndefined(context);
+
+    JSElement* jsElement = static_cast<JSElement*>(asObject(jsValue));
+    Element* element = jsElement->impl();
+    RefPtr<CSSComputedStyleDeclaration> style = CSSComputedStyleDeclaration::create(element, true);
+    return toRef(exec, toJS(exec, jsElement->globalObject(), style.get()));
+}
+
 void DumpRenderTreeSupportGtk::deliverAllMutationsIfNecessary()
 {

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

@@ -84 +84 @@
     static bool shouldClose(WebKitWebFrame*);
     static bool elementDoesAutoCompleteForElementWithId(WebKitWebFrame*, JSStringRef);
+    static JSValueRef computedStyleIncludingVisitedInfo(JSContextRef, JSValueRef);
 
     // WebKitWebView

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-16  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Add computedStyleIncludingVisitedInfo to DumpRenderTreeSupport
+        https://bugs.webkit.org/show_bug.cgi?id=81232
+
+        Reviewed by Philippe Normand.
+
+        Use the newly-added helper method in DumpRenderTreeSupportGtk.
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::computedStyleIncludingVisitedInfo):
+
 2012-03-15  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

@@ -121 +121 @@
 JSValueRef LayoutTestController::computedStyleIncludingVisitedInfo(JSContextRef context, JSValueRef value)
 {
-    // FIXME: Implement this.
-    return JSValueMakeUndefined(context);
+    return DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo(context, value);
 }