[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 0caabcb93c2a850c368f1292f1aea9196cf25363
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 24 19:47:34 2003 +0000

    	ignore the float property on first-letter styles.
    	The bug # is 3186044.
    
            Reviewed by darin
    
            * khtml/css/parser.cpp:
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d120235..c9f59f0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-03-24  David Hyatt  <hyatt at apple.com>
 
+	ignore the float property on first-letter styles.
+	The bug # is 3186044.
+	
+        Reviewed by darin
+
+        * khtml/css/parser.cpp:
+        * khtml/rendering/render_block.cpp:
+
+2003-03-24  David Hyatt  <hyatt at apple.com>
+
 	Add error-handling case to deal with a common CSS malformation:
 
 	clip: rect( )
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d120235..c9f59f0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-03-24  David Hyatt  <hyatt at apple.com>
 
+	ignore the float property on first-letter styles.
+	The bug # is 3186044.
+	
+        Reviewed by darin
+
+        * khtml/css/parser.cpp:
+        * khtml/rendering/render_block.cpp:
+
+2003-03-24  David Hyatt  <hyatt at apple.com>
+
 	Add error-handling case to deal with a common CSS malformation:
 
 	clip: rect( )
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 81e405f..dab4ea6 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -1919,8 +1919,8 @@ case 134:
 #line 896 "parser.y"
 {
       yyval.value.id = 0;
-    yyval.value.unit = Value::Function;
-    yyval.value.function = 0;
+      yyval.value.unit = Value::Function;
+      yyval.value.function = 0;
   ;
     break;}
 case 135:
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index f8d9962..93048c2 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -118,7 +118,8 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
 
             pseudoStyle->setDisplay( 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());
 

-- 
WebKit Debian packaging