[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 06:46:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0a710db25871ac8c04650a967b742f3c275991b6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 2 17:03:05 2002 +0000
WebKit:
* WebView.subproj/WebControllerPolicyDelegate.h: Change modifierMask to
modifierFlags to match NSEvent.
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:]): Ditto.
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _continueAfterClickPolicyForEvent:]): Ditto.
WebBrowser:
Start of the "open window behind" feature.
* BrowserDocument.m:
(-[BrowserDocument close]): Move a cancel here from the BrowserWebController
resetDocument method that really didn't belong there.
(-[BrowserDocument _goToURL:referrer:withFallbackURLs:]): Rearrange this
function so that the part that is just "go to a particular WebResourceRequest"
is clearly separated, in preparation for using a method in WebController some day.
* BrowserDocumentController.h: Add URLWindowPolicy enum, and use it as the
parameter for goToURL and tryMultipleURLs.
* BrowserDocumentController.m:
(-[BrowserDocumentController openDocumentWithContentsOfURL:referrer:behind:):
Remove display: parameter, and add behind: parameter.
(-[BrowserDocumentController _goToEachURL:referrer:windowPolicy:]): Update to take
a windowPolicy parameter instead of separate booleans.
(-[BrowserDocumentController goToEachURL:]): Use windowPolicy.
(-[BrowserDocumentController openDocument:]): Use windowPolicy.
(-[BrowserDocumentController goToURL:]): Use windowPolicy.
(-[BrowserDocumentController goToURL:referrer:windowPolicy:]): Use windowPolicy.
(-[BrowserDocumentController tryMultipleURLs:windowPolicy:]): Use windowPolicy.
* BrowserWebController.m:
(-[BrowserWebController resetDocument]): Move cancel to BrowserDocument close.
(-[BrowserWebController openNewWindowWithURL:referrer:]): Use windowPolicy.
(-[BrowserWebController pluginNotFoundSheetEnded:returnCode:contextInfo:]):
Use windowPolicy.
(-[BrowserWebController clickPolicyForElement:button:modifierFlags:]):
Update name to match change in WebKit.
* ActivityViewer.m: (-[ActivityViewer _goToClickedItem:]):
* AppController.m:
(-[AppController application:openFile:]):
(-[AppController handleGURLEvent:withReplyEvent:]):
* BrowserWebBookmarkExtras.m: (-[WebBookmark _goToForceNewWindow:]):
* Test/PageLoadTestRunner.m: (-[PageLoadTestRunner goToPage]):
Update to use windowPolicy.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2225 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4c198c2..5aa23fd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
2002-10-02 Darin Adler <darin at apple.com>
+ * WebView.subproj/WebControllerPolicyDelegate.h: Change modifierMask to
+ modifierFlags to match NSEvent.
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:]): Ditto.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]): Ditto.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Get rid of uses of canonicalURL.
* WebCoreSupport.subproj/WebSubresourceClient.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4c198c2..5aa23fd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-10-02 Darin Adler <darin at apple.com>
+ * WebView.subproj/WebControllerPolicyDelegate.h: Change modifierMask to
+ modifierFlags to match NSEvent.
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForElement:button:modifierFlags:]): Ditto.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]): Ditto.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Get rid of uses of canonicalURL.
* WebCoreSupport.subproj/WebSubresourceClient.m:
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 6e4a3ef..738c571 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -189,7 +189,7 @@ typedef enum {
policies that determine the action of what to do with the URL or the data that
the URL represents. Typically, the policy handler methods are called in this order:
- clickPolicyForElement:button:modifierMask:<BR>
+ clickPolicyForElement:button:modifierFlags:<BR>
URLPolicyForURL:inFrame:<BR>
fileURLPolicyForMIMEType:inFrame:isDirectory:<BR>
contentPolicyForMIMEType:URL:inFrame:<BR>
@@ -197,14 +197,14 @@ typedef enum {
@protocol WebControllerPolicyDelegate <NSObject>
/*!
- @method clickPolicyForElement:button:modifierMask:
+ @method clickPolicyForElement:button:modifierFlags:
@discussion Called right after the user clicks on a link.
@param elementInformation Dictionary that describes the clicked element.
@param eventType The type of event.
- @param eventMask The event mask as described in NSEvents.h.
+ @param modifierFlags The modifier flags as described in NSEvent.h.
@result The WebClickPolicy for WebKit to implement
*/
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask;
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags;
/*!
@method URLPolicyForURL:inFrame:
@@ -255,4 +255,4 @@ typedef enum {
*/
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 51c391f..6b21ff3 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -65,7 +65,7 @@
NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL ", mime, URL);
}
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags
{
return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow URL:nil andPath:nil];
}
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index fccb662..6ed8798 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -142,8 +142,8 @@ BOOL _modifierTrackingEnabled = FALSE;
WebClickPolicy *clickPolicy;
clickPolicy = [[controller policyDelegate] clickPolicyForElement:[self _elementAtPoint:point]
- button:[event type]
- modifierMask:[event modifierFlags]];
+ button:[event type]
+ modifierFlags:[event modifierFlags]];
WebPolicyAction clickAction = [clickPolicy policyAction];
NSURL *URL = [clickPolicy URL];
@@ -162,7 +162,7 @@ BOOL _modifierTrackingEnabled = FALSE;
break;
default:
[NSException raise:NSInvalidArgumentException
- format:@"clickPolicyForElement:button:modifierMask: returned an invalid WebClickPolicy"];
+ format:@"clickPolicyForElement:button:modifierFlags: returned an invalid WebClickPolicy"];
}
return NO;
}
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 6e4a3ef..738c571 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -189,7 +189,7 @@ typedef enum {
policies that determine the action of what to do with the URL or the data that
the URL represents. Typically, the policy handler methods are called in this order:
- clickPolicyForElement:button:modifierMask:<BR>
+ clickPolicyForElement:button:modifierFlags:<BR>
URLPolicyForURL:inFrame:<BR>
fileURLPolicyForMIMEType:inFrame:isDirectory:<BR>
contentPolicyForMIMEType:URL:inFrame:<BR>
@@ -197,14 +197,14 @@ typedef enum {
@protocol WebControllerPolicyDelegate <NSObject>
/*!
- @method clickPolicyForElement:button:modifierMask:
+ @method clickPolicyForElement:button:modifierFlags:
@discussion Called right after the user clicks on a link.
@param elementInformation Dictionary that describes the clicked element.
@param eventType The type of event.
- @param eventMask The event mask as described in NSEvents.h.
+ @param modifierFlags The modifier flags as described in NSEvent.h.
@result The WebClickPolicy for WebKit to implement
*/
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask;
+- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierFlags: (unsigned int)modifierFlags;
/*!
@method URLPolicyForURL:inFrame:
@@ -255,4 +255,4 @@ typedef enum {
*/
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
- at end
\ No newline at end of file
+ at end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list