[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 fd74e9594567a56a2c8d3653a8d0d31b3b74c35e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 27 05:05:20 2002 +0000

    	Smarter block inside inline handling.  Eliminate whitespace
    	that is in between blocks inside inilnes.
    
            * khtml/xml/dom_textimpl.cpp:
            (TextImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index aee9f0c..bca5cb2 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Smarter block inside inline handling.  Eliminate whitespace
+	that is in between blocks inside inilnes.
+	
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Don't let blocks inside inlines collapse with their surroundings
 	ever.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aee9f0c..bca5cb2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Smarter block inside inline handling.  Eliminate whitespace
+	that is in between blocks inside inilnes.
+	
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Don't let blocks inside inlines collapse with their surroundings
 	ever.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aee9f0c..bca5cb2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Smarter block inside inline handling.  Eliminate whitespace
+	that is in between blocks inside inilnes.
+	
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Don't let blocks inside inlines collapse with their surroundings
 	ever.
 	
diff --git a/WebCore/khtml/xml/dom_textimpl.cpp b/WebCore/khtml/xml/dom_textimpl.cpp
index 7c49e61..150b4c9 100644
--- a/WebCore/khtml/xml/dom_textimpl.cpp
+++ b/WebCore/khtml/xml/dom_textimpl.cpp
@@ -370,8 +370,14 @@ void TextImpl::attach()
         if (onlyWS) {
             if (par->isTable() || par->isTableRow() || par->isTableSection())
                 return CharacterDataImpl::attach();
-        
-            if (!par->isInline() && _style->whiteSpace() != PRE) {
+            
+            if (par->isInline() && _style->whiteSpace() != PRE) {
+                // <span><div/> <div/></span>
+                RenderObject* prevRender = previousRenderer();
+                if (prevRender && prevRender->isFlow() && !prevRender->isInline())
+                    return CharacterDataImpl::attach();
+            }
+            else if (!par->isInline() && _style->whiteSpace() != PRE) {
                 RenderObject* prevRender = previousRenderer();
                 if (par->isFlow() && !par->childrenInline() && 
                     (!prevRender || !prevRender->isInline()))

-- 
WebKit Debian packaging