Added QPainter::clipBoundingRect() which is significantly faster

than QPainter::clipRegion().boundingRect().

Task: http://bugreports.qt.nokia.com/browse/QTBUG-12618
Reviewed-by: Kim

1 files changed, 37 insertions, 0 deletions

diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index f358681..9ed212f 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -168,6 +168,8 @@ private slots:
 
     void clippedText();
 
+    void clipBoundingRect();
+
     void setOpacity_data();
     void setOpacity();
 
@@ -4522,6 +4524,41 @@ void tst_QPainter::QTBUG5939_attachPainterPrivate()
     QCOMPARE(widget->deviceTransform, proxy->deviceTransform);
 }
 
+void tst_QPainter::clipBoundingRect()
+{
+    QPixmap pix(500, 500);
+
+    QPainter p(&pix);
+
+    // Test a basic rectangle
+    p.setClipRect(100, 100, 200, 100);
+    QVERIFY(p.clipBoundingRect().contains(QRectF(100, 100, 200, 100)));
+    QVERIFY(!p.clipBoundingRect().contains(QRectF(50, 50, 300, 200)));
+    p.setClipRect(120, 120, 20, 20, Qt::IntersectClip);
+    QVERIFY(p.clipBoundingRect().contains(QRect(120, 120, 20, 20)));
+    QVERIFY(!p.clipBoundingRect().contains(QRectF(100, 100, 200, 100)));
+
+    // Test a basic path + region
+    QPainterPath path;
+    path.addRect(100, 100, 200, 100);
+    p.setClipPath(path);
+    QVERIFY(p.clipBoundingRect().contains(QRectF(100, 100, 200, 100)));
+    QVERIFY(!p.clipBoundingRect().contains(QRectF(50, 50, 300, 200)));
+    p.setClipRegion(QRegion(120, 120, 20, 20), Qt::IntersectClip);
+    QVERIFY(p.clipBoundingRect().contains(QRect(120, 120, 20, 20)));
+    QVERIFY(!p.clipBoundingRect().contains(QRectF(100, 100, 200, 100)));
+
+    p.setClipRect(0, 0, 500, 500);
+    p.translate(250, 250);
+    for (int i=0; i<360; ++i) {
+        p.rotate(1);
+        p.setClipRect(-100, -100, 200, 200, Qt::IntersectClip);
+    }
+    QVERIFY(p.clipBoundingRect().contains(QRectF(-100, -100, 200, 200)));
+    QVERIFY(!p.clipBoundingRect().contains(QRectF(-250, -250, 500, 500)));
+
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"