[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:46:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5eea731ce031cdc395d6892fd1896cbc4b4de9a5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 8 22:43:47 2003 +0000
Make sure that the contents width and height of the view are
used as the root height and width when a view exists. This
ensures that the root element background properly tiles over
the entire height of the document. (This used to be ensured
by growing the height of the <html> element, but that violates
the CSS2 spec.)
This fixes bugs 3317809, 3299789, and 3318066.
Reviewed by john
* khtml/rendering/render_box.cpp:
(RenderBox::paintRootBoxDecorations):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a3152f4..999b980 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-07-08 Dave Hyatt <hyatt at apple.com>
+
+ Make sure that the contents width and height of the view are
+ used as the root height and width when a view exists. This
+ ensures that the root element background properly tiles over
+ the entire height of the document. (This used to be ensured
+ by growing the height of the <html> element, but that violates
+ the CSS2 spec.)
+
+ This fixes bugs 3317809, 3299789, and 3318066.
+
+ Reviewed by john
+
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::paintRootBoxDecorations):
+
2003-07-08 Chris Blumenberg <cblu at apple.com>
* WebCore.pbproj/project.pbxproj: Xcode-ified
@@ -13,6 +29,7 @@
* khtml/html/htmltokenizer.cpp:
(HTMLTokenizer::parseTag): use tolower() to lowercase a char, don't use | 0x20 because that will cause chars like '_' to turn into junk
+>>>>>>> 1.1814
2003-07-08 Dave Hyatt <hyatt at apple.com>
Implementation of inline-block and a prototype of the XUL
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a3152f4..999b980 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-07-08 Dave Hyatt <hyatt at apple.com>
+
+ Make sure that the contents width and height of the view are
+ used as the root height and width when a view exists. This
+ ensures that the root element background properly tiles over
+ the entire height of the document. (This used to be ensured
+ by growing the height of the <html> element, but that violates
+ the CSS2 spec.)
+
+ This fixes bugs 3317809, 3299789, and 3318066.
+
+ Reviewed by john
+
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::paintRootBoxDecorations):
+
2003-07-08 Chris Blumenberg <cblu at apple.com>
* WebCore.pbproj/project.pbxproj: Xcode-ified
@@ -13,6 +29,7 @@
* khtml/html/htmltokenizer.cpp:
(HTMLTokenizer::parseTag): use tolower() to lowercase a char, don't use | 0x20 because that will cause chars like '_' to turn into junk
+>>>>>>> 1.1814
2003-07-08 Dave Hyatt <hyatt at apple.com>
Implementation of inline-block and a prototype of the XUL
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 7825979..566f64a 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -225,12 +225,15 @@ void RenderBox::paintRootBoxDecorations(QPainter *p,int, int _y,
// kdDebug(0) << "width = " << w <<endl;
int rw, rh;
- if (canvas()->view())
- rw=canvas()->view()->contentsWidth();
- else
- rw=canvas()->width();
- rh=canvas()->height();
-
+ if (canvas()->view()) {
+ rw = canvas()->view()->contentsWidth();
+ rh = canvas()->view()->contentsHeight();
+ }
+ else {
+ rw = canvas()->width();
+ rh = canvas()->height();
+ }
+
// kdDebug(0) << "rw = " << rw <<endl;
int bx = _tx - marginLeft();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list