[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 16:01:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9b08b646fd076a5ef40a9a1fc78c1563d64ca88f
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 23:37:04 2010 +0000
2010-11-17 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
ScrollView: Don't translate by scrollX/scrollY or clip when paintsEntireContents()
This makes paint() with paintEntireContents() do exactly what it's supposed to:
paint from 0,0 to contentsSize().
The clipping was a no-op anyway since visibleContentRect() will return the whole
rect in paintsEntireContents() mode.
* platform/ScrollView.cpp:
(WebCore::ScrollView::paint):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7973db7..4f673ac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-17 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ ScrollView: Don't translate by scrollX/scrollY or clip when paintsEntireContents()
+
+ This makes paint() with paintEntireContents() do exactly what it's supposed to:
+ paint from 0,0 to contentsSize().
+
+ The clipping was a no-op anyway since visibleContentRect() will return the whole
+ rect in paintsEntireContents() mode.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::paint):
+
2010-11-17 Kenneth Rohde Christansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 1d1d2e2..c2fd51a 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -845,10 +845,12 @@ void ScrollView::paint(GraphicsContext* context, const IntRect& rect)
context->translate(x(), y());
documentDirtyRect.move(-x(), -y());
- context->translate(-scrollX(), -scrollY());
- documentDirtyRect.move(scrollX(), scrollY());
+ if (!paintsEntireContents()) {
+ context->translate(-scrollX(), -scrollY());
+ documentDirtyRect.move(scrollX(), scrollY());
- context->clip(visibleContentRect());
+ context->clip(visibleContentRect());
+ }
paintContents(context, documentDirtyRect);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list