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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 4fbcb4749be71c4d2dd5d12270d222dd995c4fa1
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 2 18:50:00 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3441466 - REGRESSION: http://www.meyerweb.com/eric/css/edge/complexspiral/glassy.html broken on scroll
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]): Don't turn on scroll-blitting here when the page is done...
            (-[WebFrame _transitionToCommitted:]): Instead do it here, when the page is committed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 613272a..67767fa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3441466 - REGRESSION: http://www.meyerweb.com/eric/css/edge/complexspiral/glassy.html broken on scroll
+	
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]): Don't turn on scroll-blitting here when the page is done...
+        (-[WebFrame _transitionToCommitted:]): Instead do it here, when the page is committed.
+
 2003-10-02  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 8951cc2..db77487 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -608,6 +608,8 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     switch ([self _state]) {
         case WebFrameStateProvisional:
         {
+	    [[[[self frameView] _scrollView] contentView] setCopiesOnScroll:YES];
+
             WebFrameLoadType loadType = [self _loadType];
             if (loadType == WebFrameLoadTypeForward ||
                 loadType == WebFrameLoadTypeBack ||
@@ -871,9 +873,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     if (_private->state == WebFrameStateComplete) {
         NSScrollView *sv = [[self frameView] _scrollView];
         [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];
         NSTimer *timer = _private->scheduledLayoutTimer;
         _private->scheduledLayoutTimer = nil;
         [_private setPreviousItem:nil];

-- 
WebKit Debian packaging