[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 b623d8c860f20ff980de928460a149499ff53a28
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 17 03:22:44 2002 +0000

     i        Fixed scroll bar flash.  Add provisional view to go along with
            provisional widget.
    
            Temporary hack to bypass spin-o-death problem.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 78e8e6f..7312f1c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-03-16  Richard Williamson  <rjw at apple.com>
 
+        Fixed scroll bar flash.  Add provisional view to go along with
+        provisional widget.
+        
+	* WebView.subproj/IFWebView.mm: (-[IFWebView provisionalDataSourceChanged:]),
+	(-[IFWebView dataSourceChanged:]):
+
+2002-03-16  Richard Williamson  <rjw at apple.com>
+
         Fixed error handling.  Fixed most frame loading problems.
         Cleaned up frame state machine.
         Moved IFMainURLHandleClient from WebCore.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 78e8e6f..7312f1c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-03-16  Richard Williamson  <rjw at apple.com>
 
+        Fixed scroll bar flash.  Add provisional view to go along with
+        provisional widget.
+        
+	* WebView.subproj/IFWebView.mm: (-[IFWebView provisionalDataSourceChanged:]),
+	(-[IFWebView dataSourceChanged:]):
+
+2002-03-16  Richard Williamson  <rjw at apple.com>
+
         Fixed error handling.  Fixed most frame loading problems.
         Cleaned up frame state machine.
         Moved IFMainURLHandleClient from WebCore.
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 0968cf0..c44ad1f 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -80,12 +80,10 @@
     data->provisionalWidget = new KHTMLView (part, 0);
     part->setView (data->provisionalWidget);
 
-    // Check to see if we're a frame.
-    if ([self _frameScrollView])
-        data->provisionalWidget->setView ([self _frameScrollView]);
-    else
-        data->provisionalWidget->setView (self);
-    
+    // Create a temporary provisional view.  It will be replaced with
+    // the actual view once the datasource has been committed.
+    data->provisionalWidget->setView ([[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)]);
+
     data->provisionalWidget->resize (r.size.width,r.size.height);
 }
 
@@ -93,6 +91,12 @@
 {
     IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
 
+    // Setup the real view.
+    if ([self _frameScrollView])
+        data->provisionalWidget->setView ([self _frameScrollView]);
+    else
+        data->provisionalWidget->setView (self);
+
     // Only delete the widget if we're the top level widget.  In other
     // cases the widget is associated with a RenderFrame which will
     // delete it's widget.
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 0968cf0..c44ad1f 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -80,12 +80,10 @@
     data->provisionalWidget = new KHTMLView (part, 0);
     part->setView (data->provisionalWidget);
 
-    // Check to see if we're a frame.
-    if ([self _frameScrollView])
-        data->provisionalWidget->setView ([self _frameScrollView]);
-    else
-        data->provisionalWidget->setView (self);
-    
+    // Create a temporary provisional view.  It will be replaced with
+    // the actual view once the datasource has been committed.
+    data->provisionalWidget->setView ([[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)]);
+
     data->provisionalWidget->resize (r.size.width,r.size.height);
 }
 
@@ -93,6 +91,12 @@
 {
     IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
 
+    // Setup the real view.
+    if ([self _frameScrollView])
+        data->provisionalWidget->setView ([self _frameScrollView]);
+    else
+        data->provisionalWidget->setView (self);
+
     // Only delete the widget if we're the top level widget.  In other
     // cases the widget is associated with a RenderFrame which will
     // delete it's widget.

-- 
WebKit Debian packaging