[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 08:38:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0f8f253032b3cbd96286eacf74bb11e120abfb0e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 4 16:29:50 2004 +0000
Reviewed by Ken.
- fixed <rdar://problem/3642252>: "starting to drag a link and then releasing needs to activate the link if you are still over it"
* khtml/khtmlview.cpp:
(KHTMLView::viewportMouseMoveEvent): Put hysteresis check inside !APPLE_CHANGES because
the Web Kit does our hysteresis checks.
(KHTMLView::viewportMouseReleaseEvent): Ditto.
* kwq/KWQApplication.h: Removed startDragDistance and globalStrut; unused.
* kwq/KWQApplication.mm: Removed the implementations.
* kwq/KWQPointArray.h: Removed manhattanLength; unused.
* kwq/KWQPoint.mm: Removed the implementation.
* WebCore-tests.exp: Removed manhattanLength.
* WebCore-combined.exp: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6534 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4bf29cf..ece2764 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,10 +1,29 @@
+2004-05-04 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - fixed <rdar://problem/3642252>: "starting to drag a link and then releasing needs to activate the link if you are still over it"
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::viewportMouseMoveEvent): Put hysteresis check inside !APPLE_CHANGES because
+ the Web Kit does our hysteresis checks.
+ (KHTMLView::viewportMouseReleaseEvent): Ditto.
+
+ * kwq/KWQApplication.h: Removed startDragDistance and globalStrut; unused.
+ * kwq/KWQApplication.mm: Removed the implementations.
+ * kwq/KWQPointArray.h: Removed manhattanLength; unused.
+ * kwq/KWQPoint.mm: Removed the implementation.
+
+ * WebCore-tests.exp: Removed manhattanLength.
+ * WebCore-combined.exp: Regenerated.
+
2004-05-03 Ken Kocienda <kocienda at apple.com>
Reviewed by Hyatt
- Nifty hack to work around problem where BR's inserted at the end of a block do not
- render. Since only the *last* BR has this quirk, insert two when at the end of a block.
- Once done, you can't caret past the last one, so you never insert two again.
+ Nifty hack to work around problem where BR's inserted at the end of a block do not
+ render. Since only the *last* BR has this quirk, insert two when at the end of a block.
+ Once done, you can't caret past the last one, so you never insert two again.
* khtml/editing/htmlediting_impl.cpp:
(InputNewlineCommandImpl::doApply)
@@ -56,7 +75,7 @@
Make sure that XML processing instructions set themselves as the parent node of the stylesheets they load,
so that they will get stylesheetLoaded() notifications when @imported stylesheets are contained inside the
sheet.
-
+
Reviewed by cblu
* khtml/xml/dom_xmlimpl.cpp:
diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index e8235e5..c8ea890 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -346,7 +346,6 @@ __ZNK5QRect9intersectERKS_
__ZNK5QSize10expandedToERKS_
__ZNK5QSize7isValidEv
__ZNK5QTime4msecEv
-__ZNK6QPoint15manhattanLengthEv
__ZNK7QRegExp5matchERK7QStringiPi
__ZNK7QRegExp7patternEv
__ZNK7QString10startsWithEPKc
diff --git a/WebCore/WebCore-tests.exp b/WebCore/WebCore-tests.exp
index df47833..d53fd7f 100644
--- a/WebCore/WebCore-tests.exp
+++ b/WebCore/WebCore-tests.exp
@@ -236,7 +236,6 @@ __ZNK5QRect9intersectERKS_
__ZNK5QSize10expandedToERKS_
__ZNK5QSize7isValidEv
__ZNK5QTime4msecEv
-__ZNK6QPoint15manhattanLengthEv
__ZNK7QRegExp5matchERK7QStringiPi
__ZNK7QRegExp7patternEv
__ZNK7QString10startsWithEPKc
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 628b5df..053e830 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -802,10 +802,12 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEMOVE_EVENT,mev.innerNode.handle(),false,
0,_mouse,true,DOM::NodeImpl::MouseMove);
+#if !APPLE_CHANGES
if (d->clickCount > 0 &&
QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > QApplication::startDragDistance()) {
d->clickCount = 0; // moving the mouse outside the threshold invalidates the click
}
+#endif
// execute the scheduled script. This is to make sure the mouseover events come after the mouseout events
m_part->executeScheduledScript();
@@ -951,8 +953,11 @@ void KHTMLView::viewportMouseReleaseEvent( QMouseEvent * _mouse )
bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEUP_EVENT,mev.innerNode.handle(),true,
d->clickCount,_mouse,false,DOM::NodeImpl::MouseRelease);
- if (d->clickCount > 0 &&
- QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() <= QApplication::startDragDistance())
+ if (d->clickCount > 0
+#if !APPLE_CHANGES
+ && QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() <= QApplication::startDragDistance()
+#endif
+ )
dispatchMouseEvent(EventImpl::CLICK_EVENT,mev.innerNode.handle(),true,
d->clickCount,_mouse,true,DOM::NodeImpl::MouseRelease);
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index 51ad340..9422098 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -35,11 +35,9 @@ class QDesktopWidget;
class QApplication : public QObject {
public:
- static QPalette palette(const QWidget *p=0);
+ static QPalette palette(const QWidget *p = 0);
static QDesktopWidget *desktop() { return 0; }
- static int startDragDistance() { return 2; }
- static QSize globalStrut();
- static void setOverrideCursor(const QCursor &);
+ static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
static bool sendEvent(QObject *o, QEvent *e) { return o->event(e); }
static void sendPostedEvents(QObject *receiver, int event_type) { }
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index e70c0e7..6a4ec4e 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -65,17 +65,14 @@ QRect QDesktopWidget::screenGeometry(int screenNumber)
return QRect(rect);
}
-QSize QApplication::globalStrut()
-{
- return QSize(0,0);
-}
-
void QApplication::setOverrideCursor(const QCursor &c)
{
+ // FIXME: Should implement this so that frame border dragging has the proper cursor.
}
void QApplication::restoreOverrideCursor()
{
+ // FIXME: Should implement this so that frame border dragging has the proper cursor.
}
QStyle &QApplication::style()
diff --git a/WebCore/kwq/KWQPoint.mm b/WebCore/kwq/KWQPoint.mm
index e036794..8b84b5d 100644
--- a/WebCore/kwq/KWQPoint.mm
+++ b/WebCore/kwq/KWQPoint.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,11 +37,6 @@ QPoint::QPoint(const NSPoint &p) : xCoord((int)p.x), yCoord((int)p.y)
{
}
-int QPoint::manhattanLength() const
-{
- return abs(xCoord) + abs(yCoord);
-}
-
QPoint::operator NSPoint() const
{
return NSMakePoint(xCoord, yCoord);
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index 6f89799..a086a56 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -45,8 +45,6 @@ public:
int x() const { return xCoord; }
int y() const { return yCoord; }
- int manhattanLength() const;
-
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list