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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 2feecff90554bc1ea7886b188bf30c974dc26f36
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 11 01:51:54 2003 +0000

    2003-06-10  Richard Williams   <rjw at apple.com>
    
    	Back out incorrect fix to 3287862.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 018fc32..fde0e2f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-10  Richard Williamson   <rjw at apple.com>
+
+	Back out incorrect fix to 3287862.
+
 2003-06-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3156169>: cmd-click opens new win but stops loading in prev win
@@ -22,7 +26,7 @@
         (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]): if there is no request to continue with, don't reset things like the provisional data source since it was never unset in this case
         (-[WebFrame _loadDataSource:withLoadType:formState:]): don't call stopLoading, _setLoadType and _setProvisionalDataSource, since that stops the frame even for command-click and option-click. Do this work in _prepareForProvisionalLoadWithDataSource:loadType: instead.
 
-2003-06-10  Richard Williams   <rjw at apple.com>
+2003-06-10  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3287862.  Don't override resize flags
 	when decoding WebView.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 7a97221..1a095d2 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -94,6 +94,7 @@ enum { WebViewVersion = 1 };
 {
     NSRect f = [self frame];
     WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
+    [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     [self addSubview: wv];
     [wv release];
 
@@ -128,7 +129,6 @@ enum { WebViewVersion = 1 };
 {
     [super initWithFrame: f];
     [self _commonInitializationFrameName:frameName groupName:groupName];
-    [self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     return self;
 }
 

-- 
WebKit Debian packaging