Changeset 73714 in webkit

Timestamp:

Dec 10, 2010 3:04:34 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-10 Joone Hur <​joone@kldp.org>

Reviewed by Eric Seidel.

[GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
​https://bugs.webkit.org/show_bug.cgi?id=50783

Unskip the following test cases:
printing/page-rule-selection.html
printing/page-format-data.html

• platform/gtk/Skipped:

2010-12-10 Joone Hur <​joone@kldp.org>

Reviewed by Eric Seidel.

[GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
​https://bugs.webkit.org/show_bug.cgi?id=50783

This patch allows to unskip the following test cases:
printing/page-rule-selection.html
printing/page-format-data.html

• WebCoreSupport/DumpRenderTreeSupportGtk.cpp: (DumpRenderTreeSupportGtk::pageProperty): Added. (DumpRenderTreeSupportGtk::isPageBoxVisible): Ditto. (DumpRenderTreeSupportGtk::pageSizeAndMarginsInPixels): Ditto. (DumpRenderTreeSupportGtk::addUserStyleSheet): Ditto.
• WebCoreSupport/DumpRenderTreeSupportGtk.h:

2010-12-10 Joone Hur <​joone@kldp.org>

Reviewed by Eric Seidel.

[GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
​https://bugs.webkit.org/show_bug.cgi?id=50783

This patch allows to unskip the following test cases:
printing/page-rule-selection.html
printing/page-format-data.html

• DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::pageProperty): Added. (LayoutTestController::isPageBoxVisible): Ditto. (LayoutTestController::pageSizeAndMarginsInPixels): Ditto. (LayoutTestController::addUserStyleSheet): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (modified) (3 diffs)
• WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-10  Joone Hur  <joone@kldp.org>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=50783
+
+        Unskip the following test cases:
+        printing/page-rule-selection.html
+        printing/page-format-data.html
+        * platform/gtk/Skipped:
+
 2010-12-10  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5121 +5121 @@
 fast/dom/HTMLLinkElement/prefetch-onload.html
 
-# LayoutTestController::pageProperty is not implemented for GTK yet.
-printing/page-rule-selection.html
-
-# LayoutTestController::isPageBoxVisible, pageAreaRectInPixels, and preferredPageSizeInPixels are not implemented yet for GTK.
-printing/page-format-data.html
-
 # Gtk seems to be pumping the lexer an extra time revealed by turning on the
 # HTML5 Lexer in r61234.

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-12-10  Joone Hur  <joone@kldp.org>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=50783
+        
+        This patch allows to unskip the following test cases:
+        printing/page-rule-selection.html
+        printing/page-format-data.html
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::pageProperty): Added.
+        (DumpRenderTreeSupportGtk::isPageBoxVisible): Ditto.
+        (DumpRenderTreeSupportGtk::pageSizeAndMarginsInPixels): Ditto.
+        (DumpRenderTreeSupportGtk::addUserStyleSheet): Ditto.
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
 2010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

@@ -40 +40 @@
 #include "JSValue.h"
 #include "NodeList.h"
+#include "PageGroup.h"
 #include "PlatformString.h"
 #include "PrintContext.h"
@@ -55 +56 @@
 #include "webkitwebview.h"
 #include "webkitwebframe.h"
+#include "DOMWrapperWorld.h"
 #include <JavaScriptCore/APICast.h>
 
@@ -239 +241 @@
 
     return PrintContext::numberOfPages(coreFrame, FloatSize(pageWidth, pageHeight));
+}
+
+/**
+ * pageProperty
+ * @frame: a #WebKitWebFrame
+ * @propertyName: name of a property
+ * @pageNumber: number of a page 
+ *
+ * Return value: The value of the given property name.
+ */
+CString DumpRenderTreeSupportGtk::pageProperty(WebKitWebFrame* frame, const char* propertyName, int pageNumber)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), CString());
+
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
+        return CString();
+
+    return PrintContext::pageProperty(coreFrame, propertyName, pageNumber).utf8();
+}
+
+/**
+ * isPageBoxVisible
+ * @frame: a #WebKitWebFrame
+ * @pageNumber: number of a page 
+ *
+ * Return value: TRUE if a page box is visible. 
+ */
+bool DumpRenderTreeSupportGtk::isPageBoxVisible(WebKitWebFrame* frame, int pageNumber)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), false);
+
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
+        return false;
+
+    return coreFrame->document()->isPageBoxVisible(pageNumber); 
+}
+
+/**
+ * pageSizeAndMarginsInPixels
+ * @frame: a #WebKitWebFrame
+ * @pageNumber: number of a page 
+ * @width: width of a page
+ * @height: height of a page
+ * @marginTop: top margin of a page
+ * @marginRight: right margin of a page
+ * @marginBottom: bottom margin of a page
+ * @marginLeft: left margin of a page
+ *
+ * Return value: The value of page size and margin.
+ */
+CString DumpRenderTreeSupportGtk::pageSizeAndMarginsInPixels(WebKitWebFrame* frame, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), CString());
+
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
+        return CString();
+
+    return PrintContext::pageSizeAndMarginsInPixels(coreFrame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft).utf8();
+}
+
+/**
+ * addUserStyleSheet
+ * @frame: a #WebKitWebFrame
+ * @sourceCode: code of a user stylesheet
+ *
+ */
+void DumpRenderTreeSupportGtk::addUserStyleSheet(WebKitWebFrame* frame, const char* sourceCode)
+{
+    g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
+
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
+        return;
+
+    WebKitWebView* webView = getViewFromFrame(frame);
+    Page* page = core(webView);
+    page->group().addUserStyleSheetToWorld(mainThreadNormalWorld(), sourceCode, KURL(), 0, 0, WebCore::InjectInAllFrames); 
 }
 

trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

@@ -51 +51 @@
     static int pageNumberForElementById(WebKitWebFrame* frame, const char* id, float pageWidth, float pageHeight);
     static int numberOfPagesForFrame(WebKitWebFrame* frame, float pageWidth, float pageHeight);
+    static WTF::CString pageProperty(WebKitWebFrame* frame, const char* propertyName, int pageNumber);
+    static bool isPageBoxVisible(WebKitWebFrame* frame, int pageNumber);
+    static WTF::CString pageSizeAndMarginsInPixels(WebKitWebFrame* mainFrame, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
+    static void addUserStyleSheet(WebKitWebFrame* mainFrame, const char* sourceCode);
     static guint getPendingUnloadEventCount(WebKitWebFrame* frame);
     static bool pauseAnimation(WebKitWebFrame* frame, const char* name, double time, const char* element);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-10  Joone Hur  <joone@kldp.org>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=50783
+
+        This patch allows to unskip the following test cases:
+        printing/page-rule-selection.html
+        printing/page-format-data.html
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::pageProperty): Added.
+        (LayoutTestController::isPageBoxVisible): Ditto.
+        (LayoutTestController::pageSizeAndMarginsInPixels): Ditto.
+        (LayoutTestController::addUserStyleSheet): Ditto.
+
 2010-12-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

@@ -153 +153 @@
 JSRetainPtr<JSStringRef> LayoutTestController::pageProperty(const char* propertyName, int pageNumber) const
 {
-    // FIXME: implement
-    return JSRetainPtr<JSStringRef>();
+    JSRetainPtr<JSStringRef> propertyValue(Adopt, JSStringCreateWithUTF8CString(DumpRenderTreeSupportGtk::pageProperty(mainFrame, propertyName, pageNumber).data()));
+    return propertyValue;
 }
 
 bool LayoutTestController::isPageBoxVisible(int pageNumber) const
 {
-    // FIXME: implement
-    return false;
+    return DumpRenderTreeSupportGtk::isPageBoxVisible(mainFrame, pageNumber);
 }
 
 JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) const
 {
-    // FIXME: implement
-    return JSRetainPtr<JSStringRef>();
+    JSRetainPtr<JSStringRef> propertyValue(Adopt, JSStringCreateWithUTF8CString(DumpRenderTreeSupportGtk::pageSizeAndMarginsInPixels(mainFrame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft).data()));
+    return propertyValue;
 }
 
@@ -717 +716 @@
 void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
 {
-    printf("LayoutTestController::addUserStyleSheet not implemented.\n");
+    GOwnPtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
+    DumpRenderTreeSupportGtk::addUserStyleSheet(mainFrame, sourceCode.get());
 }