[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 d1d014bb999ec39a93eb9fef45fa19738c462bfc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 16:17:22 2002 +0000

    	- fixed 3077910 -- REGRESSION: download window open at startup time -> no scrollbars
    
            * WebView.subproj/WebDynamicScrollBarsView.m:
            (-[WebDynamicScrollBarsView updateScrollers]):
    	Check for WebDocumentView protocol before making the layout method
    	call. Prevents exception when WebDynamicScrollBarsView is used with
    	a document that is not a WebDocumentView.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4e4204c..f5a69c6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3077910 -- REGRESSION: download window open at startup time -> no scrollbars
+
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+	Check for WebDocumentView protocol before making the layout method
+	call. Prevents exception when WebDynamicScrollBarsView is used with
+	a document that is not a WebDocumentView.
+
 2002-10-16  Richard Williamson  <rjw at apple.com>
 
         Added some drawing debug code (ifdef excluded).
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4e4204c..f5a69c6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3077910 -- REGRESSION: download window open at startup time -> no scrollbars
+
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+	Check for WebDocumentView protocol before making the layout method
+	call. Prevents exception when WebDynamicScrollBarsView is used with
+	a document that is not a WebDocumentView.
+
 2002-10-16  Richard Williamson  <rjw at apple.com>
 
         Added some drawing debug code (ifdef excluded).
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 45c9c7f..98f6c46 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -23,11 +23,13 @@
         scrollsHorizontally = NO;
     } else {
         // Force a layout before checking if scrollbars are needed.
-        // This fixes 2969367, although may introduce a slowdown in
-        // live resize performance.
-        [((id<WebDocumentView>)[self documentView]) layout];
+        // This fixes 2969367, although may introduce a slowdown in live resize performance.
+        NSView *documentView = [self documentView];
+        if ([documentView conformsToProtocol:@protocol(WebDocumentView)]) {
+            [(id <WebDocumentView>)documentView layout];
+        }
         
-        NSSize documentSize = [[self documentView] frame].size;
+        NSSize documentSize = [documentView frame].size;
         NSSize frameSize = [self frame].size;
         
         scrollsVertically = documentSize.height > frameSize.height;

-- 
WebKit Debian packaging