[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 702f87c6e5c7180b98603fb10f7cfaa8c0868503
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 24 18:29:53 2002 +0000

    	Cleaned up some loose ends from adding setNeedsLayout to the WebDocumentView
    	protocol. Was causing exceptions.
    
            * Plugins.subproj/WebPluginView.m: (-[WebNetscapePluginView setNeedsLayout:]):
            * WebView.subproj/WebTextView.m: (-[WebTextView setNeedsLayout:]):
    	Added missing stubs.
    
            * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setNeedsReapplyStyles]):
    	Removed unneeded cast.
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _isLoadComplete]): Remove an
    	unneeded cast and call to isDocumentHTML.
            * WebView.subproj/WebHTMLView.h: No need to re-declare setNeedsLayout.
            * WebView.subproj/WebView.m: (-[WebView setFrame:]): Get rid of unneeded check
    	of isDocumentHTML.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2142 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3d35c9e..35444b4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,22 @@
 2002-09-24  Darin Adler  <darin at apple.com>
 
+	Cleaned up some loose ends from adding setNeedsLayout to the WebDocumentView
+	protocol. Was causing exceptions.
+
+        * Plugins.subproj/WebPluginView.m: (-[WebNetscapePluginView setNeedsLayout:]):
+        * WebView.subproj/WebTextView.m: (-[WebTextView setNeedsLayout:]):
+	Added missing stubs.
+
+        * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setNeedsReapplyStyles]):
+	Removed unneeded cast.
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _isLoadComplete]): Remove an
+	unneeded cast and call to isDocumentHTML.
+        * WebView.subproj/WebHTMLView.h: No need to re-declare setNeedsLayout.
+        * WebView.subproj/WebView.m: (-[WebView setFrame:]): Get rid of unneeded check
+	of isDocumentHTML.
+
+2002-09-24  Darin Adler  <darin at apple.com>
+
 	- fixed 3057383 -- focus rectangles are being drawn multiple times
 	- fixed 3051025 -- focus ring on password field gets darker and darker
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3d35c9e..35444b4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
 2002-09-24  Darin Adler  <darin at apple.com>
 
+	Cleaned up some loose ends from adding setNeedsLayout to the WebDocumentView
+	protocol. Was causing exceptions.
+
+        * Plugins.subproj/WebPluginView.m: (-[WebNetscapePluginView setNeedsLayout:]):
+        * WebView.subproj/WebTextView.m: (-[WebTextView setNeedsLayout:]):
+	Added missing stubs.
+
+        * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setNeedsReapplyStyles]):
+	Removed unneeded cast.
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _isLoadComplete]): Remove an
+	unneeded cast and call to isDocumentHTML.
+        * WebView.subproj/WebHTMLView.h: No need to re-declare setNeedsLayout.
+        * WebView.subproj/WebView.m: (-[WebView setFrame:]): Get rid of unneeded check
+	of isDocumentHTML.
+
+2002-09-24  Darin Adler  <darin at apple.com>
+
 	- fixed 3057383 -- focus rectangles are being drawn multiple times
 	- fixed 3051025 -- focus ring on password field gets darker and darker
 
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 1e1d835..c029204 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -689,6 +689,10 @@
 {
 }
  
+- (void)setNeedsLayout:(BOOL)flag
+{
+}
+
 - (void)layout
 {
     NSRect superFrame = [[self _web_superviewOfClass:[WebView class]] frame];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index aa981db..ca5135b 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -381,7 +381,7 @@
     NSView <WebDocumentView> *view = [[frame webView] documentView];
     if ([view isKindOfClass:[WebHTMLView class]]) {
         [(WebHTMLView *)view setNeedsToApplyStyles:YES];
-        [(WebHTMLView *)view setNeedsLayout:YES];
+        [view setNeedsLayout:YES];
         [view setNeedsDisplay:YES];
     }
 }
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 28e32eb..bcba042 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -441,10 +441,7 @@ static const char * const stateNames[] = {
 
                 // Tell the just loaded document to layout.  This may be necessary
                 // for non-html content that needs a layout message.
-                if ([thisView isDocumentHTML]){
-                    WebHTMLView *hview = (WebHTMLView *)thisDocumentView;
-                    [hview setNeedsLayout: YES];
-                }
+                [thisDocumentView setNeedsLayout: YES];
                 [thisDocumentView layout];
 
                 // Unfortunately if this frame has children we have to lay them
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 40e8d04..2b3c00a 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -96,8 +96,8 @@ enum {
 
 - (void)setFrame: (NSRect)f
 {
-    if ([self isDocumentHTML] && !NSEqualRects(f, [self frame]))
-        [(WebHTMLView *)[self documentView] setNeedsLayout: YES];
+    if (!NSEqualRects(f, [self frame]))
+        [[self documentView] setNeedsLayout: YES];
         
     [super setFrame: f];
     
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 3f0ac15..bbdd539 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -23,12 +23,6 @@
 }
 
 /*!
-    @method setNeedsLayout:
-    @param flag
-*/
-- (void)setNeedsLayout: (BOOL)flag;
-
-/*!
     @method setNeedsToApplyStyles:
     @param flag
 */
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 1d45e43..4e166a5 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -65,6 +65,10 @@
     }
 }
 
+- (void)setNeedsLayout:(BOOL)flag
+{
+}
+
 - (void)layout
 {
     NSRect superFrame = [[self superview] frame];

-- 
WebKit Debian packaging