[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 a4d2ebabb465ebc2965036cbb55b4ef599ccd41a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 1 02:30:42 2003 +0000

    	Fix regression that broke John's site.  RenderInline needs
    	to implement childrenInline() so that it can return true.
    	I pulled this method out of RenderFlow and into RenderBlock,
    	which caused RenderInline to use RenderObject's method (and
    	that one returns false).
    
            Reviewed by rjw
    
            * khtml/rendering/render_inline.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1e6aabe..696c283 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-01-31  David Hyatt  <hyatt at apple.com>
 
+	Fix regression that broke John's site.  RenderInline needs
+	to implement childrenInline() so that it can return true.
+	I pulled this method out of RenderFlow and into RenderBlock,
+	which caused RenderInline to use RenderObject's method (and
+	that one returns false).
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_inline.h:
+
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
 	Fix for crash on espn.com.  Revert my change to make 
 	containingBlock() return 0 for the root.  Put it back to the
 	old behavior, where the root returns itself when you ask for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1e6aabe..696c283 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-01-31  David Hyatt  <hyatt at apple.com>
 
+	Fix regression that broke John's site.  RenderInline needs
+	to implement childrenInline() so that it can return true.
+	I pulled this method out of RenderFlow and into RenderBlock,
+	which caused RenderInline to use RenderObject's method (and
+	that one returns false).
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_inline.h:
+
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
 	Fix for crash on espn.com.  Revert my change to make 
 	containingBlock() return 0 for the root.  Put it back to the
 	old behavior, where the root returns itself when you ask for
diff --git a/WebCore/khtml/rendering/render_inline.h b/WebCore/khtml/rendering/render_inline.h
index 0bb1f98..280c897 100644
--- a/WebCore/khtml/rendering/render_inline.h
+++ b/WebCore/khtml/rendering/render_inline.h
@@ -43,6 +43,7 @@ public:
     };
 
     virtual bool isRenderInline() const { return true; }
+    virtual bool childrenInline() const { return true; }
     
     virtual void addChildToFlow(RenderObject* newChild, RenderObject* beforeChild);
     void splitInlines(RenderFlow* fromBlock, RenderFlow* toBlock, RenderFlow* middleBlock,

-- 
WebKit Debian packaging