[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:14:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 358180db8460bc2b915139fa99018954d88918c7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 12 18:54:13 2002 +0000
Reviewed by Trey and Ken.
- fixed 3125613 -- REGRESSION: resizing frames after clicking on scroll bar doesn't work right
The problem was that the mouse dragged events were going to the scroll bar because the new click
on the frame resizer didn't fall into the code path that sets _mouseDownView.
* kwq/KWQKHTMLPart.h: Add override of khtmlMouseMoveEvent.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::passWidgetMouseDownEventToWidget): Don't set _mouseDownView. This is now handled
at the higher level when the mouseDown comes in.
(KWQKHTMLPart::khtmlMouseMoveEvent): Added. Pass along mouseDragged: events. I didn't have this
before because I don't want or need to pass mouseMoved: events along, but the KHTML mouse move
event corresponds to both AppKit mouseDragged and mouseMoved.
(KWQKHTMLPart::khtmlMouseReleaseEvent): Don't clear _mouseDownView. This is now handled at the
higher level when the mouseUp comes in.
(KWQKHTMLPart::passSubframeEventToSubframe): Ditto.
(KWQKHTMLPart::mouseDown): Set _mouseDownView to nil; it will be set by passWidgetMouseDownEventToWidget
if we end up passing the event down. This is the change that actually fixes the bug mentioned above.
(KWQKHTMLPart::mouseUp): Set _mouseDownView to nil after handling the mouseUp. It's OK if we don't
clear this out in cases where we don't get a mouseUp event -- we'll get a mouseDown later -- but it's
still probably a good idea to clear it when we know the mouse is no longer down.
- used update-kwq-assert to update the code that's a shared copy of WebFoundation code
* kwq/KWQAssertions.m: (vprintf_stderr_objc): Got the UTF-8 fix I did a while back.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3021 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 692f159..900f70e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,32 @@
+2002-12-12 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey and Ken.
+
+ - fixed 3125613 -- REGRESSION: resizing frames after clicking on scroll bar doesn't work right
+
+ The problem was that the mouse dragged events were going to the scroll bar because the new click
+ on the frame resizer didn't fall into the code path that sets _mouseDownView.
+
+ * kwq/KWQKHTMLPart.h: Add override of khtmlMouseMoveEvent.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::passWidgetMouseDownEventToWidget): Don't set _mouseDownView. This is now handled
+ at the higher level when the mouseDown comes in.
+ (KWQKHTMLPart::khtmlMouseMoveEvent): Added. Pass along mouseDragged: events. I didn't have this
+ before because I don't want or need to pass mouseMoved: events along, but the KHTML mouse move
+ event corresponds to both AppKit mouseDragged and mouseMoved.
+ (KWQKHTMLPart::khtmlMouseReleaseEvent): Don't clear _mouseDownView. This is now handled at the
+ higher level when the mouseUp comes in.
+ (KWQKHTMLPart::passSubframeEventToSubframe): Ditto.
+ (KWQKHTMLPart::mouseDown): Set _mouseDownView to nil; it will be set by passWidgetMouseDownEventToWidget
+ if we end up passing the event down. This is the change that actually fixes the bug mentioned above.
+ (KWQKHTMLPart::mouseUp): Set _mouseDownView to nil after handling the mouseUp. It's OK if we don't
+ clear this out in cases where we don't get a mouseUp event -- we'll get a mouseDown later -- but it's
+ still probably a good idea to clear it when we know the mouse is no longer down.
+
+ - used update-kwq-assert to update the code that's a shared copy of WebFoundation code
+
+ * kwq/KWQAssertions.m: (vprintf_stderr_objc): Got the UTF-8 fix I did a while back.
+
2002-12-12 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 692f159..900f70e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,32 @@
+2002-12-12 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey and Ken.
+
+ - fixed 3125613 -- REGRESSION: resizing frames after clicking on scroll bar doesn't work right
+
+ The problem was that the mouse dragged events were going to the scroll bar because the new click
+ on the frame resizer didn't fall into the code path that sets _mouseDownView.
+
+ * kwq/KWQKHTMLPart.h: Add override of khtmlMouseMoveEvent.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::passWidgetMouseDownEventToWidget): Don't set _mouseDownView. This is now handled
+ at the higher level when the mouseDown comes in.
+ (KWQKHTMLPart::khtmlMouseMoveEvent): Added. Pass along mouseDragged: events. I didn't have this
+ before because I don't want or need to pass mouseMoved: events along, but the KHTML mouse move
+ event corresponds to both AppKit mouseDragged and mouseMoved.
+ (KWQKHTMLPart::khtmlMouseReleaseEvent): Don't clear _mouseDownView. This is now handled at the
+ higher level when the mouseUp comes in.
+ (KWQKHTMLPart::passSubframeEventToSubframe): Ditto.
+ (KWQKHTMLPart::mouseDown): Set _mouseDownView to nil; it will be set by passWidgetMouseDownEventToWidget
+ if we end up passing the event down. This is the change that actually fixes the bug mentioned above.
+ (KWQKHTMLPart::mouseUp): Set _mouseDownView to nil after handling the mouseUp. It's OK if we don't
+ clear this out in cases where we don't get a mouseUp event -- we'll get a mouseDown later -- but it's
+ still probably a good idea to clear it when we know the mouse is no longer down.
+
+ - used update-kwq-assert to update the code that's a shared copy of WebFoundation code
+
+ * kwq/KWQAssertions.m: (vprintf_stderr_objc): Got the UTF-8 fix I did a while back.
+
2002-12-12 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
diff --git a/WebCore/kwq/KWQAssertions.m b/WebCore/kwq/KWQAssertions.m
index a9333f1..738533a 100644
--- a/WebCore/kwq/KWQAssertions.m
+++ b/WebCore/kwq/KWQAssertions.m
@@ -32,7 +32,7 @@ static void vprintf_stderr_objc(const char *format, va_list args)
if (!strstr(format, "%@")) {
vfprintf_no_warning(stderr, format, args);
} else {
- fputs([[[[NSString alloc] initWithFormat:[NSString stringWithCString:format] arguments:args] autorelease] lossyCString], stderr);
+ fputs([[[[NSString alloc] initWithFormat:[NSString stringWithCString:format] arguments:args] autorelease] UTF8String], stderr);
}
}
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 092ccce..fe562da 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -162,6 +162,7 @@ public:
private:
virtual void khtmlMousePressEvent(khtml::MousePressEvent *);
virtual void khtmlMouseDoubleClickEvent(khtml::MouseDoubleClickEvent *);
+ virtual void khtmlMouseMoveEvent(khtml::MouseMoveEvent *);
virtual void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *);
static int buttonForCurrentEvent();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5fc04ac..5fda573 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -56,6 +56,7 @@ using khtml::Cache;
using khtml::ChildFrame;
using khtml::Decoder;
using khtml::MouseDoubleClickEvent;
+using khtml::MouseMoveEvent;
using khtml::MousePressEvent;
using khtml::MouseReleaseEvent;
using khtml::RenderObject;
@@ -740,8 +741,6 @@ void KWQKHTMLPart::khtmlMouseDoubleClickEvent(MouseDoubleClickEvent *event)
bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(khtml::MouseEvent *event)
{
- _mouseDownView = nil;
-
// Figure out which view to send the event to.
RenderObject *target = event->innerNode().handle()->renderer();
if (!target || !target->isWidget()) {
@@ -752,8 +751,6 @@ bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(khtml::MouseEvent *event)
bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(RenderWidget *renderWidget)
{
- _mouseDownView = nil;
-
NSView *nodeView = renderWidget->widget()->getView();
ASSERT(nodeView);
ASSERT([nodeView superview]);
@@ -780,6 +777,18 @@ bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(RenderWidget *renderWidget)
return true;
}
+void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
+{
+ if (!_mouseDownView || [_currentEvent type] != NSLeftMouseDragged) {
+ KHTMLPart::khtmlMouseMoveEvent(event);
+ return;
+ }
+
+ _sendingEventToSubview = true;
+ [_mouseDownView mouseDragged:_currentEvent];
+ _sendingEventToSubview = false;
+}
+
void KWQKHTMLPart::khtmlMouseReleaseEvent(MouseReleaseEvent *event)
{
if (!_mouseDownView) {
@@ -790,7 +799,6 @@ void KWQKHTMLPart::khtmlMouseReleaseEvent(MouseReleaseEvent *event)
_sendingEventToSubview = true;
[_mouseDownView mouseUp:_currentEvent];
_sendingEventToSubview = false;
- _mouseDownView = nil;
}
void KWQKHTMLPart::widgetWillReleaseView(NSView *view)
@@ -840,7 +848,6 @@ bool KWQKHTMLPart::passSubframeEventToSubframe(DOM::NodeImpl::MouseEvent &event)
_sendingEventToSubview = true;
[_mouseDownView mouseUp:_currentEvent];
_sendingEventToSubview = false;
- _mouseDownView = nil;
return true;
case NSLeftMouseDragged:
if (!(_mouseDownView && _mouseDownWasInSubframe)) {
@@ -897,6 +904,8 @@ void KWQKHTMLPart::mouseDown(NSEvent *event)
return;
}
+ _mouseDownView = nil;
+
NSEvent *oldCurrentEvent = _currentEvent;
_currentEvent = event;
@@ -948,6 +957,8 @@ void KWQKHTMLPart::mouseUp(NSEvent *event)
}
_currentEvent = oldCurrentEvent;
+
+ _mouseDownView = nil;
}
void KWQKHTMLPart::mouseMoved(NSEvent *event)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list