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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 5026a684e565b373ad950d19566b2145741c7e83
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 21:53:53 2003 +0000

    	3159750 - REGRESSION: cursor is I-beam when over a standalone image
    
    	We now reset the cursor to arrow before switching doc views.
    
    	Also, made various replacements of "id <WebDocumentView>" with "NSView < WebDocumentView> *"
    	to get better compile time checking.
    
            Reviewed by Darin.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _makeDocumentView]):  Use NSView*
            (-[WebFrame _transitionToCommitted:]): Use NSView*
            * WebView.subproj/WebViewPrivate.h: Use NSView*
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _setDocumentView:]): Use NSView*.  Reset cursor.
            (-[WebView _makeDocumentViewForDataSource:]): Use NSView*
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d873dbe..d4beb0d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-29  Trey Matteson  <trey at apple.com>
+
+	3159750 - REGRESSION: cursor is I-beam when over a standalone image
+
+	We now reset the cursor to arrow before switching doc views.
+
+	Also, made various replacements of "id <WebDocumentView>" with "NSView < WebDocumentView> *"
+	to get better compile time checking.
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _makeDocumentView]):  Use NSView*
+        (-[WebFrame _transitionToCommitted:]): Use NSView*
+        * WebView.subproj/WebViewPrivate.h: Use NSView*
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _setDocumentView:]): Use NSView*.  Reset cursor.
+        (-[WebView _makeDocumentViewForDataSource:]): Use NSView*
+
 2003-01-29  Chris Blumenberg  <cblu at apple.com>
 
 	3159529 - REGRESSION: URLs with no path are saved as "-.html"
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 365462e..191d878 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -486,7 +486,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
 
 - (void)_makeDocumentView
 {
-    id <WebDocumentView> documentView = [_private->webView _makeDocumentViewForDataSource:_private->dataSource];
+    NSView <WebDocumentView> *documentView = [_private->webView _makeDocumentViewForDataSource:_private->dataSource];
     if (!documentView) {
         return;
     }
@@ -546,7 +546,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
                     
                     // Create a document view for this document, or used the cached view.
                     if (pageCache){
-                        id <WebDocumentView> cachedView = [pageCache objectForKey: @"WebKitDocumentView"];
+                        NSView <WebDocumentView> *cachedView = [pageCache objectForKey: @"WebKitDocumentView"];
                         ASSERT (cachedView != nil);
                         [[self webView] _setDocumentView: cachedView];
                     }
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index ccfa2e2..f5eef4a 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -28,8 +28,8 @@
 @end
 
 @interface WebView (WebPrivate)
-- (void)_setDocumentView:(id <WebDocumentView>)view;
-- (id <WebDocumentView>)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
+- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
+- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
 - (void)_setController:(WebController *)controller;
 - (int)_marginWidth;
 - (int)_marginHeight;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index ccfa2e2..f5eef4a 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -28,8 +28,8 @@
 @end
 
 @interface WebView (WebPrivate)
-- (void)_setDocumentView:(id <WebDocumentView>)view;
-- (id <WebDocumentView>)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
+- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
+- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
 - (void)_setController:(WebController *)controller;
 - (int)_marginWidth;
 - (int)_marginHeight;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 2c00ec6..2c626f9 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -64,19 +64,25 @@
     return _private->marginHeight;
 }
 
-- (void)_setDocumentView:(id)view
+- (void)_setDocumentView:(NSView *)view
 {
     WebDynamicScrollBarsView *sv = [self frameScrollView];
     
     [sv setSuppressLayout: YES];
-    [sv setDocumentView: view];    
+    
+    // Always start out with arrow.  New docView can then change as needed, but doesn't have to
+    // clean up after the previous docView.  Also TextView will set cursor when added to view
+    // tree, so must do this before setDocumentView:.
+    [sv setDocumentCursor:[NSCursor arrowCursor]];
+
+    [sv setDocumentView: view];
     [sv setSuppressLayout: NO];
 }
 
--(id <WebDocumentView>)_makeDocumentViewForDataSource:(WebDataSource *)dataSource
+-(NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource
 {
     Class viewClass = [[[self class] _viewTypes] _web_objectForMIMEType:[[dataSource response] contentType]];
-    id <WebDocumentView> documentView = viewClass ? [[viewClass alloc] init] : nil;
+    NSView <WebDocumentView> *documentView = viewClass ? [[viewClass alloc] init] : nil;
     [self _setDocumentView:documentView];
     [documentView release];
     
@@ -85,7 +91,7 @@
 
 - (void)_setController: (WebController *)controller
 {
-    // Not retained; the controller owns the view.
+    // Not retained; the controller owns the view, indirectly through the frame tree.
     _private->controller = controller;    
 }
 

-- 
WebKit Debian packaging