[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 6ffbd57317a47a8da6c1d5aadded0c8038c0db5e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 19:19:19 2002 +0000

            Fixed scrollview related drawing turd problems.
            (3000844 and 2896459).
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView drawRect:]):
            * WebView.subproj/WebView.m:
            (-[WebView setFrame:]):
    
            Removed debug log.
    
            * kwq/KWQFrame.mm:
            (QFrame::setFrameStyle):
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge drawRect:withPainter:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 76cb765..087c958 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-07  Richard Williamson (Home)  <rjw at apple.com>
+        
+        Removed debug log.
+        
+        * kwq/KWQFrame.mm:
+        (QFrame::setFrameStyle):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge drawRect:withPainter:]):
+
 2002-08-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 76cb765..087c958 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-08-07  Richard Williamson (Home)  <rjw at apple.com>
+        
+        Removed debug log.
+        
+        * kwq/KWQFrame.mm:
+        (QFrame::setFrameStyle):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge drawRect:withPainter:]):
+
 2002-08-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 76cb765..087c958 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-08-07  Richard Williamson (Home)  <rjw at apple.com>
+        
+        Removed debug log.
+        
+        * kwq/KWQFrame.mm:
+        (QFrame::setFrameStyle):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge drawRect:withPainter:]):
+
 2002-08-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::KWQKURLPrivate::decompose): Use CFURLCopyPath
diff --git a/WebCore/kwq/KWQFrame.mm b/WebCore/kwq/KWQFrame.mm
index 01ac767..fada6b7 100644
--- a/WebCore/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQFrame.mm
@@ -35,7 +35,6 @@ QFrame::QFrame(QWidget *parent)
 void QFrame::setFrameStyle(int s)
 {
     _frameStyle = s;
-    NSLog (@"framesStyle = %d\n", s);
 }
 
 int QFrame::frameStyle()
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index dbe2dfb..4546712 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -178,10 +178,10 @@ using khtml::RenderPart;
 - (void)drawRect:(NSRect)rect withPainter:(QPainter *)p
 {
     RenderObject *renderer = part->impl->getRenderer();
-
+        
 #ifdef DEBUG_DRAWING
     [[NSColor redColor] set];
-    [NSBezierPath fillRect:[view->getView() visibleRect]];
+    [NSBezierPath fillRect:[part->impl->getView()->getView() visibleRect]];
 #endif
 
     if (renderer) {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 984fba4..6e6cf81 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-07  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed scrollview related drawing turd problems.
+        (3000844 and 2896459).
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView drawRect:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView setFrame:]):
+
 2002-08-07  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/WebFrame.m: (-[WebFrame setProvisionalDataSource:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 984fba4..6e6cf81 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-08-07  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed scrollview related drawing turd problems.
+        (3000844 and 2896459).
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView drawRect:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView setFrame:]):
+
 2002-08-07  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/WebFrame.m: (-[WebFrame setProvisionalDataSource:]):
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 336214f..39e3731 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -84,21 +84,26 @@ enum {
     [super dealloc];
 }
 
-- (void)setFrame: (NSRect)f
+- (void)viewWillStartLiveResize
 {
-    if ([self isDocumentHTML] && !NSEqualRects(f, [self frame]))
-        [(WebHTMLView *)[self documentView] setNeedsLayout: YES];
-    [super setFrame: f];
 }
 
 
-- (void)viewWillStartLiveResize
+- (void)setFrame: (NSRect)f
 {
+    if ([self isDocumentHTML] && !NSEqualRects(f, [self frame]))
+        [(WebHTMLView *)[self documentView] setNeedsLayout: YES];
+        
+    [super setFrame: f];
+    
+    // We have to force a display now, rather than depend on
+    // setNeedsDisplay: or we will get drawing turds under the
+    // scrollbar frames.
+    [[self frameScrollView] display];
 }
 
 - (void)viewDidEndLiveResize
 {
-    [self display];
 }
 
 - (void)setAllowsScrolling: (BOOL)flag
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 598ca8c..f4c3f97 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -343,6 +343,13 @@
 {
     WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s drawing\n", DEBUG_OBJECT(self));
 
+    if ([self inLiveResize]){
+        if (!NSEqualRects(rect, [self visibleRect])){
+            rect = [self visibleRect];
+            [self setNeedsLayout: YES];
+        }
+    }
+
     [self reapplyStyles];
 
     [self layout];

-- 
WebKit Debian packaging