[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 07:26:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ab23d91c597c1777ac54a01130d73d50502092a8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 26 20:59:06 2003 +0000
Fixed 3102760. Removed WebDocumentDragSettings from API.
Reviewed by Chris.
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebImageView.h:
* WebView.subproj/WebImageView.m:
(-[WebImageView initWithFrame:]):
(-[WebImageView mouseDragged:]):
* WebView.subproj/WebTextView.h:
* WebView.subproj/WebTextView.m:
(-[WebTextView initWithFrame:]):
(-[WebTextView layout]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3704 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0cb3df7..718ef45 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2003-02-26 Richard Williamson <rjw at apple.com>
+
+ Fixed 3102760. Removed WebDocumentDragSettings from API.
+
+ Reviewed by Chris.
+
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebImageView.h:
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView initWithFrame:]):
+ (-[WebImageView mouseDragged:]):
+ * WebView.subproj/WebTextView.h:
+ * WebView.subproj/WebTextView.m:
+ (-[WebTextView initWithFrame:]):
+ (-[WebTextView layout]):
+
2003-02-25 David Hyatt <hyatt at apple.com>
Fix for bug #3181249. Ensure the padding argument gets passed
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 79fe72b..359b17a 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -46,39 +46,6 @@
/*!
- @protocol WebDocumentDragSettings
- @discussion Optional protocol for setting dragging behavior for the document view of WebView.
-*/
- at protocol WebDocumentDragSettings <NSObject>
-/*!
- @method setAcceptsDrags:
- @abstract Sets whether one can drag from the document view or not.
- @param flag YES allows drags from the document view, NO disallows drags from the document view.
-*/
-- (void)setAcceptsDrags: (BOOL)flag;
-
-/*!
- @method acceptsDrags
- @result Whether one can drag from the document view or not.
-*/
-- (BOOL)acceptsDrags;
-
-/*!
- @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)setAcceptsDrops: (BOOL)flag;
-
-/*!
- @method acceptsDrops
- @result Whether one can drag to the document view or not.
-*/
-- (BOOL)acceptsDrops;
- at end
-
-
-/*!
@protocol WebDocumentSearching
@discussion Optional protocol for searching document view of WebView.
*/
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index e4fe5ce..dabd506 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -17,7 +17,7 @@
@class WebHTMLView
@discussion A document view of WebView that displays HTML content.
*/
- at interface WebHTMLView : NSView <WebDocumentView, WebDocumentDragSettings, WebDocumentSearching, WebDocumentText>
+ at interface WebHTMLView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentText>
{
@private
WebHTMLViewPrivate *_private;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 20fff20..66c67ec 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -313,27 +313,6 @@
}
-// Drag and drop links and images. Others?
-- (void)setAcceptsDrags: (BOOL)flag
-{
- _private->canDragFrom = flag;
-}
-
-- (BOOL)acceptsDrags
-{
- return _private->canDragFrom;
-}
-
-- (void)setAcceptsDrops: (BOOL)flag
-{
- _private->canDragTo = flag;
-}
-
-- (BOOL)acceptsDrops
-{
- return _private->canDragTo;
-}
-
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
NSPoint point = [self convertPoint:[theEvent locationInWindow] fromView:nil];
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index 52134e1..966220c 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -9,11 +9,9 @@
@protocol WebDocumentView;
@protocol WebDocumentDragSettings;
- at interface WebImageView : NSView <WebDocumentView, WebDocumentDragSettings>
+ at interface WebImageView : NSView <WebDocumentView>
{
WebImageRepresentation *representation;
- BOOL acceptsDrags;
- BOOL acceptsDrops;
BOOL didSetFrame;
}
@end
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index c34d924..f8fb93b 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -27,10 +27,6 @@
- (id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
- if (self) {
- acceptsDrags = YES;
- acceptsDrops = YES;
- }
return self;
}
@@ -75,26 +71,6 @@
}
}
-- (void)setAcceptsDrags: (BOOL)flag
-{
- acceptsDrags = flag;
-}
-
-- (BOOL)acceptsDrags
-{
- return acceptsDrags;
-}
-
-- (void)setAcceptsDrops: (BOOL)flag
-{
- acceptsDrops = flag;
-}
-
-- (BOOL)acceptsDrops
-{
- return acceptsDrops;
-}
-
- (void)viewDidMoveToWindow
{
if (![self window]){
@@ -169,20 +145,18 @@
- (void)mouseDragged:(NSEvent *)event
{
- if(acceptsDrags){
- // Don't allow drags to be accepted by this WebView.
- [[self _web_parentWebView] unregisterDraggedTypes];
+ // Don't allow drags to be accepted by this WebView.
+ [[self _web_parentWebView] unregisterDraggedTypes];
- // Retain this view during the drag because it may be released before the drag ends.
- [self retain];
-
- [self _web_dragPromisedImage:[representation image]
- rect:[self bounds]
- URL:[representation URL]
- fileType:[[[representation URL] path] pathExtension]
- title:nil
- event:event];
- }
+ // Retain this view during the drag because it may be released before the drag ends.
+ [self retain];
+
+ [self _web_dragPromisedImage:[representation image]
+ rect:[self bounds]
+ URL:[representation URL]
+ fileType:[[[representation URL] path] pathExtension]
+ title:nil
+ event:event];
}
- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 8e220f6..7ed0206 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -10,10 +10,8 @@
@protocol WebDocumentDragSettings;
@protocol WebDocumentText;
- at interface WebTextView : WebSearchableTextView <WebDocumentView, WebDocumentDragSettings, WebDocumentText>
+ at interface WebTextView : WebSearchableTextView <WebDocumentView, WebDocumentText>
{
- BOOL canDragFrom;
- BOOL canDragTo;
}
- (void)setFixedWidthFont;
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 120f4d2..586047b 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -21,8 +21,6 @@
{
self = [super initWithFrame:frame];
if (self) {
- canDragFrom = YES;
- canDragTo = YES;
[self setAutoresizingMask:NSViewWidthSizable];
[self setEditable:NO];
[[NSNotificationCenter defaultCenter] addObserver:self
@@ -83,26 +81,6 @@
{
}
-- (void)setAcceptsDrags:(BOOL)flag
-{
- canDragFrom = flag;
-}
-
-- (BOOL)acceptsDrags
-{
- return canDragFrom;
-}
-
-- (void)setAcceptsDrops:(BOOL)flag
-{
- canDragTo = flag;
-}
-
-- (BOOL)acceptsDrops
-{
- return canDragTo;
-}
-
- (void)defaultsChanged:(NSNotification *)notification
{
if (![self isRichText]) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list