[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 b27b6d4a5b28f57db32c59ffcfff193a5dcf6488
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 23 02:03:57 2003 +0000

    	Fix for 3460726, the user agent string was returning nil.
    
    	Fix for 3386544, empty documents did not get a layout, and so they looked white.  Also fixed the positioning
    	of widgets to account for border/padding in updateWidgetPositions.
    
    	Fix for espn.com crasher, 3458143, caused by layout object not being properly cleared when layouts were
    	unscheduled.
    
            Reviewed by darin
    
            * khtml/khtmlview.cpp:
            * khtml/rendering/render_canvas.cpp:
            (RenderCanvas::RenderCanvas):
            * khtml/rendering/render_replaced.cpp:
            (RenderWidget::updateWidgetPositions):
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::userAgent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 97c7942..12a585d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,23 @@
+2003-10-22  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3460726, the user agent string was returning nil.  
+
+	Fix for 3386544, empty documents did not get a layout, and so they looked white.  Also fixed the positioning
+	of widgets to account for border/padding in updateWidgetPositions.
+
+	Fix for espn.com crasher, 3458143, caused by layout object not being properly cleared when layouts were
+	unscheduled.
+	
+        Reviewed by darin
+
+        * khtml/khtmlview.cpp:
+        * khtml/rendering/render_canvas.cpp:
+        (RenderCanvas::RenderCanvas):
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::updateWidgetPositions):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::userAgent):
+
 2003-10-22  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 97c7942..12a585d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2003-10-22  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3460726, the user agent string was returning nil.  
+
+	Fix for 3386544, empty documents did not get a layout, and so they looked white.  Also fixed the positioning
+	of widgets to account for border/padding in updateWidgetPositions.
+
+	Fix for espn.com crasher, 3458143, caused by layout object not being properly cleared when layouts were
+	unscheduled.
+	
+        Reviewed by darin
+
+        * khtml/khtmlview.cpp:
+        * khtml/rendering/render_canvas.cpp:
+        (RenderCanvas::RenderCanvas):
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::updateWidgetPositions):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::userAgent):
+
 2003-10-22  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by 
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 31a9061..3685b1b 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1823,6 +1823,10 @@ void KHTMLView::scheduleRelayout(khtml::RenderObject* clippedObj)
 
 void KHTMLView::unscheduleRelayout()
 {
+#ifndef INCREMENTAL_REPAINTING
+    m_layoutObject = 0;
+#endif
+
     if (!d->layoutTimerId)
         return;
 
diff --git a/WebCore/khtml/rendering/render_canvas.cpp b/WebCore/khtml/rendering/render_canvas.cpp
index 605bfc6..7bb12bc 100644
--- a/WebCore/khtml/rendering/render_canvas.cpp
+++ b/WebCore/khtml/rendering/render_canvas.cpp
@@ -68,6 +68,8 @@ RenderCanvas::RenderCanvas(DOM::NodeImpl* node, KHTMLView *view)
 
     // Create a new root layer for our layer hierarchy.
     m_layer = new (node->getDocument()->renderArena()) RenderLayer(this);
+    
+    m_view->scheduleRelayout();
 }
 
 RenderCanvas::~RenderCanvas()
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index ad60e66..b7a8857 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -447,11 +447,12 @@ void RenderWidget::updateWidgetPositions()
     
     int x, y, width, height;
     absolutePosition(x,y);
-    width = m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight();
-    height = m_height-borderLeft()-borderRight()-paddingLeft()-paddingRight();
+    x += borderLeft() + paddingLeft();
+    y += borderTop() + paddingTop();
+    width = m_width - borderLeft() - borderRight() - paddingLeft() - paddingRight();
+    height = m_height - borderTop() - borderBottom() - paddingTop() - paddingBottom();
     QRect newBounds(x,y,width,height);
-    const QRect& oldBounds = m_widget->frameGeometry();
-    if (newBounds != oldBounds) {
+    if (newBounds != m_widget->frameGeometry()) {
         // The widget changed positions.  Update the frame geometry.
         RenderArena *arena = ref();
         element()->ref();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fcd3051..75fbc57 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -901,15 +901,13 @@ RenderObject *KWQKHTMLPart::renderer()
 
 QString KWQKHTMLPart::userAgent() const
 {
-    NSString *us = nil;
+    NSString * volatile us = nil;
 
     KWQ_BLOCK_NS_EXCEPTIONS;
-    [_bridge userAgentForURL:m_url.getNSURL()];
+    us = [_bridge userAgentForURL:m_url.getNSURL()];
     KWQ_UNBLOCK_NS_EXCEPTIONS;
          
-    if (us)
-        return QString::fromNSString(us);
-    return QString();
+    return QString::fromNSString(us);
 }
 
 QString KWQKHTMLPart::mimeTypeForFileName(const QString &fileName) const

-- 
WebKit Debian packaging