[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit f5ab0a13aea78ac694a975175effc9abe84d64d5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 18 00:13:03 2003 +0000

            Reviewed by Dave.
    
            - fixed 3174332 -- REGRESSION: bad initial layout due to empty QFontMetrics
    
            * khtml/rendering/render_html.cpp: (RenderHtml::setStyle):
            Don't set the style's to display:BLOCK if it's display:NONE. This prevents
            us from modifying the special FOUC style among other things.
    
            - unrelated code cleanup
    
            * khtml/html/html_baseimpl.cpp: Moved code around that was grouped badly.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 38e226b..a6850d8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-02-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3174332 -- REGRESSION: bad initial layout due to empty QFontMetrics
+
+        * khtml/rendering/render_html.cpp: (RenderHtml::setStyle):
+        Don't set the style's to display:BLOCK if it's display:NONE. This prevents
+        us from modifying the special FOUC style among other things.
+
+        - unrelated code cleanup
+
+        * khtml/html/html_baseimpl.cpp: Moved code around that was grouped badly.
+
 2003-02-17  David Hyatt  <hyatt at apple.com>
 
 	Missed another "Almost Strict" spot.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 38e226b..a6850d8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-02-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3174332 -- REGRESSION: bad initial layout due to empty QFontMetrics
+
+        * khtml/rendering/render_html.cpp: (RenderHtml::setStyle):
+        Don't set the style's to display:BLOCK if it's display:NONE. This prevents
+        us from modifying the special FOUC style among other things.
+
+        - unrelated code cleanup
+
+        * khtml/html/html_baseimpl.cpp: Moved code around that was grouped badly.
+
 2003-02-17  David Hyatt  <hyatt at apple.com>
 
 	Missed another "Almost Strict" spot.
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 12dd5fa..34313ed 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -582,40 +582,39 @@ NodeImpl::Id HTMLHeadElementImpl::id() const
     return ID_HEAD;
 }
 
-bool HTMLHtmlElementImpl::rendererIsNeeded(RenderStyle *style)
+// -------------------------------------------------------------------------
+
+HTMLHtmlElementImpl::HTMLHtmlElementImpl(DocumentPtr *doc)
+    : HTMLElementImpl(doc)
 {
-    // Ignore display: none.
-    return true;
 }
 
-RenderObject *HTMLHtmlElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
+HTMLHtmlElementImpl::~HTMLHtmlElementImpl()
 {
-    return new (arena) RenderHtml(this);
 }
 
-void HTMLHtmlElementImpl::attach()
+NodeImpl::Id HTMLHtmlElementImpl::id() const
 {
-    createRendererIfNeeded();
-    NodeBaseImpl::attach();
+    return ID_HTML;
 }
 
-// -------------------------------------------------------------------------
-
-HTMLHtmlElementImpl::HTMLHtmlElementImpl(DocumentPtr *doc)
-    : HTMLElementImpl(doc)
+bool HTMLHtmlElementImpl::rendererIsNeeded(RenderStyle *style)
 {
+    // Ignore display: none.
+    return true;
 }
 
-HTMLHtmlElementImpl::~HTMLHtmlElementImpl()
+RenderObject *HTMLHtmlElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
 {
+    return new (arena) RenderHtml(this);
 }
 
-NodeImpl::Id HTMLHtmlElementImpl::id() const
+void HTMLHtmlElementImpl::attach()
 {
-    return ID_HTML;
+    createRendererIfNeeded();
+    NodeBaseImpl::attach();
 }
 
-
 // -------------------------------------------------------------------------
 
 HTMLIFrameElementImpl::HTMLIFrameElementImpl(DocumentPtr *doc) : HTMLFrameElementImpl(doc)
diff --git a/WebCore/khtml/rendering/render_html.cpp b/WebCore/khtml/rendering/render_html.cpp
index b00ff65..7892cbb 100644
--- a/WebCore/khtml/rendering/render_html.cpp
+++ b/WebCore/khtml/rendering/render_html.cpp
@@ -43,7 +43,9 @@ RenderHtml::~RenderHtml()
 
 void RenderHtml::setStyle(RenderStyle *style)
 {
-    style->setDisplay(BLOCK); // Don't allow RenderHTML to be inline.
+    if (style->display() != NONE) {
+        style->setDisplay(BLOCK); // Don't allow RenderHTML to be inline.
+    }
     RenderBlock::setStyle(style);
     setShouldPaintBackgroundOrBorder(true);
 }

-- 
WebKit Debian packaging