[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:57:06 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 04150d1f1c59d29a13b8c098db0562199b44041c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 5 01:10:22 2002 +0000
Changes to send NSEvents all the way through WebCore and then pass
them back out to WebKit, so that click policy can have a
WebResourceRequest added.
* kwq/KWQKHTMLPart.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::KWQKHTMLPart):
(KWQKHTMLPart::openURL):
(KWQKHTMLPart::openURLRequest):
(KWQKHTMLPart::urlSelected):
(KWQKHTMLPart::submitForm):
(KWQKHTMLPart::createDummyDocument):
(KWQKHTMLPart::setCurrentEvent):
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge mouseUp:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2556 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 419b018..a03c165 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-11-04 Maciej Stachowiak <mjs at apple.com>
+
+ Changes to send NSEvents all the way through WebCore and then pass
+ them back out to WebKit, so that click policy can have a
+ WebResourceRequest added.
+
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::openURL):
+ (KWQKHTMLPart::openURLRequest):
+ (KWQKHTMLPart::urlSelected):
+ (KWQKHTMLPart::submitForm):
+ (KWQKHTMLPart::createDummyDocument):
+ (KWQKHTMLPart::setCurrentEvent):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge mouseUp:]):
+
2002-11-03 Darin Adler <darin at apple.com>
- fixed 3091300 -- "prelighting" on local page is still slow, despite recent bug fix
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 419b018..a03c165 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2002-11-04 Maciej Stachowiak <mjs at apple.com>
+
+ Changes to send NSEvents all the way through WebCore and then pass
+ them back out to WebKit, so that click policy can have a
+ WebResourceRequest added.
+
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::openURL):
+ (KWQKHTMLPart::openURLRequest):
+ (KWQKHTMLPart::urlSelected):
+ (KWQKHTMLPart::submitForm):
+ (KWQKHTMLPart::createDummyDocument):
+ (KWQKHTMLPart::setCurrentEvent):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge mouseUp:]):
+
2002-11-03 Darin Adler <darin at apple.com>
- fixed 3091300 -- "prelighting" on local page is still slow, despite recent bug fix
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 419b018..a03c165 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2002-11-04 Maciej Stachowiak <mjs at apple.com>
+
+ Changes to send NSEvents all the way through WebCore and then pass
+ them back out to WebKit, so that click policy can have a
+ WebResourceRequest added.
+
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::openURL):
+ (KWQKHTMLPart::openURLRequest):
+ (KWQKHTMLPart::urlSelected):
+ (KWQKHTMLPart::submitForm):
+ (KWQKHTMLPart::createDummyDocument):
+ (KWQKHTMLPart::setCurrentEvent):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge mouseUp:]):
+
2002-11-03 Darin Adler <darin at apple.com>
- fixed 3091300 -- "prelighting" on local page is still slow, despite recent bug fix
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 4381394..0c64a7b 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -54,9 +54,11 @@ namespace khtml {
#ifdef __OBJC__
@class NSView;
@class WebCoreBridge;
+ at class NSEvent;
#else
class NSView;
class WebCoreBridge;
+class NSEvent;
#endif
enum KWQSelectionDirection {
@@ -142,7 +144,8 @@ public:
int selectionEndOffset() const;
DOM::NodeImpl *selectionStart() const;
DOM::NodeImpl *selectionEnd() const;
-
+
+ void setCurrentEvent(NSEvent *event);
private:
void setPolicyBaseURL(const DOM::DOMString &);
@@ -163,6 +166,8 @@ private:
bool _needsToSetWidgetsAside;
+ NSEvent *_currentEvent;
+
static QPtrList<KWQKHTMLPart> &mutableInstances();
friend class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 31b7191..d46c971 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -93,6 +93,8 @@ KWQKHTMLPart::KWQKHTMLPart(KHTMLPart *p)
, _completed(p, SIGNAL(completed()))
, _completedWithBool(p, SIGNAL(completed(bool)))
, _needsToSetWidgetsAside(false)
+ , _currentEvent(NULL)
+
{
Cache::init();
mutableInstances().prepend(this);
@@ -130,7 +132,7 @@ void KWQKHTMLPart::openURL(const KURL &url)
// FIXME: The lack of args here to get the reload flag from
// indicates a problem in KHTMLPart::processObjectRequest,
// where we are opening the URL before the args are set up.
- [_bridge loadURL:cocoaURL reload:NO];
+ [_bridge loadURL:cocoaURL reload:NO triggeringEvent:nil];
}
}
@@ -140,7 +142,7 @@ void KWQKHTMLPart::openURLRequest(const KURL &url, const URLArgs &args)
if (cocoaURL == nil) {
// FIXME: We need to report this error to someone.
} else {
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL reload:args.reload];
+ [bridgeForFrameName(args.frameName) loadURL:cocoaURL reload:args.reload triggeringEvent:nil];
}
}
@@ -170,7 +172,8 @@ void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URL
return;
}
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL reload:args.reload];
+
+ [bridgeForFrameName(args.frameName) loadURL:cocoaURL reload:args.reload triggeringEvent:_currentEvent];
}
class KWQPluginPart : public ReadOnlyPart
@@ -212,7 +215,7 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
void KWQKHTMLPart::submitForm(const KURL &u, const URLArgs &args)
{
if (!args.doPost()) {
- [bridgeForFrameName(args.frameName) loadURL:u.getNSURL() reload:args.reload];
+ [bridgeForFrameName(args.frameName) loadURL:u.getNSURL() reload:args.reload triggeringEvent:nil];
} else {
QString contentType = args.contentType();
ASSERT(contentType.startsWith("Content-Type: "));
@@ -526,3 +529,10 @@ void KWQKHTMLPart::createDummyDocument()
d->m_doc = DOMImplementationImpl::instance()->createHTMLDocument(d->m_view);
d->m_doc->ref();
}
+
+void KWQKHTMLPart::setCurrentEvent(NSEvent *event)
+{
+ [event retain];
+ [_currentEvent release];
+ _currentEvent = event;
+}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index c5fda4b..1bf6ee1 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -83,6 +83,7 @@ enum FrameBorderStyle {
KHTMLPart *part;
KHTMLRenderPart *renderPart;
BOOL bridgeOwnsKHTMLView;
+ NSEvent *currentEvent;
}
- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
@@ -177,7 +178,7 @@ enum FrameBorderStyle {
- (WebCoreBridge *)findFramedNamed:(NSString *)name;
- (WebCoreBridge *)findOrCreateFramedNamed:(NSString *)name;
-- (void)loadURL:(NSURL *)URL reload:(BOOL)reload;
+- (void)loadURL:(NSURL *)URL reload:(BOOL)reload triggeringEvent:(NSEvent *)event;
- (void)postWithURL:(NSURL *)URL data:(NSData *)data contentType:(NSString *)contentType;
- (WebCoreBridge *)createWindowWithURL:(NSURL *)URL frameName:(NSString *)name;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 35c4877..134a1f1 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -367,11 +367,15 @@ using khtml::RenderPart;
// viewportMouseDoubleClickEvent.
if (clickCount > 0 && clickCount % 2 == 0) {
QMouseEvent doubleClickEvent(QEvent::MouseButtonDblClick, QPoint(p), button, state, clickCount);
+ part->kwq->setCurrentEvent(event);
part->kwq->view()->viewportMouseDoubleClickEvent(&doubleClickEvent);
+ part->kwq->setCurrentEvent(nil);
}
else {
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(p), button, state, clickCount);
+ part->kwq->setCurrentEvent(event);
part->kwq->view()->viewportMouseReleaseEvent(&releaseEvent);
+ part->kwq->setCurrentEvent(nil);
}
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list