[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 19382f8756eebbe601e0f339c79eae95ded4821e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 19:45:56 2002 +0000

    	- fixed 3080512 -- REGRESSION: moving from old page to new one, we get blank white
    	before the new one is ready
    
    	Roll out a bunch of my changes, because they weren't complete. Added FIXMEs for the
    	problems I was unsuccessfully trying to fix.
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setState:]):
            * WebView.subproj/WebView.m:
            (-[WebView initWithFrame:]), (-[WebView isOpaque]), (-[WebView drawRect:]):
    	Roll back.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9a2abfe..f8ff458 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	- fixed 3080512 -- REGRESSION: moving from old page to new one, we get blank white
+	before the new one is ready
+
+	Roll out a bunch of my changes, because they weren't complete. Added FIXMEs for the
+	problems I was unsuccessfully trying to fix.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setState:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView initWithFrame:]), (-[WebView isOpaque]), (-[WebView drawRect:]):
+	Roll back.
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3080246 -- REGRESSION: Animated GIFs sometimes disappear after drag or scroll
 
 	Once more, with feeling.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9a2abfe..f8ff458 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	- fixed 3080512 -- REGRESSION: moving from old page to new one, we get blank white
+	before the new one is ready
+
+	Roll out a bunch of my changes, because they weren't complete. Added FIXMEs for the
+	problems I was unsuccessfully trying to fix.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setState:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView initWithFrame:]), (-[WebView isOpaque]), (-[WebView drawRect:]):
+	Roll back.
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3080246 -- REGRESSION: Animated GIFs sometimes disappear after drag or scroll
 
 	Once more, with feeling.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 5a1965b..9566104 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -393,7 +393,19 @@ static const char * const stateNames[] = {
     
     _private->state = newState;
     
+    if (_private->state == WebFrameStateProvisional) {
+        // FIXME: This is OK as long as no one resizes the window,
+        // but in the case where someone does, it means garbage outside
+        // the occupied part of the scroll view.
+        [[[self webView] frameScrollView] setDrawsBackground:NO];
+    }
+    
     if (_private->state == WebFrameStateComplete) {
+        NSScrollView *sv = [[self webView] frameScrollView];
+        [sv setDrawsBackground:YES];
+        // FIXME: This overrides the setCopiesOnScroll setting done by
+        // WebCore based on whether the page's contents are dynamic or not.
+        [[sv contentView] setCopiesOnScroll:YES];
         [_private->scheduledLayoutTimer fire];
    	ASSERT(_private->scheduledLayoutTimer == nil);
     }
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 0f93d4e..fd821fc 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -83,9 +83,12 @@ NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
     _private = [[WebViewPrivate alloc] init];
 
     WebDynamicScrollBarsView *scrollView  = [[WebDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,frame.size.width,frame.size.height)];
-    [scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     _private->frameScrollView = scrollView;
-    [scrollView setContentView:[[[WebClipView alloc] initWithFrame:[scrollView bounds]] autorelease]];
+    [scrollView setContentView: [[[WebClipView alloc] initWithFrame:[scrollView bounds]] autorelease]];
+    [scrollView setDrawsBackground: NO];
+    [scrollView setHasVerticalScroller: NO];
+    [scrollView setHasHorizontalScroller: NO];
+    [scrollView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     [self addSubview: scrollView];
     
     [self registerForDraggedTypes:[NSPasteboard _web_dragTypesForURL]];
@@ -190,6 +193,20 @@ NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
     return YES;
 }
 
+- (BOOL)isOpaque
+{
+    return YES;
+}
+
+- (void)drawRect:(NSRect)rect
+{
+    if ([self documentView] == nil) {
+        // Need to paint ourselves if there's no documentView to do it instead.
+        [[NSColor whiteColor] set];
+        NSRectFill(rect);
+    }
+}
+
 - (NSWindow *)window
 {
     NSWindow *window = [super window];

-- 
WebKit Debian packaging