[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 20d2b6716f669f5ffedb94985f0336492b146e06
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 20 01:14:01 2003 +0000
WebKit:
Rename WebControllerPolicyDelegate*.[hm] to WebPolicyDelegate*.[hm]
Reviewed by trey.
* API-Issues.rtf:
* Misc.subproj/WebKit.h:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebControllerPolicyDelegate.h: Removed.
* WebView.subproj/WebControllerPolicyDelegate.m: Removed.
* WebView.subproj/WebControllerPolicyDelegatePrivate.h: Removed.
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebFrameView.h:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebPolicyDelegate.m:
* WebView.subproj/WebPolicyDelegatePrivate.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.h:
WebBrowser:
Rename WebControllerPolicyDelegate*.[hm] to WebPolicyDelegate*.[hm]
Reviewed by trey.
* BrowserWebController.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3868 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/API-Issues.rtf b/WebKit/API-Issues.rtf
index 6cd5a50..a35e1ad 100644
--- a/WebKit/API-Issues.rtf
+++ b/WebKit/API-Issues.rtf
@@ -24,4 +24,5 @@
\f2\fs20 \CocoaLigature0 suggestedFileExtensionForMIMEType\
+ remove canShowFile\
+ put class methods from WebContentTypes back on WebController (WebView)\
+move isDocumentHTML off WebFrameView and WebDataSource\
}
\ No newline at end of file
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 25a624e..94f66b3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,27 @@
+2003-03-19 Richard Williamson <rjw at apple.com>
+
+ Rename WebControllerPolicyDelegate*.[hm] to WebPolicyDelegate*.[hm]
+
+ Reviewed by trey.
+
+ * API-Issues.rtf:
+ * Misc.subproj/WebKit.h:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebControllerPolicyDelegate.h: Removed.
+ * WebView.subproj/WebControllerPolicyDelegate.m: Removed.
+ * WebView.subproj/WebControllerPolicyDelegatePrivate.h: Removed.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebFrameView.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebPolicyDelegate.m:
+ * WebView.subproj/WebPolicyDelegatePrivate.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.h:
+
2003-03-19 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index f6fecb8..427df53 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -5,7 +5,6 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
@@ -20,6 +19,7 @@
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebPluginError.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanels.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 9121991..a5bb142 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -258,8 +258,6 @@
65490EC903666E30000CED4B,
93154EF503A412E0008635CE,
5152FAD6033FC43400CA2ACD,
- 5152FADA033FC44A00CA2ACD,
- 658CF8C103851FB5008C2A4B,
6523FAD1032DA06B005EFCFF,
3944608F020F50ED0ECA1767,
39446090020F50ED0ECA1767,
@@ -307,6 +305,8 @@
51A8B53404282BD200CA2D3A,
51A8B57B042834F700CA2D3A,
51A8B57F0428353A00CA2D3A,
+ 51443F9D0429392B00CA2D3A,
+ 51443F9F0429392B00CA2D3A,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -388,7 +388,6 @@
F5F732D302FF4D4F01A80180,
51F6866F0366057300CA2D3A,
933D659C03413FF2008635CE,
- 5152FADB033FC44A00CA2ACD,
6523FAD2032DA06B005EFCFF,
394460A2020F50ED0ECA1767,
394460A3020F50ED0ECA1767,
@@ -425,6 +424,7 @@
51A8B53504282BD200CA2D3A,
51A8B57C042834F700CA2D3A,
51A8B5800428353A00CA2D3A,
+ 51443F9E0429392B00CA2D3A,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1084,15 +1084,26 @@
path = WebView.subproj/WebResourceLoadDelegate.h;
refType = 2;
};
- 5152FAD5033FC43400CA2ACD = {
- fileEncoding = 4;
+ 51443F9A0429392B00CA2D3A = {
+ fileEncoding = 30;
isa = PBXFileReference;
- name = WebContextMenuDelegate.h;
- path = WebView.subproj/WebContextMenuDelegate.h;
- refType = 2;
+ path = WebPolicyDelegate.h;
+ refType = 4;
};
- 5152FAD6033FC43400CA2ACD = {
- fileRef = 5152FAD5033FC43400CA2ACD;
+ 51443F9B0429392B00CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebPolicyDelegate.m;
+ refType = 4;
+ };
+ 51443F9C0429392B00CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebPolicyDelegatePrivate.h;
+ refType = 4;
+ };
+ 51443F9D0429392B00CA2D3A = {
+ fileRef = 51443F9A0429392B00CA2D3A;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -1100,22 +1111,30 @@
);
};
};
- 5152FAD7033FC44A00CA2ACD = {
- fileEncoding = 4;
- isa = PBXFileReference;
- name = WebControllerPolicyDelegate.h;
- path = WebView.subproj/WebControllerPolicyDelegate.h;
- refType = 2;
+ 51443F9E0429392B00CA2D3A = {
+ fileRef = 51443F9B0429392B00CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 51443F9F0429392B00CA2D3A = {
+ fileRef = 51443F9C0429392B00CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
};
- 5152FAD8033FC44A00CA2ACD = {
+ 5152FAD5033FC43400CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
- name = WebControllerPolicyDelegate.m;
- path = WebView.subproj/WebControllerPolicyDelegate.m;
+ name = WebContextMenuDelegate.h;
+ path = WebView.subproj/WebContextMenuDelegate.h;
refType = 2;
};
- 5152FADA033FC44A00CA2ACD = {
- fileRef = 5152FAD7033FC44A00CA2ACD;
+ 5152FAD6033FC43400CA2ACD = {
+ fileRef = 5152FAD5033FC43400CA2ACD;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -1123,12 +1142,6 @@
);
};
};
- 5152FADB033FC44A00CA2ACD = {
- fileRef = 5152FAD8033FC44A00CA2ACD;
- isa = PBXBuildFile;
- settings = {
- };
- };
5152FADD033FC50400CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -1568,21 +1581,6 @@
settings = {
};
};
- 658CF8C003851FB5008C2A4B = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebControllerPolicyDelegatePrivate.h;
- refType = 4;
- };
- 658CF8C103851FB5008C2A4B = {
- fileRef = 658CF8C003851FB5008C2A4B;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Private,
- );
- };
- };
//650
//651
//652
@@ -2472,9 +2470,6 @@
933D659903413FF2008635CE,
933D659A03413FF2008635CE,
5152FAD5033FC43400CA2ACD,
- 5152FAD7033FC44A00CA2ACD,
- 5152FAD8033FC44A00CA2ACD,
- 658CF8C003851FB5008C2A4B,
6523FACF032DA06B005EFCFF,
6523FAD0032DA06B005EFCFF,
39446070020F50ED0ECA1767,
@@ -2508,6 +2503,9 @@
5152FAE5033FC52200CA2ACD,
F5D538E802441F2601A80181,
F5D538EC02441FDD01A80181,
+ 51443F9A0429392B00CA2D3A,
+ 51443F9B0429392B00CA2D3A,
+ 51443F9C0429392B00CA2D3A,
3944606E020F50ED0ECA1767,
F5AEBB3D024A527601C1A526,
9CAE9D070252A4130ECA16EA,
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
deleted file mode 100644
index 2c0404e..0000000
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- WebPolicyDelegate.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class WebView;
- at class WebError;
- at class WebFrame;
- at class WebPolicyPrivate;
- at class WebResponse;
- at class WebRequest;
-
-
-/*!
- @enum WebNavigationType
- @abstract The type of action that triggered a possible navigation.
- @constant WebNavigationTypeLinkClicked A link with an href was clicked.
- @constant WebNavigationTypeFormSubmitted A form was submitted.
- @constant WebNavigationTypeBackForward The user chose back or forward.
- @constant WebNavigationTypeReload The User hit the reload button.
- @constant WebNavigationTypeFormResubmitted A form was resubmitted (by virtue of doing back, forward or reload).
- @constant WebNavigationTypeOther Navigation is taking place for some other reason.
-*/
-
-typedef enum {
- WebNavigationTypeLinkClicked,
- WebNavigationTypeFormSubmitted,
- WebNavigationTypeBackForward,
- WebNavigationTypeReload,
- WebNavigationTypeFormResubmitted,
- WebNavigationTypeOther
-} WebNavigationType;
-
-
-extern NSString *WebActionNavigationTypeKey; // NSNumber (WebActionType)
-extern NSString *WebActionElementKey; // NSDictionary of element info
-extern NSString *WebActionButtonKey; // NSEventType
-extern NSString *WebActionModifierFlagsKey; // NSNumber (unsigned)
-extern NSString *WebActionOriginalURLKey; // NSURL
-
-
-/*!
- @protocol WebPolicyDecisionListener
- @discussion This protocol is used to call back with the results of a
- policy decision. This provides the ability to make these decisions
- asyncrhonously, which means the decision can be made by prompting
- with a sheet, for example.
-*/
-
- at protocol WebPolicyDecisionListener <NSObject>
-
-/*!
- @method use
- @abstract Use the resource
- @discussion If there remain more policy decisions to be made, then
- the next policy delegate method gets to decide. This will be
- either the next navigation policy delegate if there is a redirect,
- or the content policy delegate. If there are no more policy
- decisions to be made, the resource will be displayed inline if
- possible. If there is no view available to display the resource
- inline, then unableToImplementPolicyWithError:inFrame: will be
- called with an appropriate error.
-
- <p>If a new window is going to be created for this navigation as a
- result of frame targetting, then it will be created once you call
- this method.
-*/
--(void)use;
-/*!
- @method download
- @abstract Download the resource instead of displaying it.
- @discussion This method is more than just a convenience because it
- allows an in-progress navigation to be converted to a download
- based on content type, without having to stop and restart the
- load.
-*/
--(void)download;
-
-/*!
- @method ignore
- @abstract Do nothing (but the client may choose to handle the request itself)
- @discussion A policy of ignore prevents WebKit from doing anything
- further with the load, however, the client is still free to handle
- the request in some other way, such as opening a new window,
- opening a new window behind the current one, opening the URL in an
- external app, revealing the location in Finder if a file URL, etc.
-*/
--(void)ignore;
-
- at end
-
-
-/*!
- @category WebPolicyDelegate
- @discussion While loading a URL, WebKit asks the WebControllerPolicyDelegate for
- 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:
-
- decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener: (at most once)<BR>
- decideNavigationPolicyForAction:inFrame::decisionListener: (one or more times)<BR>
- decideContentPolicyForMIMEType:andRequest:inFrame: (at most once)<BR>
-*/
- at interface NSObject (WebPolicyDelegate)
-
-/*!
- @method decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:
- @abstract This method is called to decide what to do with a proposed navigation.
- @param actionInformation Dictionary that describes the action that triggered this navigation.
- @param request The request for the proposed navigation
- @param frame The WebFrame in which the navigation is happening
- @param listener The object to call when the decision is made
- @discussion This method will be called before loading starts, and
- on every redirect.
-*/
-- (void)webView:(WebView *)webView decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(id<WebPolicyDecisionListener>)listener;
-
-/*!
- @method decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:
- @discussion This method is called to decide what to do with an targetted nagivation that would open a new window.
- @param actionInformation Dictionary that describes the action that triggered this navigation.
- @param request The request for the proposed navigation
- @param frame The frame in which the navigation is taking place
- @param listener The object to call when the decision is made
- @discussion This method is provided so that modified clicks on a targetted link which
- opens a new frame can prevent the new window from being opened if they decide to
- do something else, like download or present the new frame in a specialized way.
-
- <p>If this method picks a policy of Use, the new window will be
- opened, and decideNavigationPolicyForAction:andRequest:inFrame:decisionListner:
- will be called with a WebNavigationType of WebNavigationTypeOther
- in its action. This is to avoid possible confusion about the modifiers.
-*/
-- (void)webView:(WebView *)webView decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
- newFrameName:(NSString *)frameName
- decisionListener:(id<WebPolicyDecisionListener>)listener;
-
-/*!
- @method decideContentPolicyForMIMEType:andRequest:inFrame:
- @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted.
- @param type MIME type for the resource.
- @param request A WebResourceRequest for the partially loaded content.
- @param frame The frame which is loading the URL.
- @param listener The object to call when the decision is made
-*/
-- (void)webView:(WebView *)webView decideContentPolicyForMIMEType:(NSString *)type
- andRequest:(WebRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(id<WebPolicyDecisionListener>)listener;
-
-/*!
- @method unableToImplementPolicy:error:forURL:inFrame:
- @discussion Called when a WebPolicy could not be implemented. It is up to the client to display appropriate feedback.
- @param policy The policy that could not be implemented.
- @param error The error that caused the policy to not be implemented.
- @param URL The URL of the resource for which a particular action was requested but failed.
- @param frame The frame in which the policy could not be implemented.
-*/
-- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
-
- at end
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
deleted file mode 100644
index 2b6ec75..0000000
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- WebControllerPolicyDelegate.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
-
-NSString *WebActionNavigationTypeKey = @"WebActionNavigationTypeKey";
-NSString *WebActionElementKey = @"WebActionElementKey";
-NSString *WebActionButtonKey = @"WebActionButtonKey";
-NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
-NSString *WebActionOriginalURLKey = @"WebActionOriginalURLKey";
-
-
- at interface WebPolicyDecisionListenerPrivate : NSObject
-{
- at public
- id target;
- SEL action;
-}
-
--(id)initWithTarget:(id)target action:(SEL)action;
-
- at end
-
- at implementation WebPolicyDecisionListenerPrivate
-
--(id)initWithTarget:(id)t action:(SEL)a
-{
- self = [super init];
- if (self != nil) {
- target = [t retain];
- action = a;
- }
- return self;
-}
-
--(void)dealloc
-{
- [target release];
- [super dealloc];
-}
-
- at end
-
- at implementation WebPolicyDecisionListener
-
--(id)_initWithTarget:(id)target action:(SEL)action
-{
- self = [super init];
- if (self != nil) {
- _private = [[WebPolicyDecisionListenerPrivate alloc] initWithTarget:target action:action];
- }
- return self;
-}
-
--(void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-
--(void)_usePolicy:(WebPolicyAction)policy
-{
- if (_private->target != nil) {
- [_private->target performSelector:_private->action withObject:(id)policy];
- }
-}
-
--(void)_invalidate
-{
- [self retain];
- [_private->target release];
- _private->target = nil;
- [self release];
-}
-
-// WebPolicyDecisionListener implementation
-
--(void)use
-{
- [self _usePolicy:WebPolicyUse];
-}
-
--(void)ignore
-{
- [self _usePolicy:WebPolicyIgnore];
-}
-
--(void)download
-{
- [self _usePolicy:WebPolicyDownload];
-}
-
-// WebFormSubmissionListener implementation
-
--(void)continue
-{
- [self _usePolicy:WebPolicyUse];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
deleted file mode 100644
index 41e0011..0000000
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- WebControllerPolicyDelegatePrivate.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-
-#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebFormDelegate.h>
-
-typedef enum {
- WebPolicyUse,
- WebPolicyDownload,
- WebPolicyIgnore,
-} WebPolicyAction;
-
-
- at class WebPolicyDecisionListenerPrivate;
-
- at interface WebPolicyDecisionListener : NSObject <WebPolicyDecisionListener, WebFormSubmissionListener>
-{
- at private
- WebPolicyDecisionListenerPrivate *_private;
-}
-
--(id)_initWithTarget:(id)target action:(SEL)action;
-
--(void)_invalidate;
-
- at end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index c6bcb71..1965ecb 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -5,7 +5,6 @@
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownload.h>
#import <WebKit/WebException.h>
@@ -23,6 +22,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebTextRepresentation.h>
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 5a29f7b..b10cc9b 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -6,14 +6,14 @@
#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebFrameView.h>
-#import <WebKit/WebWindowOperationsDelegate.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebLocalizableStrings.h>
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 84abfe5..27bebaa 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -2,10 +2,10 @@
WebDefaultPolicyDelegate.m
Copyright 2002, Apple Computer, Inc.
*/
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebResource.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index e5cbfd0..7f83798 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -7,7 +7,7 @@
*/
#import <WebKit/WebFrame.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
@class WebBridge;
@class WebFormState;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f3ddc8a..1701890 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -8,8 +8,6 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
@@ -25,6 +23,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index d7d2fe8..982e2af 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -23,13 +23,6 @@
}
/*!
- @method initWithFrame:
- @param frame The frame rectangle for the view
- @result An initialized WebFrameView
-*/
-- (id)initWithFrame: (NSRect) frame;
-
-/*!
@method webFrame
@abstract Returns the WebFrame associated with this WebFrameView
@result The WebFrameView's frame.
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 5d8c4b8..2483c44 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -15,7 +15,6 @@
#import <WebKit/WebBridge.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameViewPrivate.h>
@@ -26,6 +25,7 @@
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebPluginController.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebStringTruncator.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1ddba06..bc13556 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -15,18 +15,16 @@
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
-#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownloadPrivate.h>
-#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1ddba06..bc13556 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -15,18 +15,16 @@
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
-#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownloadPrivate.h>
-#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.m b/WebKit/WebView.subproj/WebPolicyDelegate.m
index 2b6ec75..24c6721 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.m
@@ -1,10 +1,9 @@
/*
- WebControllerPolicyDelegate.m
+ WebPolicyDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
+#import <WebKit/WebPolicyDelegatePrivate.h>
NSString *WebActionNavigationTypeKey = @"WebActionNavigationTypeKey";
NSString *WebActionElementKey = @"WebActionElementKey";
diff --git a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
index 41e0011..475ad7c 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
@@ -1,10 +1,10 @@
/*
- WebControllerPolicyDelegatePrivate.h
+ WebPolicyDelegatePrivate.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPolicyDelegate.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebFormDelegate.h>
typedef enum {
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index dd25db3..548363e 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -6,7 +6,6 @@
#import <WebKit/WebBridge.h>
#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebControllerSets.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
@@ -20,6 +19,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 3e4cfa0..a73715c 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -3,7 +3,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPolicyDelegate.h>
+#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebView.h>
@class WebBackForwardList;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list