[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 ed80a52a8c2a48677970ce1f0bc788a466f81e04
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 25 02:36:11 2003 +0000

    	Clean up isInlineFlow.  Add a couple of new methods that I'll
    	be converting code over to use (carefully) piece by piece in
    	future patches.
    
            Reviewed by gramps
    
            * khtml/rendering/render_block.h:
            * khtml/rendering/render_flow.h:
            * khtml/rendering/render_inline.h:
            * khtml/rendering/render_object.cpp:
            (RenderObject::setStyle):
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f38292c..e428e9e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-03-24  David Hyatt  <hyatt at apple.com>
+
+	Clean up isInlineFlow.  Add a couple of new methods that I'll
+	be converting code over to use (carefully) piece by piece in
+	future patches.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.h:
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_inline.h:
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setStyle):
+        * khtml/rendering/render_object.h:
+
 2003-03-24  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f38292c..e428e9e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-03-24  David Hyatt  <hyatt at apple.com>
+
+	Clean up isInlineFlow.  Add a couple of new methods that I'll
+	be converting code over to use (carefully) piece by piece in
+	future patches.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.h:
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_inline.h:
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setStyle):
+        * khtml/rendering/render_object.h:
+
 2003-03-24  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/khtml/rendering/render_block.h b/WebCore/khtml/rendering/render_block.h
index 92ec781..ed9a592 100644
--- a/WebCore/khtml/rendering/render_block.h
+++ b/WebCore/khtml/rendering/render_block.h
@@ -38,6 +38,9 @@ public:
     virtual const char *renderName() const;
 
     virtual bool isRenderBlock() const { return true; }
+    virtual bool isBlockFlow() const { return !isInline() && !isTable(); }
+    virtual bool isInlineFlow() const { return isInline() && !isReplaced(); }
+    virtual bool isInlineBlockOrInlineTable() const { return isInline() && isReplaced(); }
     
     virtual bool childrenInline() const { return m_childrenInline; }
     virtual void setChildrenInline(bool b) { m_childrenInline = b; }
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 1995d9d..95d27bc 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -45,7 +45,7 @@ public:
     RenderFlow(DOM::NodeImpl* node)
       : RenderBox(node)
     { m_continuation = 0; m_firstLineBox = 0; m_lastLineBox = 0; }
-    
+
     virtual RenderFlow* continuation() const { return m_continuation; }
     void setContinuation(RenderFlow* c) { m_continuation = c; }
     RenderFlow* continuationBefore(RenderObject* beforeChild);
diff --git a/WebCore/khtml/rendering/render_inline.h b/WebCore/khtml/rendering/render_inline.h
index cc02df2..f2be1a1 100644
--- a/WebCore/khtml/rendering/render_inline.h
+++ b/WebCore/khtml/rendering/render_inline.h
@@ -36,6 +36,7 @@ public:
     virtual const char *renderName() const;
 
     virtual bool isRenderInline() const { return true; }
+    virtual bool isInlineFlow() const { return true; }
     virtual bool childrenInline() const { return true; }
     
     virtual void addChildToFlow(RenderObject* newChild, RenderObject* beforeChild);
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 5b3ec8a..0c8a205 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -876,7 +876,7 @@ void RenderObject::setStyle(RenderStyle *style)
         // having an outline to not having an outline.
         repaint();
 
-    if (isFloating() && !style->isFloating())
+    if (m_style && isFloating() && (m_style->floating() != style->floating()))
         // For changes in float styles, we need to conceivably remove ourselves
         // from the floating objects list.
         removeFromObjectLists();
@@ -887,7 +887,7 @@ void RenderObject::setStyle(RenderStyle *style)
 
     bool affectsParentBlock = (m_style && isFloatingOrPositioned() &&
         (!style->isFloating() && style->position() != ABSOLUTE && style->position() != FIXED)
-        && parent() && !parent()->isInline() && parent()->isRenderBlock() && !parent()->isTable());
+        && parent() && parent()->isBlockFlow());
     
     //qDebug("new style, diff=%d", d);
     // reset style flags
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 6a0bb4d..9e7deeb 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -172,8 +172,9 @@ public:
     // some helper functions...
     virtual bool isRenderBlock() const { return false; }
     virtual bool isRenderInline() const { return false; }
-    virtual bool isInlineFlow() const { return isInline() && !isReplaced() &&
-                                               (isRenderInline() || isRenderBlock()); }
+    virtual bool isInlineFlow() const { return false; }
+    virtual bool isBlockFlow() const { return false; }
+    virtual bool isInlineBlockOrInlineTable() const { return false; }
     virtual bool childrenInline() const { return false; }
     virtual void setChildrenInline(bool b) { };
     virtual RenderFlow* continuation() const { return 0; }

-- 
WebKit Debian packaging