[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 1f956be4812369f33ce06127d0b1859dc42c10ce
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 19 20:30:24 2003 +0000

    	Make updateScrollers guard non-static, so that it applies only to the view whose scrollers are being
    	updated.
    
            Reviewed by darin
    
            * WebView.subproj/WebDynamicScrollBarsView.h:
            * WebView.subproj/WebDynamicScrollBarsView.m:
            (-[WebDynamicScrollBarsView reflectScrolledClipView:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7e6e328..a79e561 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-19  David Hyatt  <hyatt at apple.com>
+
+	Make updateScrollers guard non-static, so that it applies only to the view whose scrollers are being
+	updated.
+	
+        Reviewed by darin
+
+        * WebView.subproj/WebDynamicScrollBarsView.h:
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView reflectScrolledClipView:]):
+
 2003-11-18  Richard Williamson   <rjw at apple.com>
 
 	More live connect stubs.  We're getting close.
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index 3cc7869..38ec235 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -18,6 +18,7 @@
     WebCoreScrollBarMode vScroll;
     BOOL suppressLayout;
     BOOL suppressScrollers;
+    BOOL inUpdateScrollers;
 }
 
 - (void)setAllowsHorizontalScrolling:(BOOL)flag;
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 4fd109f..18febec 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -104,7 +104,6 @@
         // http://www.linuxpowered.com/archive/howto/Net-HOWTO-8.html.
         // The underlying cause is some problem in the NSText machinery, but I was not
         // able to pin it down.
-        static BOOL inUpdateScrollers;
         if (!inUpdateScrollers && [[NSGraphicsContext currentContext] isDrawingToScreen]) {
             inUpdateScrollers = YES;
             [self updateScrollers];

-- 
WebKit Debian packaging