[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
trey
trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:21:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 255f604bf8022bf89f079fd1fa77cfa40dad150a
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 24 23:20:20 2003 +0000
WebCore:
Chris pointed out a FIXME that led to a more contained way to make sure the cursor
is correct during and after image/text/URL dragging.
Reviewed by Chris.
* kwq/KWQKHTMLPart.h: Back out just-added resetCursor method.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::khtmlMouseMoveEvent): Reset cursor to arrow when image drag starts.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm: Back out just-added resetCursor method, which is no
longer needed by WebKit.
WebKit:
Chris pointed out a FIXME that led to a more contained way to make sure the cursor
is correct during and after image/text/URL dragging.
Reviewed by Chris.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView draggedImage:endedAt:operation:]): No need to reset the cursor at
the end of dragging. WC deals with it.
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _handleMouseDragged:]): No need to set the cursor to arrow, WC
deals with it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8fc45d7..dacf895 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-24 Trey Matteson <trey at apple.com>
+
+ Chris pointed out a FIXME that led to a more contained way to make sure the cursor
+ is correct during and after image/text/URL dragging.
+
+ Reviewed by Chris.
+
+ * kwq/KWQKHTMLPart.h: Back out just-added resetCursor method.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::khtmlMouseMoveEvent): Reset cursor to arrow when image drag starts.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm: Back out just-added resetCursor method, which is no
+ longer needed by WebKit.
+
2003-01-24 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8fc45d7..dacf895 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-24 Trey Matteson <trey at apple.com>
+
+ Chris pointed out a FIXME that led to a more contained way to make sure the cursor
+ is correct during and after image/text/URL dragging.
+
+ Reviewed by Chris.
+
+ * kwq/KWQKHTMLPart.h: Back out just-added resetCursor method.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::khtmlMouseMoveEvent): Reset cursor to arrow when image drag starts.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm: Back out just-added resetCursor method, which is no
+ longer needed by WebKit.
+
2003-01-24 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 55701ed..c559b7d 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -158,8 +158,6 @@ public:
void mouseMoved(NSEvent *);
bool keyEvent(NSEvent *);
- void resetCursor();
-
void clearTimers();
static void clearTimers(KHTMLView *);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 898f914..c32fda7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -788,11 +788,6 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
return result;
}
-void KWQKHTMLPart::resetCursor()
-{
- d->m_view->resetCursor();
-}
-
// This does the same kind of work that KHTMLPart::openURL does, except it relies on the fact
// that a higher level already checked that the URLs match and the scrolling is the right thing to do.
void KWQKHTMLPart::scrollToAnchor(const KURL &URL)
@@ -958,8 +953,11 @@ void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
if (_mouseDownMayStartDrag &&
!d->m_selectionInitiatedWithDoubleClick &&
!d->m_selectionInitiatedWithTripleClick &&
- [_bridge mayStartDragWithMouseDragged:_currentEvent]) {
- [_bridge handleMouseDragged:_currentEvent];
+ [_bridge mayStartDragWithMouseDragged:_currentEvent])
+ {
+ // We are starting a text/image/url drag, so the cursor should be an arrow
+ d->m_view->resetCursor();
+ [_bridge handleMouseDragged:_currentEvent];
return;
} else if (_mouseDownMayStartSelect) {
// we use khtml's selection but our own autoscrolling
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ca2071d..726f000 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -138,11 +138,6 @@ enum FrameBorderStyle {
- (void)mouseMoved:(NSEvent *)event;
- (void)mouseDragged:(NSEvent *)event;
-// Resets the cursor to arrow. This is useful to flush everyone's idea of the current cursor,
-// so we aren't foiled by optimizations where a layer doesn't change the cursor because of its
-// (incorrect) idea of what the cursor already is.
-- (void)resetCursor;
-
- (NSView *)nextKeyView;
- (NSView *)previousKeyView;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index b871d05..077a1ed 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -427,11 +427,6 @@ static bool initializedObjectCacheSize = FALSE;
_part->mouseMoved(event);
}
-- (void)resetCursor
-{
- _part->resetCursor();
-}
-
- (NSDictionary *)elementAtPoint:(NSPoint)point
{
RenderObject *renderer = _part->renderer();
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index efd8b65..efd8361 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-24 Trey Matteson <trey at apple.com>
+
+ Chris pointed out a FIXME that led to a more contained way to make sure the cursor
+ is correct during and after image/text/URL dragging.
+
+ Reviewed by Chris.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView draggedImage:endedAt:operation:]): No need to reset the cursor at
+ the end of dragging. WC deals with it.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _handleMouseDragged:]): No need to set the cursor to arrow, WC
+ deals with it.
+
2003-01-24 Darin Adler <darin at apple.com>
Reviewed by Dave.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 4969fa7..a7a724b 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -643,9 +643,6 @@
windowNumber:[[self window] windowNumber]
context:[[NSApp currentEvent] context]
eventNumber:0 clickCount:0 pressure:0];
- // must reset since AK dragging changed the cursor behind out backs. Otherwise various
- // layers optimize out changing the cursor because the think they know what it is currently.
- [[self _bridge] resetCursor];
[self mouseUp:fakeEvent]; // This will also update the mouseover state.
// Reregister for drag types because they were unregistered before the drag.
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 7d9d052..a5e9350 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -474,9 +474,6 @@ static BOOL forceRealHitTest = NO;
return;
}
- // FIXME: This cursor change should probably be moved to WebCore.
- [[NSCursor arrowCursor] set];
-
NSPoint mouseDownPoint = [_private->mouseDownEvent locationInWindow];
float deltaX = ABS([event locationInWindow].x - mouseDownPoint.x);
float deltaY = ABS([event locationInWindow].y - mouseDownPoint.y);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list