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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 563554449ceff5ef01281f2398bfefa8a5a5cc33
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 10 22:04:43 2003 +0000

    	Patch to move widgets during layout instead of waiting until paint time.
    
            Reviewed by darin
    
            * WebView.subproj/WebDataSource.m:
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _isLoadComplete]):
            * WebView.subproj/WebHTMLView.m:
            * WebView.subproj/WebHTMLViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5168 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8d28554..5d2632a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-10-10  David Hyatt  <hyatt at apple.com>
+
+	Patch to move widgets during layout instead of waiting until paint time.
+	
+        Reviewed by darin
+
+        * WebView.subproj/WebDataSource.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _isLoadComplete]):
+        * WebView.subproj/WebHTMLView.m:
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 2003-10-09  Richard Williamson   <rjw at apple.com>
 
 	Ensure that the autoscroll timer is always stopped if a mouse up event is lost.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 50b5080..c286e42 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -438,25 +438,6 @@
     _private->mainDocumentError = nil;
 }
 
-
-- (void)_layoutChildren
-{
-    NSArray *subFrames = [[self webFrame] childFrames];
-    if ([subFrames count]) {
-        WebFrame *subFrame;
-        unsigned int i;
-        id dview;
-        for (i = 0; i < [subFrames count]; i++){
-            subFrame = [subFrames objectAtIndex: i];
-            dview = [[subFrame frameView] documentView];
-            if ([[subFrame dataSource] _isDocumentHTML])
-                [dview _adjustFrames];
-            [dview setNeedsDisplay: YES];
-            [[subFrame dataSource] _layoutChildren];
-        }
-    }
-}
-
 + (NSMutableDictionary *)_repTypesAllowImageTypeOmission:(BOOL)allowImageTypeOmission
 {
     static NSMutableDictionary *repTypes = nil;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index f857e8c..e8aca4f 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -133,7 +133,6 @@
 - (void)__setRequest:(NSURLRequest *)request;
 - (void)_setRequest:(NSURLRequest *)request;
 - (void)_setResponse:(NSURLResponse *)response;
-- (void)_layoutChildren;
 - (void)_clearErrors;
 - (void)_setMainDocumentError:(NSError *)error;
 + (NSMutableDictionary *)_repTypesAllowImageTypeOmission:(BOOL)allowImageTypeOmission;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index b56d04c..ea853f6 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -974,16 +974,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                 // Maybe there are bugs because of that, or extra work we can skip because
                 // the new page is ready.
 
-                // Unfortunately we have to get our parent to adjust the frames in this
-                // frameset so this frame's geometry is set correctly.  This should
-                // be a reasonably inexpensive operation.
-                WebDataSource *parentDS = [[self parentFrame] dataSource];
-                if ([[parentDS _bridge] isFrameSet]){
-                    WebFrameView *parentWebFrameView = [[self parentFrame] frameView];
-                    if ([parentDS _isDocumentHTML])
-                        [(WebHTMLView *)[parentWebFrameView documentView] _adjustFrames];
-                }
-
                 // Tell the just loaded document to layout.  This may be necessary
                 // for non-html content that needs a layout message.
                 if (!([[self dataSource] _isDocumentHTML])) {
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 8e7c6ca..3282a0e 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -108,15 +108,6 @@ static BOOL forceRealHitTest = NO;
 
 @implementation WebHTMLView (WebPrivate)
 
-- (void)_adjustFrames
-{
-    // Ick!  khtml set the frame size during layout and
-    // the frame origins during drawing!  So we have to 
-    // layout and do a draw with rendering disabled to
-    // correclty adjust the frames.
-    [[self _bridge] adjustFrames:[self frame]];
-}
-
 - (void)_reset
 {
     [WebImageRenderer stopAnimationsInView:self];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 433404d..ea56c57 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -52,7 +52,6 @@
 - (WebView *)_webView;
 - (WebFrame *)_frame;
 - (WebBridge *)_bridge;
-- (void)_adjustFrames;
 
 // Modifier (flagsChanged) tracking SPI
 + (void)_postFlagsChangedEvent:(NSEvent *)flagsChangedEvent;

-- 
WebKit Debian packaging