[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:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e066ecf5044ef52a15f216ba1df6b382c8c03b7c
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 22:02:28 2010 +0000
2010-11-17 Andreas Kling <kling at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
ScrollView: Let visibleContentRect() return the contentsSize() if paintsEntireContents()
* platform/ScrollView.cpp:
(WebCore::ScrollView::visibleContentRect):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72242 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index baea938..ebc620f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-17 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ ScrollView: Let visibleContentRect() return the contentsSize() if paintsEntireContents()
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::visibleContentRect):
+
2010-11-17 James Simonsen <simonjam at chromium.org>
Reviewed by Tony Chang.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 4ef0e2b..5b8ff55 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -207,6 +207,9 @@ IntRect ScrollView::visibleContentRect(bool includeScrollbars) const
if (platformWidget())
return platformVisibleContentRect(includeScrollbars);
+ if (paintsEntireContents())
+ return IntRect(IntPoint(0, 0), contentsSize());
+
if (!m_actualVisibleContentRect.isEmpty())
return m_actualVisibleContentRect;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list