[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 bc7f07f62c6e864db266cd8a1208fd9c3c73f68d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 27 20:04:26 2003 +0000

    	Fix for 3268589, static position miscomputed when the positioned object is the last item in its enclosing block and when its previous sibling is a text run that ends in a space.  In this case we need to clear our trailingSpaceObject so that we don't mistakenly ignore the positioned object when building up bidi runs.
    
    	Fix for 3260053, table-layout of inherit not supported.  This
    	caused a crash.  The fix is to just add in the support for the inherit
    	value to the style selector.
    
            Reviewed by john
    
            * khtml/rendering/bidi.cpp:
    	* khtml/css/cssstyleselector.cpp
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9192034..4cabef1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-05-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3268589, static position miscomputed when the positioned object is the last item in its enclosing block and when its previous sibling is a text run that ends in a space.  In this case we need to clear our trailingSpaceObject so that we don't mistakenly ignore the positioned object when building up bidi runs.
+
+	Fix for 3260053, table-layout of inherit not supported.  This
+	caused a crash.  The fix is to just add in the support for the inherit
+	value to the style selector.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+	* khtml/css/cssstyleselector.cpp
+	
 2003-05-26  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3262849 -- jump to nil in KWQKHTMLPart::searchForLabelsAboveCell 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9192034..4cabef1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-05-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3268589, static position miscomputed when the positioned object is the last item in its enclosing block and when its previous sibling is a text run that ends in a space.  In this case we need to clear our trailingSpaceObject so that we don't mistakenly ignore the positioned object when building up bidi runs.
+
+	Fix for 3260053, table-layout of inherit not supported.  This
+	caused a crash.  The fix is to just add in the support for the inherit
+	value to the style selector.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+	* khtml/css/cssstyleselector.cpp
+	
 2003-05-26  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3262849 -- jump to nil in KWQKHTMLPart::searchForLabelsAboveCell 
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index dc850df..7e78693 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1950,6 +1950,12 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 //     case CSS_PROP_SPEAK_NUMERAL:
 //     case CSS_PROP_SPEAK_PUNCTUATION:
      case CSS_PROP_TABLE_LAYOUT: {
+        if(value->cssValueType() == CSSValue::CSS_INHERIT) {
+            if(!parentNode) return;
+            style->setTableLayout(parentStyle->tableLayout());
+            return;
+        }
+
         if ( !primitiveValue->getIdent() )
             return;
 
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 39f4555..7d4d643 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1499,12 +1499,15 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                 
                 // If we're ignoring spaces, we have to stop and include this object and
                 // then start ignoring spaces again.
-                if (ignoringSpaces && (needToSetStaticX || needToSetStaticY)) {
-                    BidiIterator startMid = { 0, o, 0 };
-                    BidiIterator stopMid = { 0, o, 1 };
-                    addMidpoint(startMid); // Stop ignoring spaces.
-                    addMidpoint(stopMid); // Start ignoring again.
-                }
+                if (needToSetStaticX || needToSetStaticY) {
+                    trailingSpaceObject = 0;
+                    if (ignoringSpaces) {
+                        BidiIterator startMid = { 0, o, 0 };
+                        BidiIterator stopMid = { 0, o, 1 };
+                        addMidpoint(startMid); // Stop ignoring spaces.
+                        addMidpoint(stopMid); // Start ignoring again.
+                    }
+                }                
             }
         } else if (o->isInlineFlow()) {
             // Only empty inlines matter.  We treat those similarly to replaced elements.

-- 
WebKit Debian packaging