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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 922ba3743be3271789f6c41330324c391d40e62b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 22:42:51 2002 +0000

    	- fixed 3079214 -- text/plain page shows up slowly, a few pages at a time
    
            * WebView.subproj/WebTextView.m:
            (-[WebTextView initWithFrame:]): Remove unneeded setWidthTracksTextView:, because
    	that's the default.
            (-[WebTextView dataSourceUpdated:]): Replace the thing each time in the RTF case.
            (-[WebTextView viewDidMoveToSuperview]): Here's where we resize, but only the width.
    	Resizing the height was causing the bug.
            (-[WebTextView layout]): Do nothing.
            (-[WebTextView setAcceptsDrags:]): Update to new name. Since we weren't
    	importing WebDocument.h, we never noticed that this file got out of sync.
            (-[WebTextView acceptsDrags]): Ditto.
            (-[WebTextView setAcceptsDrops:]): Ditto.
            (-[WebTextView acceptsDrops]): Ditto.
    
            * WebView.subproj/WebDocument.h: Fix typo. It said setAcceptsDrags: twice.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6e81a96..93c3c59 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,24 @@
 2002-11-15  Darin Adler  <darin at apple.com>
 
+	- fixed 3079214 -- text/plain page shows up slowly, a few pages at a time
+
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView initWithFrame:]): Remove unneeded setWidthTracksTextView:, because
+	that's the default.
+        (-[WebTextView dataSourceUpdated:]): Replace the thing each time in the RTF case.
+        (-[WebTextView viewDidMoveToSuperview]): Here's where we resize, but only the width.
+	Resizing the height was causing the bug.
+        (-[WebTextView layout]): Do nothing.
+        (-[WebTextView setAcceptsDrags:]): Update to new name. Since we weren't
+	importing WebDocument.h, we never noticed that this file got out of sync.
+        (-[WebTextView acceptsDrags]): Ditto.
+        (-[WebTextView setAcceptsDrops:]): Ditto.
+        (-[WebTextView acceptsDrops]): Ditto.
+
+        * WebView.subproj/WebDocument.h: Fix typo. It said setAcceptsDrags: twice.
+
+2002-11-15  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebFramePrivate.m: Removed a bunch of tabs and fixed indenting.
 
 2002-11-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6e81a96..93c3c59 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,24 @@
 2002-11-15  Darin Adler  <darin at apple.com>
 
+	- fixed 3079214 -- text/plain page shows up slowly, a few pages at a time
+
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView initWithFrame:]): Remove unneeded setWidthTracksTextView:, because
+	that's the default.
+        (-[WebTextView dataSourceUpdated:]): Replace the thing each time in the RTF case.
+        (-[WebTextView viewDidMoveToSuperview]): Here's where we resize, but only the width.
+	Resizing the height was causing the bug.
+        (-[WebTextView layout]): Do nothing.
+        (-[WebTextView setAcceptsDrags:]): Update to new name. Since we weren't
+	importing WebDocument.h, we never noticed that this file got out of sync.
+        (-[WebTextView acceptsDrags]): Ditto.
+        (-[WebTextView setAcceptsDrops:]): Ditto.
+        (-[WebTextView acceptsDrops]): Ditto.
+
+        * WebView.subproj/WebDocument.h: Fix typo. It said setAcceptsDrags: twice.
+
+2002-11-15  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebFramePrivate.m: Removed a bunch of tabs and fixed indenting.
 
 2002-11-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index f8ec917..dfec49f 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -64,11 +64,11 @@
 - (BOOL)acceptsDrags;
 
 /*!
-    @method setAcceptsDrags:
+    @method setAcceptsDrops:
     @abstract Sets whether one can drag to the document view or not.
     @param flag YES allows drags to the document view, NO disallows drags to the document view.
 */
-- (void)setAcceptsDrags: (BOOL)flag;
+- (void)setAcceptsDrops: (BOOL)flag;
 
 /*!
     @method acceptsDrops
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 73ec2a6..fc13766 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -5,11 +5,12 @@
 
 #import <WebKit/WebTextView.h>
 
+#import <WebFoundation/WebResourceResponse.h>
+
 #import <WebKit/WebDataSource.h>
+#import <WebKit/WebDocument.h>
 #import <WebKit/WebPreferences.h>
 
-#import <WebFoundation/WebResourceResponse.h>
-
 @implementation WebTextView
 
 - (id)initWithFrame:(NSRect)frame
@@ -18,7 +19,6 @@
     if (self) {
         canDragFrom = YES;
         canDragTo = YES;
-        [[self textContainer] setWidthTracksTextView:YES];
         [self setAutoresizingMask:NSViewWidthSizable];
         [self setEditable:NO];
         [[NSNotificationCenter defaultCenter] addObserver:self
@@ -49,18 +49,25 @@
 
 - (void)dataSourceUpdated:(WebDataSource *)dataSource
 {
-    NSString *string;
-    
     // FIXME: This needs to be more efficient for progressively loading documents.
     
     if ([[[dataSource response] contentType] isEqualToString:@"text/rtf"]) {
         [self setRichText:YES];
-        [self replaceCharactersInRange:NSMakeRange(0,0) withRTF:[dataSource data]];
+        [self replaceCharactersInRange:NSMakeRange(0, [[self string] length]) withRTF:[dataSource data]];
     } else {
         [self setRichText:NO];
         [self setFixedWidthFont];
-        string = [dataSource stringWithData:[dataSource data]];
-        [self setString:string];
+        [self setString:[dataSource stringWithData:[dataSource data]]];
+    }
+    
+    
+}
+
+- (void)viewDidMoveToSuperview
+{
+    NSView *superview = [self superview];
+    if (superview) {
+        [self setFrameSize:NSMakeSize([superview frame].size.width, [self frame].size.height)];
     }
 }
 
@@ -70,35 +77,31 @@
 
 - (void)layout
 {
-    NSRect superFrame = [[self superview] frame];
-    NSRect frame = [self frame];
-    
-    [self setFrame:NSMakeRect(frame.origin.x, frame.origin.y, superFrame.size.width, frame.size.height)];
 }
 
-- (void)setCanDragFrom: (BOOL)flag
+- (void)setAcceptsDrags:(BOOL)flag
 {
     canDragFrom = flag;
 }
 
-- (BOOL)canDragFrom
+- (BOOL)acceptsDrags
 {
     return canDragFrom;
 }
 
-- (void)setCanDragTo: (BOOL)flag
+- (void)setAcceptsDrops:(BOOL)flag
 {
     canDragTo = flag;
 }
 
-- (BOOL)canDragTo
+- (BOOL)acceptsDrops
 {
     return canDragTo;
 }
 
 - (void)defaultsChanged:(NSNotification *)notification
 {
-    if(![self isRichText]){
+    if (![self isRichText]) {
         [self setFixedWidthFont];
     }
 }
@@ -137,4 +140,5 @@
 {
     [[self nextResponder] keyUp:event];
 }
+
 @end

-- 
WebKit Debian packaging