Changeset 74220 in webkit

Timestamp:

Dec 16, 2010 5:44:53 PM (13 years ago)

Author:

ariya@webkit.org

Message:

2010-12-16 Ariya Hidayat <​ariya@sencha.com>

Reviewed by Andreas Kling.

[Qt] GraphicsContext should respect QWebView render hints
​https://bugs.webkit.org/show_bug.cgi?id=51208

GraphicsContext does not override SmoothPixmapTransform (see also
r62762). To keep the same behavior, canvas default image interpolation
quality is set to medium and QWebView's render hints by default also
include SmoothPixmapTransform.

• html/HTMLCanvasElement.h:
• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):

2010-12-16 Ariya Hidayat <​ariya@sencha.com>

Reviewed by Andreas Kling.

[Qt] GraphicsContext should respect QWebView render hints
​https://bugs.webkit.org/show_bug.cgi?id=51208

Add some checks to ensure that GraphicsContext (via QWebFrame)
does not clobber the render hints.

• Api/qwebview.cpp: (QWebViewPrivate::QWebViewPrivate):
• tests/qwebframe/tst_qwebframe.cpp:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.h (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebview.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebframe/tst_qwebframe.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-16  Ariya Hidayat  <ariya@sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext should respect QWebView render hints
+        https://bugs.webkit.org/show_bug.cgi?id=51208
+
+        GraphicsContext does not override SmoothPixmapTransform (see also
+        r62762). To keep the same behavior, canvas default image interpolation
+        quality is set to medium and QWebView's render hints by default also
+        include SmoothPixmapTransform.
+
+        * html/HTMLCanvasElement.h:
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+
 2010-12-16  Daniel Bates  <dbates@rim.com>
 

trunk/WebCore/html/HTMLCanvasElement.h

@@ -33 +33 @@
 #include "IntSize.h"
 
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) || PLATFORM(QT)
 #define DefaultInterpolationQuality InterpolationMedium
 #elif PLATFORM(CG)

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -238 +238 @@
     antiAliasingForRectsAndLines = painter->testRenderHint(QPainter::Antialiasing);
 
-    painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, true);
+    painter->setRenderHint(QPainter::Antialiasing, true);
 }
 

trunk/WebKit/qt/Api/qwebview.cpp

@@ -40 +40 @@
         : view(view)
         , page(0)
-        , renderHints(QPainter::TextAntialiasing)
+        , renderHints(QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform)
     {
         Q_ASSERT(view);
@@ -714 +714 @@
     These hints are used to initialize QPainter before painting the Web page.
 
-    QPainter::TextAntialiasing is enabled by default.
+    QPainter::TextAntialiasing and QPainter::SmoothPixmapTransform are enabled by default.
 
     \note This property is not available on Symbian. However, the getter and

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-12-16  Ariya Hidayat  <ariya@sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext should respect QWebView render hints
+        https://bugs.webkit.org/show_bug.cgi?id=51208
+
+        Add some checks to ensure that GraphicsContext (via QWebFrame)
+        does not clobber the render hints.
+
+        * Api/qwebview.cpp:
+        (QWebViewPrivate::QWebViewPrivate):
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-12-15  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -30 +30 @@
 #include <QApplication>
 #include <QComboBox>
+#include <QPaintEngine>
 #include <QPicture>
 #include <QRegExp>
@@ -617 +618 @@
     void hasSetFocus();
     void render();
+    void renderHints();
     void scrollPosition();
     void scrollToAnchor();
@@ -2858 +2860 @@
 }
 
+
+class DummyPaintEngine: public QPaintEngine {
+public:
+
+    DummyPaintEngine()
+        : QPaintEngine(QPaintEngine::AllFeatures)
+        , renderHints(0)
+    {
+    }
+
+    bool begin(QPaintDevice*)
+    {
+        setActive(true);
+        return true;
+    }
+
+    bool end()
+    {
+        setActive(false);
+        return false;
+    }
+
+    void updateState(const QPaintEngineState& state)
+    {
+        renderHints = state.renderHints();
+    }
+
+    void drawPath(const QPainterPath&) { }
+    void drawPixmap(const QRectF&, const QPixmap&, const QRectF&) { }
+
+    QPaintEngine::Type type() const
+    {
+        return static_cast<QPaintEngine::Type>(QPaintEngine::User + 2);
+    }
+
+    QPainter::RenderHints renderHints;
+};
+
+class DummyPaintDevice: public QPaintDevice {
+public:
+    DummyPaintDevice()
+        : QPaintDevice()
+        , m_engine(new DummyPaintEngine)
+    {
+    }
+
+    ~DummyPaintDevice()
+    {
+        delete m_engine;
+    }
+
+    QPaintEngine* paintEngine() const
+    {
+        return m_engine;
+    }
+
+    QPainter::RenderHints renderHints() const
+    {
+        return m_engine->renderHints;
+    }
+
+protected:
+    int metric(PaintDeviceMetric metric) const;
+
+private:
+    DummyPaintEngine* m_engine;
+    friend class DummyPaintEngine;
+};
+
+
+int DummyPaintDevice::metric(PaintDeviceMetric metric) const
+{
+    switch (metric) {
+    case PdmWidth:
+        return 400;
+        break;
+
+    case PdmHeight:
+        return 200;
+        break;
+
+    case PdmNumColors:
+        return INT_MAX;
+        break;
+
+    case PdmDepth:
+        return 32;
+        break;
+
+    default:
+        break;
+    }
+    return 0;
+}
+
+void tst_QWebFrame::renderHints()
+{
+    QString html("<html><body><p>Hello, world!</p></body></html>");
+
+    QWebPage page;
+    page.mainFrame()->setHtml(html);
+    page.setViewportSize(page.mainFrame()->contentsSize());
+
+    // We will call frame->render and trap the paint engine state changes
+    // to ensure that GraphicsContext does not clobber the render hints.
+    DummyPaintDevice buffer;
+    QPainter painter(&buffer);
+
+    painter.setRenderHint(QPainter::TextAntialiasing, false);
+    page.mainFrame()->render(&painter);
+    QVERIFY(!(buffer.renderHints() & QPainter::TextAntialiasing));
+    QVERIFY(!(buffer.renderHints() & QPainter::SmoothPixmapTransform));
+    QVERIFY(!(buffer.renderHints() & QPainter::HighQualityAntialiasing));
+
+    painter.setRenderHint(QPainter::TextAntialiasing, true);
+    page.mainFrame()->render(&painter);
+    QVERIFY(buffer.renderHints() & QPainter::TextAntialiasing);
+    QVERIFY(!(buffer.renderHints() & QPainter::SmoothPixmapTransform));
+    QVERIFY(!(buffer.renderHints() & QPainter::HighQualityAntialiasing));
+
+    painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+    page.mainFrame()->render(&painter);
+    QVERIFY(buffer.renderHints() & QPainter::TextAntialiasing);
+    QVERIFY(buffer.renderHints() & QPainter::SmoothPixmapTransform);
+    QVERIFY(!(buffer.renderHints() & QPainter::HighQualityAntialiasing));
+
+    painter.setRenderHint(QPainter::HighQualityAntialiasing, true);
+    page.mainFrame()->render(&painter);
+    QVERIFY(buffer.renderHints() & QPainter::TextAntialiasing);
+    QVERIFY(buffer.renderHints() & QPainter::SmoothPixmapTransform);
+    QVERIFY(buffer.renderHints() & QPainter::HighQualityAntialiasing);
+}
+
 void tst_QWebFrame::scrollPosition()
 {