[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 1167e1358a6dcb20a2a1420278a71e4ab9f7caaf
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 8 00:44:31 2002 +0000

            Fixed occasional scroll bar problem in iframes.
            Fixed occasional problem removing scroll bar onb main page.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5899551..4a685e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-07  Richard Williamson  <rjw at apple.com>
+
+        Fixed occasional scroll bar problem in iframes.
+        Fixed occasional problem removing scroll bar onb main page.
+        
+	* WebView.subproj/IFDynamicScrollBarsView.m: (-[IFDynamicScrollBarsView
+	reflectScrolledClipView:]):
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _checkLoadComplete:]):
+	* WebView.subproj/IFWebView.mm: (-[IFWebView drawRect:]):
+
 2002-03-07  John Sullivan  <sullivan at apple.com>
 
 	First pass at adding error strings to IFError. They are
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5899551..4a685e9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-03-07  Richard Williamson  <rjw at apple.com>
+
+        Fixed occasional scroll bar problem in iframes.
+        Fixed occasional problem removing scroll bar onb main page.
+        
+	* WebView.subproj/IFDynamicScrollBarsView.m: (-[IFDynamicScrollBarsView
+	reflectScrolledClipView:]):
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _checkLoadComplete:]):
+	* WebView.subproj/IFWebView.mm: (-[IFWebView drawRect:]):
+
 2002-03-07  John Sullivan  <sullivan at apple.com>
 
 	First pass at adding error strings to IFError. They are
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index 730cf27..bd2555d 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -22,20 +22,20 @@
 - (void) reflectScrolledClipView: (NSClipView*)clipView
 {
     id cview = [self documentView];
-    
-    WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "\n");
-    
+        
     // Do nothing if the web view is in the provisional state.
     if ([cview isKindOfClass: NSClassFromString (@"IFWebView")]){
         if ([cview _provisionalWidget] != 0){
-            WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not changing scrollview, content in provisional state.\n");
             return;
         }
     }
     
     if( clipView == [self contentView] ) {
-        BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
-        BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
+        BOOL scrollsVertically;
+        BOOL scrollsHorizontally;
+
+        scrollsVertically = [[self documentView] bounds].size.height > [self frame].size.height;
+        scrollsHorizontally = [[self documentView] bounds].size.width > [self frame].size.width;
 
         [self setHasVerticalScroller: scrollsVertically];
         [self setHasHorizontalScroller: scrollsHorizontally];
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 5ccc60d..18cc404 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -172,6 +172,10 @@
         [[self dataSource] _part]->end();
         
         if ([[self controller] mainFrame] == self){
+            if ([[[[self view] superview] superview] isKindOfClass: NSClassFromString (@"NSScrollView")]){
+                [[[[self view] superview] superview] reflectScrolledClipView: [[self view] superview]];
+            }
+
             [[self view] setNeedsLayout: YES];
             [[self view] layout];
             [[self view] display];
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 249b4b4..c3e25a3 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -299,12 +299,12 @@
 // This should eventually be removed.
 - (void)drawRect:(NSRect)rect {
     KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
-    IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
+    //IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
 
-    if (data->provisionalWidget != 0){
-        WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
-        return;
-    }
+    //if (data->provisionalWidget != 0){
+    //    WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
+    //    return;
+    //}
     
     if (widget != 0l){        
         WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 730cf27..bd2555d 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -22,20 +22,20 @@
 - (void) reflectScrolledClipView: (NSClipView*)clipView
 {
     id cview = [self documentView];
-    
-    WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "\n");
-    
+        
     // Do nothing if the web view is in the provisional state.
     if ([cview isKindOfClass: NSClassFromString (@"IFWebView")]){
         if ([cview _provisionalWidget] != 0){
-            WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not changing scrollview, content in provisional state.\n");
             return;
         }
     }
     
     if( clipView == [self contentView] ) {
-        BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
-        BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
+        BOOL scrollsVertically;
+        BOOL scrollsHorizontally;
+
+        scrollsVertically = [[self documentView] bounds].size.height > [self frame].size.height;
+        scrollsHorizontally = [[self documentView] bounds].size.width > [self frame].size.width;
 
         [self setHasVerticalScroller: scrollsVertically];
         [self setHasHorizontalScroller: scrollsHorizontally];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 5ccc60d..18cc404 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -172,6 +172,10 @@
         [[self dataSource] _part]->end();
         
         if ([[self controller] mainFrame] == self){
+            if ([[[[self view] superview] superview] isKindOfClass: NSClassFromString (@"NSScrollView")]){
+                [[[[self view] superview] superview] reflectScrolledClipView: [[self view] superview]];
+            }
+
             [[self view] setNeedsLayout: YES];
             [[self view] layout];
             [[self view] display];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 249b4b4..c3e25a3 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -299,12 +299,12 @@
 // This should eventually be removed.
 - (void)drawRect:(NSRect)rect {
     KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
-    IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
+    //IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
 
-    if (data->provisionalWidget != 0){
-        WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
-        return;
-    }
+    //if (data->provisionalWidget != 0){
+    //    WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
+    //    return;
+    //}
     
     if (widget != 0l){        
         WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");

-- 
WebKit Debian packaging