Changeset 56328 in webkit

Timestamp:

Mar 22, 2010 2:43:28 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-22 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Simon Hausmann.

[Qt] REGRESSION (r56209): fast/media/print-restores-previous-mediatype.htm crashes
​https://bugs.webkit.org/show_bug.cgi?id=36386

• platform/qt/Skipped: unskip the test as it now passes.

2010-03-22 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Simon Hausmann.

[Qt] REGRESSION (r56209): fast/media/print-restores-previous-mediatype.htm crashes
​https://bugs.webkit.org/show_bug.cgi?id=36386

Fix the regression by implementing a null printer for Qt DRT.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::NullPrinter::NullPaintEngine::begin): (WebCore::NullPrinter::NullPaintEngine::end): (WebCore::NullPrinter::NullPaintEngine::type): (WebCore::NullPrinter::NullPaintEngine::drawPixmap): (WebCore::NullPrinter::NullPaintEngine::updateState): (WebCore::NullPrinter::paintEngine): (WebCore::DumpRenderTree::dryRunPrint):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-22  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] REGRESSION (r56209): fast/media/print-restores-previous-mediatype.htm crashes
+        https://bugs.webkit.org/show_bug.cgi?id=36386
+
+        * platform/qt/Skipped: unskip the test as it now passes.
+
 2010-03-21  Dmitry Gorbik  <socket.h@gmail.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5111 +5111 @@
 animations/simultaneous-start-left.html
 
-# [Qt] REGRESSION (r56209): fast/media/print-restores-previous-mediatype.htm crashes
-# https://bugs.webkit.org/show_bug.cgi?id=36386
-fast/media/print-restores-previous-mediatype.html
-
 # [Qt] Back-forward list dumping is incorrect
 # https://bugs.webkit.org/show_bug.cgi?id=36392

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-22  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] REGRESSION (r56209): fast/media/print-restores-previous-mediatype.htm crashes
+        https://bugs.webkit.org/show_bug.cgi?id=36386
+
+        Fix the regression by implementing a null printer for Qt DRT.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::NullPrinter::NullPaintEngine::begin):
+        (WebCore::NullPrinter::NullPaintEngine::end):
+        (WebCore::NullPrinter::NullPaintEngine::type):
+        (WebCore::NullPrinter::NullPaintEngine::drawPixmap):
+        (WebCore::NullPrinter::NullPaintEngine::updateState):
+        (WebCore::NullPrinter::paintEngine):
+        (WebCore::DumpRenderTree::dryRunPrint):
+
 2010-03-20  Martin Robinson  <mrobinson@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -52 +52 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QPaintDevice>
+#include <QPaintEngine>
 #include <QPrinter>
 #include <QUndoStack>
@@ -114 +116 @@
 }
 #endif
+
+
+class NullPrinter : public QPrinter {
+public:
+    class NullPaintEngine : public QPaintEngine {
+    public:
+        virtual bool begin(QPaintDevice*) { return true; }
+        virtual bool end() { return true; }
+        virtual QPaintEngine::Type type() const { return QPaintEngine::User; }
+        virtual void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) { }
+        virtual void updateState(const QPaintEngineState& state) { }
+    };
+
+    virtual QPaintEngine* paintEngine() const { return const_cast<NullPaintEngine*>(&m_engine); }
+
+    NullPaintEngine m_engine;
+};
+
 
 WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
@@ -390 +410 @@
 void DumpRenderTree::dryRunPrint(QWebFrame* frame)
 {
-    QPrinter printer;
-    printer.setPaperSize(QPrinter::A4);
+    NullPrinter printer;
     frame->print(&printer);
 }