[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:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 690a0acaa7ebb0be22b2212ff5551db424d849c7
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 5 09:31:02 2002 +0000
WebKit:
Added request and frame to click policy callback.
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:request:inFrame:]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _continueAfterClickPolicyForEvent:request:]):
(-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
WebBrowser:
- fixed 3044620 - incorrect URL sent to the click policy handler,
other problems, because it's processed early
* BrowserWebController.m:
(-[BrowserWebController
clickPolicyForElement:button:modifierFlags:request:inFrame:]):
Look at request URL, not element URL.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2559 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 71426d0..f45cbb6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-05 Maciej Stachowiak <mjs at apple.com>
+
+ Added request and frame to click policy callback.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:request:inFrame:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ (-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
+
2002-11-04 Richard Williamson <rjw at apple.com>
Changes to support cursive letter forms. It works, but I've
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 71426d0..f45cbb6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-11-05 Maciej Stachowiak <mjs at apple.com>
+
+ Added request and frame to click policy callback.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:request:inFrame:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ (-[WebFrame _loadURL:loadType:clientRedirect:triggeringEvent:]):
+
2002-11-04 Richard Williamson <rjw at apple.com>
Changes to support cursive letter forms. It works, but I've
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index b68890f..f05e0f9 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -211,7 +211,7 @@ typedef enum {
@param modifierFlags The modifier flags as described in NSEvent.h.
@result The WebClickPolicy for WebKit to implement
*/
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags;
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags request:(WebResourceRequest *)request inFrame:(WebFrame *)frame;
/*!
@method URLPolicyForURL:inFrame:
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 049b87a..982c96a 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -72,7 +72,7 @@
NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL ", mime, URL);
}
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags request:(WebResourceRequest *)request inFrame:(WebFrame *)frame
{
return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow URL:nil andPath:nil];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 3ae184e..67fbff5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -96,7 +96,7 @@ typedef enum {
- (WebFrameLoadType)_loadType;
- (void)_goToItem: (WebHistoryItem *)item withFrameLoadType: (WebFrameLoadType)type;
--(BOOL)_continueAfterClickPolicyForEvent:(NSEvent *)event;
+-(BOOL)_continueAfterClickPolicyForEvent:(NSEvent *)event request:(WebResourceRequest *)request;
-(void)_loadURL:(NSURL *)URL loadType:(WebFrameLoadType)loadType clientRedirect:(BOOL)clientRedirect triggeringEvent:(NSEvent *)event;
- (void)_postWithURL:(NSURL *)URL data:(NSData *)data contentType:(NSString *)contentType;
- (void)_restoreScrollPosition;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 8d9a9f8..b795a45 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -780,7 +780,7 @@ static const char * const stateNames[] = {
[newDataSource release];
}
--(BOOL)_continueAfterClickPolicyForEvent:(NSEvent *)event
+-(BOOL)_continueAfterClickPolicyForEvent:(NSEvent *)event request:(WebResourceRequest *)request
{
NSPoint point = [[[self webView] documentView] convertPoint:[event locationInWindow] fromView:nil];
WebController *controller = [self controller];
@@ -788,7 +788,9 @@ static const char * const stateNames[] = {
clickPolicy = [[controller policyDelegate] clickPolicyForElement:[(WebHTMLView *)[[self webView] documentView] _elementAtPoint:point]
button:[event type]
- modifierFlags:[event modifierFlags]];
+ modifierFlags:[event modifierFlags]
+ request:request
+ inFrame:self];
WebPolicyAction clickAction = [clickPolicy policyAction];
NSURL *URL = [clickPolicy URL];
@@ -819,7 +821,13 @@ static const char * const stateNames[] = {
// main funnel for navigating via callback from WebCore (e.g., clicking a link, redirect)
- (void)_loadURL:(NSURL *)URL loadType:(WebFrameLoadType)loadType clientRedirect:(BOOL)clientRedirect triggeringEvent:(NSEvent *)event
{
- if (event != nil && ![self _continueAfterClickPolicyForEvent:event]) {
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ [request setReferrer:[_private->bridge referrer]];
+ if (loadType == WebFrameLoadTypeReload) {
+ [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ }
+
+ if (event != nil && ![self _continueAfterClickPolicyForEvent:event request:request]) {
return;
}
@@ -840,11 +848,7 @@ static const char * const stateNames[] = {
} else {
WebFrameLoadType previousLoadType = [self _loadType];
WebDataSource *oldDataSource = [[self dataSource] retain];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
- [request setReferrer:[_private->bridge referrer]];
- if (loadType == WebFrameLoadTypeReload) {
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
- }
+
[self _loadRequest:request];
// NB: must be done after loadRequest:, which sets the provDataSource, which
// inits the load type to Standard
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index b68890f..f05e0f9 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -211,7 +211,7 @@ typedef enum {
@param modifierFlags The modifier flags as described in NSEvent.h.
@result The WebClickPolicy for WebKit to implement
*/
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags;
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags request:(WebResourceRequest *)request inFrame:(WebFrame *)frame;
/*!
@method URLPolicyForURL:inFrame:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list