[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit e7b0c35be1d3010bc39daa689a0ccb3cc0e29262
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 13 00:55:05 2002 +0000

    	Implement clipping.  The one thing that still needs
    	to be done is that the intersect method in KWQRegion.mm
    	needs to be implemented.  Even without that, this gets
    	the ticker on livepage.apple.com clipping properly.
    
            * kwq/KWQPainter.mm:
            (QPainter::xForm):
            (QPainter::save):
            (QPainter::restore):
            (QPainter::setClipRegion):
            * kwq/qt/qregion.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 184c114..90b5d5b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Implement clipping.  The one thing that still needs
+	to be done is that the intersect method in KWQRegion.mm
+	needs to be implemented.  Even without that, this gets
+	the ticker on livepage.apple.com clipping properly.
+	
+        * kwq/KWQPainter.mm:
+        (QPainter::xForm):
+        (QPainter::save):
+        (QPainter::restore):
+        (QPainter::setClipRegion):
+        * kwq/qt/qregion.h:
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Make the news ticker on livepage.apple.com scroll properly.
 	It still doesn't clip though.  Fixing this involved correctly
 	dirtying the render tree when dynamic DOM changes occurred
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 184c114..90b5d5b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Implement clipping.  The one thing that still needs
+	to be done is that the intersect method in KWQRegion.mm
+	needs to be implemented.  Even without that, this gets
+	the ticker on livepage.apple.com clipping properly.
+	
+        * kwq/KWQPainter.mm:
+        (QPainter::xForm):
+        (QPainter::save):
+        (QPainter::restore):
+        (QPainter::setClipRegion):
+        * kwq/qt/qregion.h:
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Make the news ticker on livepage.apple.com scroll properly.
 	It still doesn't clip though.  Fixing this involved correctly
 	dirtying the render tree when dynamic DOM changes occurred
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 184c114..90b5d5b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Implement clipping.  The one thing that still needs
+	to be done is that the intersect method in KWQRegion.mm
+	needs to be implemented.  Even without that, this gets
+	the ticker on livepage.apple.com clipping properly.
+	
+        * kwq/KWQPainter.mm:
+        (QPainter::xForm):
+        (QPainter::save):
+        (QPainter::restore):
+        (QPainter::setClipRegion):
+        * kwq/qt/qregion.h:
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Make the news ticker on livepage.apple.com scroll properly.
 	It still doesn't clip though.  Fixing this involved correctly
 	dirtying the render tree when dynamic DOM changes occurred
diff --git a/WebCore/force-clean-timestamp b/WebCore/force-clean-timestamp
index a298b80..f7ed11f 100644
--- a/WebCore/force-clean-timestamp
+++ b/WebCore/force-clean-timestamp
@@ -1 +1 @@
-loader changes 8/12
+DOM/Rendering Changes 8/12 -dwh
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 9cf04f0..0e162ab 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -108,15 +108,16 @@ const QBrush &QPainter::brush() const
     return data->state.brush;
 }
 
-QRect QPainter::xForm(const QRect &) const
+QRect QPainter::xForm(const QRect &aRect) const
 {
-    _logNotYetImplemented();
-    return QRect();
+    // No difference between device and model coords, so the identity transform is ok.
+    return aRect;
 }
 
 void QPainter::save()
 {
     data->stack.push(new QPState(data->state));
+    [NSGraphicsContext saveGraphicsState]; 
 }
 
 void QPainter::restore()
@@ -128,6 +129,8 @@ void QPainter::restore()
     QPState *ps = data->stack.pop();
     data->state = *ps;
     delete ps;
+
+    [NSGraphicsContext restoreGraphicsState];
 }
 
 // Draws a filled rectangle with a stroked border.
@@ -399,6 +402,7 @@ void QPainter::fillRect(int x, int y, int w, int h, const QBrush &brush)
 void QPainter::setClipRegion(const QRegion &region)
 {
     data->state.clip = region;
+    [(region.getNSBezierPath()) setClip];
 }
 
 const QRegion &QPainter::clipRegion() const
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 1f35fd5..089bdb5 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -55,6 +55,8 @@ public:
 
     QRegion &operator=(const QRegion &);
 
+    NSBezierPath* getNSBezierPath() const { return path; }
+
 private:
     NSBezierPath *path;    
 };
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index 1f35fd5..089bdb5 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -55,6 +55,8 @@ public:
 
     QRegion &operator=(const QRegion &);
 
+    NSBezierPath* getNSBezierPath() const { return path; }
+
 private:
     NSBezierPath *path;    
 };

-- 
WebKit Debian packaging