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

[vicki]

The following commit has been merged in the debian/unstable branch:
commit 48e7edcf27eec0ac45ba65a17dd13f7c15bee117
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 16 22:27:08 2003 +0000

            Reviewed by vicki.
    
    	- fix buildit build failure
    
            * kwq/KWQScrollView.mm:
            (QScrollView::resizeContents):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 819c8d0..e0b3cb8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-10-16  Darin Adler <darin at apple.com>
+
+        Reviewed by vicki. 
+
+	- fix buildit build failure 
+
+        * kwq/KWQScrollView.mm: 
+        (QScrollView::resizeContents):
+
 === Safari-110 ===
 
 2003-10-15  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 819c8d0..e0b3cb8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-10-16  Darin Adler <darin at apple.com>
+
+        Reviewed by vicki. 
+
+	- fix buildit build failure 
+
+        * kwq/KWQScrollView.mm: 
+        (QScrollView::resizeContents):
+
 === Safari-110 ===
 
 2003-10-15  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index bea639d..7272871 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -339,12 +339,12 @@ void QScrollView::removeChild(QWidget* child)
 
 void QScrollView::resizeContents(int w, int h)
 {
-    volatile int _w = w;
-    volatile int _h = h;
+    KWQ_BLOCK_NS_EXCEPTIONS;
+    int _w = w;
+    int _h = h;
 
     LOG(Frames, "%p %@ at w %d h %d\n", getView(), [(id)[getView() class] className], w, h);
     NSView *view = getView();
-    KWQ_BLOCK_NS_EXCEPTIONS;
     if ([view _KWQ_isScrollView]){
         view = getDocumentView();
         

-- 
WebKit Debian packaging