[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:34:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 510de805b7c0c4b5764970e4c74f42d7e9a7b769
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 28 01:37:02 2002 +0000
i
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView mouseDown:]):
(-[WebHTMLView mouseDragged:]):
(-[WebHTMLView mouseMovedNotification:]):
* WebView.subproj/WebHTMLViewPrivate.h:
* WebView.subproj/WebHTMLViewPrivate.m:
Fixed active link style. Cleaned up and fixed drag initiation
for links and images. Dotted lines not drawing correcly, but
other styles are applied correctly.
* WebKit.exp:
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
Added some constants.
* WebCoreSupport.subproj/WebTextRendererFactory.m:
Code to change CG caching policy. Not enabled until
we receive a root from CG team.
* kwq/WebCoreBridge.h:
Fixed constants to conform to WebKit. These need to be shared.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5c2221e..c065c53 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-08-27 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.h:
+
+ Fixed constants to conform to WebKit. These need to be shared.
+
2002-08-27 David Hyatt <hyatt at apple.com>
Change relative positioned blocks so that they are treated as special objects and
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5c2221e..c065c53 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-08-27 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.h:
+
+ Fixed constants to conform to WebKit. These need to be shared.
+
2002-08-27 David Hyatt <hyatt at apple.com>
Change relative positioned blocks so that they are treated as special objects and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5c2221e..c065c53 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-08-27 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.h:
+
+ Fixed constants to conform to WebKit. These need to be shared.
+
2002-08-27 David Hyatt <hyatt at apple.com>
Change relative positioned blocks so that they are treated as special objects and
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 5eedb08..15f3976 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -53,10 +53,10 @@ typedef khtml::RenderPart KHTMLRenderPart;
@protocol WebCoreRenderTreeCopier;
@protocol WebCoreResourceLoader;
-#define WebCoreContextLinkURL @"WebCoreContextLinkURL"
-#define WebCoreContextImageURL @"WebCoreContextImageURL"
-#define WebCoreContextString @"WebCoreContextString"
-#define WebCoreContextImage @"WebCoreContextImage"
+#define WebCoreContextLinkURL @"WebContextLinkURL"
+#define WebCoreContextImageURL @"WebContextImageURL"
+#define WebCoreContextString @"WebContextString"
+#define WebCoreContextImage @"WebContextImage"
// WebCoreBridge objects are used by WebCore to abstract away operations that need
// to be implemented by library clients, for example WebKit. The objects are also
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fc42719..4a96e76 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,27 @@
+2002-08-27 Richard Williamson (Local) <rjw at apple.com>
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDown:]):
+ (-[WebHTMLView mouseDragged:]):
+ (-[WebHTMLView mouseMovedNotification:]):
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+
+ Fixed active link style. Cleaned up and fixed drag initiation
+ for links and images. Dotted lines not drawing correcly, but
+ other styles are applied correctly.
+
+ * WebKit.exp:
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+
+ Added some constants.
+
+ * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
+ Code to change CG caching policy. Not enabled until
+ we receive a root from CG team.
+
2002-08-27 Darin Adler <darin at apple.com>
- fixed 3031583 -- directory.apple.com now gives "unsupported" redirect
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fc42719..4a96e76 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,27 @@
+2002-08-27 Richard Williamson (Local) <rjw at apple.com>
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDown:]):
+ (-[WebHTMLView mouseDragged:]):
+ (-[WebHTMLView mouseMovedNotification:]):
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+
+ Fixed active link style. Cleaned up and fixed drag initiation
+ for links and images. Dotted lines not drawing correcly, but
+ other styles are applied correctly.
+
+ * WebKit.exp:
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+
+ Added some constants.
+
+ * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
+ Code to change CG caching policy. Not enabled until
+ we receive a root from CG team.
+
2002-08-27 Darin Adler <darin at apple.com>
- fixed 3031583 -- directory.apple.com now gives "unsupported" redirect
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 3b7df7b..7f6c55f 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -14,7 +14,7 @@
@class WebHistoryPrivate;
// notification sent when history is modified
-#define WebHistoryEntriesChangedNotification @"WebHistoryEntriesChangedNotification"
+extern NSString *WebHistoryEntriesChangedNotification;
@interface WebHistory : WebCoreHistory {
@private
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index c75a1c2..07abf99 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -11,6 +11,8 @@
#import "WebKitDebug.h"
+NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotification";
+
@implementation WebHistory
+ (WebHistory *)webHistoryWithFile: (NSString*)file
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index e1bf6ad..01bc234 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -127,6 +127,13 @@
+ (WebTextRendererFactory *)sharedFactory;
{
+#if 0
+ CGFontCache *fontCache;
+ fontCache = CGFontCacheCreate();
+ CGFontCacheSetMaxSize (fontCache, 1024*1024);
+ CGFontCacheSetLifetime (fontCache, 1024*1024*1024);
+ CGFontCacheRelease(fontCache);
+#endif
return (WebTextRendererFactory *)[super sharedFactory];
}
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index a7988f8..ea6af54 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -28,3 +28,4 @@ _WebContextMenuElementImageURLKey
_WebContextMenuElementStringKey
_WebContextMenuElementImageKey
_WebContextMenuElementFrameKey
+_WebHistoryEntriesChangedNotification
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 5d6fbb7..ded9f93 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -400,11 +400,54 @@
- (void)mouseDown: (NSEvent *)event
{
- if([self _continueAfterCheckingDragForEvent:event]){
- [[self _bridge] mouseDown:event];
+ // Record the mouse down position so we can determine
+ // drag hysteresis.
+ _private->mouseDownPoint = [event locationInWindow];
+
+ // Let khtml get a chance to deal with the event.
+ [[self _bridge] mouseDown:event];
+}
+
+#define DragStartXHysteresis 2.0
+#define DragStartYHysteresis 1.0
+
+- (void)mouseDragged:(NSEvent *)event
+{
+ // Ensure that we're visible wrt the event location.
+ [self autoscroll:event];
+
+ // Now do WebKit dragging.
+ float deltaX = ABS([event locationInWindow].x - _private->mouseDownPoint.x);
+ float deltaY = ABS([event locationInWindow].y - _private->mouseDownPoint.y);
+
+ if (deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis){
+ NSPoint point = [self convertPoint:_private->mouseDownPoint fromView:nil];
+ NSDictionary *element = [self _elementAtPoint: point];
+ NSURL *linkURL = [element objectForKey: WebContextMenuElementLinkURLKey];
+ NSURL *imageURL = [element objectForKey: WebContextMenuElementImageURLKey];
+
+ if(imageURL || linkURL){
+ [_private->draggedURL release];
+
+ if(imageURL)
+ _private->draggedURL = imageURL;
+ else if (linkURL)
+ _private->draggedURL = linkURL;
+
+ [_private->draggedURL retain];
+ NSArray *fileType = [NSArray arrayWithObject:[[_private->draggedURL path] pathExtension]];
+ NSRect rect = NSMakeRect(point.x + -16, point.y - 16, 32, 32);
+ [self dragPromisedFilesOfTypes: fileType fromRect: rect source: self slideBack: YES event: event];
+ }
+ }
+ else {
+ // Give khtml a crack at the event only if we haven't started
+ // a drag.
+ [[self _bridge] mouseDragged:event];
}
}
+
- (void)mouseUp: (NSEvent *)event
{
NSEvent *theEvent;
@@ -437,12 +480,6 @@
}
}
-- (void)mouseDragged:(NSEvent *)event
-{
- [self autoscroll:event];
- [[self _bridge] mouseDragged:event];
-}
-
#if 0
// Why don't we call KHTMLView's keyPressEvent/keyReleaseEvent?
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 23408c1..39cb071 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -15,6 +15,7 @@
@interface WebHTMLViewPrivate : NSObject
{
@public
+ NSPoint mouseDownPoint;
BOOL needsLayout;
BOOL needsToApplyStyles;
BOOL canDragTo;
@@ -39,5 +40,4 @@
+ (void)_postFlagsChangedEvent:(NSEvent *)flagsChangedEvent;
- (NSDictionary *)_elementAtPoint:(NSPoint)point;
- (BOOL)_continueAfterClickPolicyForEvent: (NSEvent *)event;
-- (BOOL)_continueAfterCheckingDragForEvent:(NSEvent *)event;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index e44732e..4f14cb6 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -155,32 +155,4 @@ BOOL _modifierTrackingEnabled = FALSE;
return NO;
}
-- (BOOL)_continueAfterCheckingDragForEvent:(NSEvent *)event
-{
- if([self _web_dragShouldBeginFromMouseDown:event withExpiration:[NSDate distantFuture]]){
-
- NSPoint point = [self convertPoint:[event locationInWindow] fromView:nil];
- NSDictionary *element = [self _elementAtPoint:point];
- NSURL *imageURL = [element objectForKey:WebContextMenuElementImageURLKey];
- NSURL *linkURL = [element objectForKey:WebContextMenuElementLinkURLKey];
-
- if(linkURL || imageURL){
- [_private->draggedURL release];
-
- if(imageURL){
- _private->draggedURL = imageURL;
- }else{
- _private->draggedURL = linkURL;
- }
-
- [_private->draggedURL retain];
- NSArray *fileType = [NSArray arrayWithObject:[[_private->draggedURL path] pathExtension]];
- NSRect rect = NSMakeRect(point.x+-16, point.y-16, 32, 32);
- [self dragPromisedFilesOfTypes:fileType fromRect:rect source:self slideBack:YES event:event];
- return NO;
- }
- }
- return YES;
-}
-
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list