[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 15:54:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 992caacc7fe6c6f670fd76a6d144bb1c64e37171
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 15:52:25 2010 +0000
2010-11-16 Andras Becsi <abecsi at inf.u-szeged.hu>
Reviewed by Csaba Osztrogonác.
[Qt] Add isPrinting and setPrinting methods to DRT's LayoutTestController.
Add previously removed expected file, png and checksum.
* platform/qt/Skipped:
* platform/qt/printing/page-rule-in-media-query-expected.checksum: Added.
* platform/qt/printing/page-rule-in-media-query-expected.png: Added.
* platform/qt/printing/page-rule-in-media-query-expected.txt: Added.
2010-11-16 Andras Becsi <abecsi at inf.u-szeged.hu>
Reviewed by Csaba Osztrogonác.
[Qt] Add isPrinting and setPrinting methods to DRT's LayoutTestController.
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::reset):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
(LayoutTestController::isPrinting):
(LayoutTestController::setPrinting):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72098 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0436d2e..48e9942 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16 Andras Becsi <abecsi at inf.u-szeged.hu>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Add isPrinting and setPrinting methods to DRT's LayoutTestController.
+ Add previously removed expected file, png and checksum.
+
+ * platform/qt/Skipped:
+ * platform/qt/printing/page-rule-in-media-query-expected.checksum: Added.
+ * platform/qt/printing/page-rule-in-media-query-expected.png: Added.
+ * platform/qt/printing/page-rule-in-media-query-expected.txt: Added.
+
2010-11-15 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index f25a73a..26922d1 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -714,9 +714,6 @@ fast/encoding/mailto-always-utf-8.html
# Missing layoutTestController.setAlwaysAcceptCookies()
http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html
-# Missing layoutTestController.setPrinting()
-printing/page-rule-in-media-query.html
-
# Missing layoutTestController.setUseDashboardCompatibilityMode()
http/tests/xmlhttprequest/default-content-type-dashboard.html
http/tests/xmlhttprequest/svg-created-by-xhr-disallowed-in-dashboard.html
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum
new file mode 100644
index 0000000..fd950e5
--- /dev/null
+++ b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum
@@ -0,0 +1 @@
+5cc776ab7988e5332b34fa11ad78e0b2
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png
new file mode 100644
index 0000000..7e1e85a
Binary files /dev/null and b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png differ
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt
new file mode 100644
index 0000000..bdc6edb
--- /dev/null
+++ b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (1,1) size 798x75
+ RenderBlock {HTML} at (1,1) size 798x75
+ RenderBody {BODY} at (1,1) size 796x73
+ RenderBlock {DIV} at (1,0) size 794x73 [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 792x21
+ RenderText {#text} at (0,0) size 42x21
+ text run at (0,0) width 42: "DIV 1"
+ RenderBlock {DIV} at (2,23) size 790x48 [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 788x21
+ RenderText {#text} at (0,0) size 42x21
+ text run at (0,0) width 42: "DIV 2"
+ RenderBlock {DIV} at (2,23) size 786x23 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 344x21
+ text run at (1,1) width 344: "The margins of divs should remain 1px in printing."
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bbc4094..b182e1f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16 Andras Becsi <abecsi at inf.u-szeged.hu>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Add isPrinting and setPrinting methods to DRT's LayoutTestController.
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::reset):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+ (LayoutTestController::isPrinting):
+ (LayoutTestController::setPrinting):
+
2010-11-16 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 3e50e06..78ed591 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -69,6 +69,7 @@ void LayoutTestController::reset()
m_desktopNotificationAllowedOrigins.clear();
m_ignoreDesktopNotification = false;
m_isGeolocationPermissionSet = false;
+ m_isPrinting = false;
m_geolocationPermission = false;
DumpRenderTreeSupportQt::dumpEditingCallbacks(false);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index dfb12fe..5c17624 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -71,6 +71,7 @@ public:
bool shouldDumpTitleChanges() const { return m_dumpTitleChanges; }
bool waitForPolicy() const { return m_waitForPolicy; }
bool ignoreReqestForPermission() const { return m_ignoreDesktopNotification; }
+ bool isPrinting() { return m_isPrinting; }
void reset();
@@ -95,6 +96,7 @@ public slots:
void dumpDatabaseCallbacks() { m_dumpDatabaseCallbacks = true; }
void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
void setCanOpenWindows() { m_canOpenWindows = true; }
+ void setPrinting() { m_isPrinting = true; }
void waitUntilDone();
QString counterValueForElementById(const QString& id);
int webHistoryItemCount();
@@ -267,6 +269,7 @@ private:
bool m_globalFlag;
bool m_userStyleSheetEnabled;
bool m_isGeolocationPermissionSet;
+ bool m_isPrinting;
bool m_geolocationPermission;
QUrl m_userStyleSheetLocation;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list