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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:21:22 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 85e478fcc7ecbc0d1cdafa5a5a1fcbd50b1ba0ce
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 25 22:16:12 2002 +0000

            Support for rudimentary plain text 'copy'.
    
            * WebCoreSupport.subproj/IFImageRenderer.m:
            (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
            * WebView.subproj/IFHTMLView.mm:
            (-[IFHTMLView copy:]):
            * WebView.subproj/IFWebViewPrivate.h:
            * WebView.subproj/IFWebViewPrivate.mm:
            (-[IFWebView _controller]):
    
            Support for rudimentary plain text 'copy'.
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge selectedText]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4d6a08b..05f2c1b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
+        Support for rudimentary plain text 'copy'.
+        
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge selectedText]):
+
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
         Enabled progressive image loading code.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4d6a08b..05f2c1b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
+        Support for rudimentary plain text 'copy'.
+        
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge selectedText]):
+
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
         Enabled progressive image loading code.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d6a08b..05f2c1b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
+        Support for rudimentary plain text 'copy'.
+        
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge selectedText]):
+
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
         Enabled progressive image loading code.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 54fb1d3..95cea2d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -83,6 +83,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
     width:(int)width height:(int)height
     marginWidth:(int)mw marginHeight:(int)mh;
 
+- (NSString *)selectedText;
+
 @end
 
 // The WebCoreBridge protocol contains methods for use by the WebCore side of the bridge.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index d4243b3..087e25d 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -116,4 +116,10 @@
     part->impl->gotoBaseAnchor();
 }
 
+- (NSString *)selectedText
+{
+    QString st = part->selectedText();
+    return QSTRING_TO_NSSTRING(st);
+}
+
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2f310be..770a703 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
+        Support for rudimentary plain text 'copy'.
+
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView copy:]):
+        * WebView.subproj/IFWebViewPrivate.h:
+        * WebView.subproj/IFWebViewPrivate.mm:
+        (-[IFWebView _controller]):
+
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
         Enabled progressive image loading code.
         
         * WebCoreSupport.subproj/IFImageRenderer.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2f310be..770a703 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
+        Support for rudimentary plain text 'copy'.
+
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView copy:]):
+        * WebView.subproj/IFWebViewPrivate.h:
+        * WebView.subproj/IFWebViewPrivate.mm:
+        (-[IFWebView _controller]):
+
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
         Enabled progressive image loading code.
         
         * WebCoreSupport.subproj/IFImageRenderer.h:
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 83c523c..27b0ec6 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -72,7 +72,8 @@ static NSMutableArray *activeImageRenderers;
         [imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
         return YES;
     default:
-        return NO;
+        // We have some data.  Return YES so we can attempt a to draw what we've got.
+        return YES;
     }
     
     return NO;
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 83c523c..27b0ec6 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -72,7 +72,8 @@ static NSMutableArray *activeImageRenderers;
         [imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
         return YES;
     default:
-        return NO;
+        // We have some data.  Return YES so we can attempt a to draw what we've got.
+        return YES;
     }
     
     return NO;
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index 5245b2a..363a45a 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -51,6 +51,16 @@
     return self;
 }
 
+- (void)copy:(id)sender
+{
+    IFWebView *webView = [self _IF_parentWebView];
+    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
+    IFWebCoreBridge *bridge = [[webFrame dataSource] _bridge];
+    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+    
+    [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
+    [pboard setString:[bridge selectedText] forType:NSStringPboardType];
+}
 
 - (void)dealloc 
 {
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
index 0431b51..1befe28 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -31,6 +31,7 @@ class QWidget;
 @interface IFWebView (IFPrivate)
 - (void)_setDocumentView:(id <IFDocumentLoading>)view;
 - (void)_setController:(IFWebController *)controller;
+- (IFWebController *)_controller;
 - (int)_marginWidth;
 - (int)_marginHeight;
 - (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index dc94da3..10cecbb 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -70,6 +70,10 @@ static NSMutableDictionary *_viewTypes=nil;
     _private->controller = controller;    
 }
 
+- (IFWebController *)_controller
+{
+    return _private->controller;
+}
 
 + (NSMutableDictionary *)_viewTypes
 {
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 0431b51..1befe28 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -31,6 +31,7 @@ class QWidget;
 @interface IFWebView (IFPrivate)
 - (void)_setDocumentView:(id <IFDocumentLoading>)view;
 - (void)_setController:(IFWebController *)controller;
+- (IFWebController *)_controller;
 - (int)_marginWidth;
 - (int)_marginHeight;
 - (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 0431b51..1befe28 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -31,6 +31,7 @@ class QWidget;
 @interface IFWebView (IFPrivate)
 - (void)_setDocumentView:(id <IFDocumentLoading>)view;
 - (void)_setController:(IFWebController *)controller;
+- (IFWebController *)_controller;
 - (int)_marginWidth;
 - (int)_marginHeight;
 - (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index dc94da3..10cecbb 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -70,6 +70,10 @@ static NSMutableDictionary *_viewTypes=nil;
     _private->controller = controller;    
 }
 
+- (IFWebController *)_controller
+{
+    return _private->controller;
+}
 
 + (NSMutableDictionary *)_viewTypes
 {
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 5245b2a..363a45a 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -51,6 +51,16 @@
     return self;
 }
 
+- (void)copy:(id)sender
+{
+    IFWebView *webView = [self _IF_parentWebView];
+    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
+    IFWebCoreBridge *bridge = [[webFrame dataSource] _bridge];
+    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+    
+    [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
+    [pboard setString:[bridge selectedText] forType:NSStringPboardType];
+}
 
 - (void)dealloc 
 {

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list