[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 c85abf5127a3d967038704f397f2c60688012542
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 19:56:37 2003 +0000

    	First-letter can be floated.  Make sure we mutate the display
    	to BLOCK so that we don't make an inline when we're floating.
    	Fixes bug 3186004.
    
            Reviewed by darin
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 32ccd09..a1a4f2e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-03-31  David Hyatt  <hyatt at apple.com>
+
+	First-letter can be floated.  Make sure we mutate the display
+	to BLOCK so that we don't make an inline when we're floating.
+	Fixes bug 3186004.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
 2003-03-31  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 32ccd09..a1a4f2e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-03-31  David Hyatt  <hyatt at apple.com>
+
+	First-letter can be floated.  Make sure we mutate the display
+	to BLOCK so that we don't make an inline when we're floating.
+	Fixes bug 3186004.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
 2003-03-31  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 9065de4..b3cf5bd 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -116,9 +116,9 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
             RenderText* newTextChild = static_cast<RenderText*>(textChild);
         //kdDebug( 6040 ) << "first letter" << endl;
 
-            pseudoStyle->setDisplay( INLINE );
+            // Force inline display (except for floating first-letters)
+            pseudoStyle->setDisplay( pseudoStyle->isFloating() ? BLOCK : INLINE);
             pseudoStyle->setPosition( STATIC ); // CSS2 says first-letter can't be positioned.
-            pseudoStyle->setFloating( FNONE ); // CSS2 says first-letter can't be floated.
             
             RenderObject* firstLetter = RenderFlow::createFlow(0, pseudoStyle, renderArena()); // anonymous box
             firstLetterContainer->addChild(firstLetter, firstLetterContainer->firstChild());
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index 45792af..c25afc9 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -555,7 +555,7 @@ void AutoTableLayout::calcMinMaxWidth()
         totalpct = 99;
     
     maxNonPercent = (maxNonPercent * 100 + 50) / (100-totalpct);
-	maxWidth = kMax( maxNonPercent,  maxWidth );
+    maxWidth = kMax( maxNonPercent,  maxWidth );
    
     maxWidth = kMax( maxWidth, maxPercent );
     maxWidth = kMax( maxWidth, spanMaxWidth );

-- 
WebKit Debian packaging