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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 6b4aab71d94b867f9b07bfd1dfe8cd83f67d2ad3
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 08:43:51 2004 +0000

            Back out one of the previous changes, it causes a crash. Whoops!
    
            * kwq/KWQScrollView.mm:
            (QScrollView::addChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 45373a9..0c88e87 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,25 @@
+2004-04-23  Maciej Stachowiak  <mjs at apple.com>
+
+        Back out one of the previous changes, it causes a crash. Whoops!
+        
+        * kwq/KWQScrollView.mm:
+        (QScrollView::addChild):
+
+2004-04-23  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	These two tiny changes (made w/ Dave's help) should get us about
+	1% or so combined on the HTML iBench.
+
+        * khtml/rendering/render_br.cpp:
+        (RenderBR::setStyle): Don't call superclass setStyle, since
+	according to Dave we don't need any of the work done in there.
+        * kwq/KWQScrollView.mm:
+        (QScrollView::addChild): Don't actually move the widget if the x
+	coordinate is -500000, since we don't need the initial offscreen
+	positioning that KHTML does and it is costly to do.
+
 2004-04-22  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index e231ac0..9a80c29 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -296,7 +296,9 @@ void QScrollView::addChild(QWidget* child, int x, int y)
 {
     ASSERT(child != this);
     
-    child->move(x, y);
+    // we don't need to do the offscreen position initialization that KDE needs
+    if (x != -500000)
+	child->move(x, y);
 
     KWQ_BLOCK_EXCEPTIONS;
 

-- 
WebKit Debian packaging