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

Sat Sep 26 06:31:16 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 34389c6613e5e62a5649354f93d50c40d0e8430d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 14 21:59:51 2002 +0000

    	Fix marginwidth and marginheight on the <body> element.
    	These attributes were not applying the correct margins,
    	which would cause many many pages to mis-render!
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLBodyElementImpl::parseAttribute):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a320522..8748104 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	Fix marginwidth and marginheight on the <body> element.
+	These attributes were not applying the correct margins,
+	which would cause many many pages to mis-render!
+	
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLBodyElementImpl::parseAttribute):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Ensure that a rendering object gets built for <fieldset>
 	elements.  Content inside a <fieldset> was being discarded
 	and not rendered.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a320522..8748104 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	Fix marginwidth and marginheight on the <body> element.
+	These attributes were not applying the correct margins,
+	which would cause many many pages to mis-render!
+	
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLBodyElementImpl::parseAttribute):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Ensure that a rendering object gets built for <fieldset>
 	elements.  Content inside a <fieldset> was being discarded
 	and not rendered.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a320522..8748104 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	Fix marginwidth and marginheight on the <body> element.
+	These attributes were not applying the correct margins,
+	which would cause many many pages to mis-render!
+	
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLBodyElementImpl::parseAttribute):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Ensure that a rendering object gets built for <fieldset>
 	elements.  Content inside a <fieldset> was being discarded
 	and not rendered.
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 1bae529..ba9484d 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -84,14 +84,18 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     }
     case ATTR_MARGINWIDTH:
+        // Marginwidth applies to both left and right margins -dwh
         addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() );
+        addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value());
         /* nobreak; */
     case ATTR_LEFTMARGIN:
         addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() );
         break;
     case ATTR_MARGINHEIGHT:
+        // Marginheight applies to both top and bottom margins -dwh 
         addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value());
-        /* nobreak */
+        addCSSLength(CSS_PROP_MARGIN_TOP, attr->value());
+	/* nobreak */
     case ATTR_TOPMARGIN:
         addCSSLength(CSS_PROP_MARGIN_TOP, attr->value());
         break;

-- 
WebKit Debian packaging

