[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 2a25018f3086b24ab6ddb1b7d24b010c159ae9e9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 30 01:12:11 2002 +0000

    	Fix for 3008660, arstechnica regression.  Move the acquisition
    	of the document's text color (and the addition of CSS properties)
    	to the attach() call instead of the constructor.  The table won't
    	add the properties until it is building its render object.
    
    	Also removing the #ifndef around the layout scheduler.  This fixes
    	:hover feedback and reflows from things like the marquee on
    	livepage.apple.com.
    
            * khtml/html/html_tableimpl.cpp:
            (HTMLTableElementImpl::HTMLTableElementImpl):
            (HTMLTableElementImpl::id):
            (HTMLTableElementImpl::attach):
            * khtml/html/html_tableimpl.h:
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 576aab7..1a1d9cc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-07-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3008660, arstechnica regression.  Move the acquisition
+	of the document's text color (and the addition of CSS properties)
+	to the attach() call instead of the constructor.  The table won't
+	add the properties until it is building its render object.
+
+	Also removing the #ifndef around the layout scheduler.  This fixes
+	:hover feedback and reflows from things like the marquee on
+	livepage.apple.com.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::HTMLTableElementImpl):
+        (HTMLTableElementImpl::id):
+        (HTMLTableElementImpl::attach):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_object.h:
+
 2002-07-29  Darin Adler  <darin at apple.com>
 
 	- fixed 3010875 -- Find only works for latin characters
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 576aab7..1a1d9cc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-07-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3008660, arstechnica regression.  Move the acquisition
+	of the document's text color (and the addition of CSS properties)
+	to the attach() call instead of the constructor.  The table won't
+	add the properties until it is building its render object.
+
+	Also removing the #ifndef around the layout scheduler.  This fixes
+	:hover feedback and reflows from things like the marquee on
+	livepage.apple.com.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::HTMLTableElementImpl):
+        (HTMLTableElementImpl::id):
+        (HTMLTableElementImpl::attach):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_object.h:
+
 2002-07-29  Darin Adler  <darin at apple.com>
 
 	- fixed 3010875 -- Find only works for latin characters
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 576aab7..1a1d9cc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-07-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3008660, arstechnica regression.  Move the acquisition
+	of the document's text color (and the addition of CSS properties)
+	to the attach() call instead of the constructor.  The table won't
+	add the properties until it is building its render object.
+
+	Also removing the #ifndef around the layout scheduler.  This fixes
+	:hover feedback and reflows from things like the marquee on
+	livepage.apple.com.
+	
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::HTMLTableElementImpl):
+        (HTMLTableElementImpl::id):
+        (HTMLTableElementImpl::attach):
+        * khtml/html/html_tableimpl.h:
+        * khtml/rendering/render_object.h:
+
 2002-07-29  Darin Adler  <darin at apple.com>
 
 	- fixed 3010875 -- Find only works for latin characters
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index ff47f11..a2ea685 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -59,15 +59,6 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentPtr *doc)
     incremental = false;
     m_noBorder = true;
     m_solid = false;
-
-    // reset font color and sizes here, if we don't have strict parse mode.
-    // this is 90% compatible to ie and mozilla, and the by way easiest solution...
-    // only difference to 100% correct is that in strict mode <font> elements are propagated into tables.
-    if ( getDocument()->parseMode() != DocumentImpl::Strict ) {
-        addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_SMALL ); // browser defaults use small, not medium
-        addCSSProperty( CSS_PROP_COLOR, getDocument()->textColor() );
-        addCSSProperty( CSS_PROP_FONT_FAMILY, "konq_default" );
-    }
 }
 
 HTMLTableElementImpl::~HTMLTableElementImpl()
@@ -79,6 +70,23 @@ NodeImpl::Id HTMLTableElementImpl::id() const
     return ID_TABLE;
 }
 
+void HTMLTableElementImpl::attach()
+{
+    assert(!m_attached);
+    if (parent()->renderer()) {
+        // reset font color and sizes here, if we don't have strict parse mode.
+        // this is 90% compatible to ie and mozilla, and the by way easiest solution...
+        // only difference to 100% correct is that in strict mode <font> elements are propagated into tables.
+        if ( getDocument()->parseMode() != DocumentImpl::Strict ) {
+            addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_SMALL ); // browser defaults use small, not medium
+            addCSSProperty( CSS_PROP_COLOR, getDocument()->textColor() );
+            addCSSProperty( CSS_PROP_FONT_FAMILY, "konq_default" );
+        }
+    }
+
+    return HTMLElementImpl::attach();
+}
+
 NodeImpl* HTMLTableElementImpl::setCaption( HTMLTableCaptionElementImpl *c )
 {
     int exceptioncode = 0;
diff --git a/WebCore/khtml/html/html_tableimpl.h b/WebCore/khtml/html/html_tableimpl.h
index d9e396e..0284965 100644
--- a/WebCore/khtml/html/html_tableimpl.h
+++ b/WebCore/khtml/html/html_tableimpl.h
@@ -73,6 +73,8 @@ public:
 
     virtual Id id() const;
 
+    virtual void attach();
+    
     HTMLTableCaptionElementImpl *caption() const { return tCaption; }
     NodeImpl *setCaption( HTMLTableCaptionElementImpl * );
 
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 6936e71..a30fd1b 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -187,9 +187,7 @@ public:
 		root = o;
 		o = o->m_parent;
 	    }
-#ifndef APPLE_CHANGES
 	    root->scheduleRelayout();
-#endif
 	}
     }
     // hack to block inline layouts during parsing

-- 
WebKit Debian packaging