[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 8d4c865cef09131008ebbc72a61aa1eb3917c3c3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 21:22:22 2003 +0000

    	Make quirk bits part of the bitfield to shrink RenderFlows.
    
            Reviewed by trey
    
            * khtml/rendering/render_flow.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 338795e..42dfc0f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2003-01-30  David Hyatt  <hyatt at apple.com>
 
+	Make quirk bits part of the bitfield to shrink RenderFlows.
+	
+        Reviewed by trey
+
+        * khtml/rendering/render_flow.h:
+
+2003-01-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3155954.  Make sure no layers get made for :before,
 	:after or :first-letter.  The only debatable case is whether
 	overflow can apply to generated content.  Included a FIXME
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 338795e..42dfc0f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-01-30  David Hyatt  <hyatt at apple.com>
 
+	Make quirk bits part of the bitfield to shrink RenderFlows.
+	
+        Reviewed by trey
+
+        * khtml/rendering/render_flow.h:
+
+2003-01-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3155954.  Make sure no layers get made for :before,
 	:after or :first-letter.  The only debatable case is whether
 	overflow can apply to generated content.  Included a FIXME
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 91256a2..18112b3 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -254,13 +254,13 @@ private:
     bool m_pre            : 1;
     bool firstLine        : 1; // used in inline layouting
     EClear m_clearStatus  : 2; // used during layuting of paragraphs
-     
+    bool m_topMarginQuirk : 1;
+    bool m_bottomMarginQuirk : 1;
+    
     short m_maxTopPosMargin;
     short m_maxTopNegMargin;
     short m_maxBottomPosMargin;
     short m_maxBottomNegMargin;
-    bool m_topMarginQuirk;
-    bool m_bottomMarginQuirk;
     
     // How much content overflows out of our block vertically or horizontally (all we support
     // for now is spillage out of the bottom and the right, which are the common cases).

-- 
WebKit Debian packaging