[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:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2c8d73cb644ed04cc180fb918482ca44db44b7c2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 19 06:18:38 2003 +0000
WebKit:
Another rename WebController*.[hm] to WebView*.[hm]
Reviewed by darin.
* Carbon.subproj/HIWebView.h:
* Misc.subproj/WebKit.h:
* Misc.subproj/WebNSPasteboardExtras.m:
* Panels.subproj/WebStandardPanelsPrivate.h:
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
* Plugins.subproj/WebNetscapePluginStream.m:
* Plugins.subproj/WebNullPluginView.m:
* Plugins.subproj/WebPluginController.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
* WebView.subproj/WebController.h: Removed.
* WebView.subproj/WebController.m: Removed.
* WebView.subproj/WebControllerPrivate.h: Removed.
* WebView.subproj/WebControllerPrivate.m: Removed.
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebDefaultPolicyDelegate.m:
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
* WebView.subproj/WebDefaultWindowOperationsDelegate.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebImageView.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
Another rename WebController*.[hm] to WebView*.[hm]
Reviewed by darin.
* BrowserDocument.h:
* BrowserDocument.m:
* BrowserDocumentController.h:
* BrowserWebController.h:
* BrowserWebFrameExtras.m:
* BrowserWebViewExtras.m:
* BrowserWindowController.m:
* ContextMenuHandler.m:
* Debug/DebugUtilities.m:
* Debug/SnippetController.m:
* LoadProgressMonitor.m:
* LocationChangeHandler.m:
Tests:
Another rename WebController*.[hm] to WebView*.[hm]
Reviewed by darin.
* DumpBackForward/main.m:
* DumpRenderTree/main.m:
* IBViewer/DocumentController.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3861 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Carbon.subproj/HIWebView.h b/WebKit/Carbon.subproj/HIWebView.h
index 449d70b..4337e72 100644
--- a/WebKit/Carbon.subproj/HIWebView.h
+++ b/WebKit/Carbon.subproj/HIWebView.h
@@ -2,7 +2,7 @@
#define __HIWebFrameView__
#ifndef __HIWEBCONTROLLER__
-#include <WebKit/WebController.h>
+#include <WebKit/WebView.h>
#endif
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 553b46c..ba438b0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,49 @@
2003-03-18 Richard Williamson <rjw at apple.com>
+ Another rename WebController*.[hm] to WebView*.[hm]
+
+ Reviewed by darin.
+
+ * Carbon.subproj/HIWebView.h:
+ * Misc.subproj/WebKit.h:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ * Panels.subproj/WebStandardPanelsPrivate.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPluginController.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ * WebView.subproj/WebController.h: Removed.
+ * WebView.subproj/WebController.m: Removed.
+ * WebView.subproj/WebControllerPrivate.h: Removed.
+ * WebView.subproj/WebControllerPrivate.m: Removed.
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebImageView.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+
+2003-03-18 Richard Williamson <rjw at apple.com>
+
Renamed WebView*.[hm] to WebFrameView*.[hm]
Reviewed by me (I'm bad, it's just a file rename).
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index ce33a3f..f6fecb8 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/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
@@ -24,4 +23,5 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanels.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 815113c..145db33 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -6,9 +6,9 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebURLsWithTitles.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSStringExtras.h>
diff --git a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
index a3aa0d8..01c995e 100644
--- a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
+++ b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
@@ -5,7 +5,7 @@
*/
#import <WebKit/WebStandardPanels.h>
-#import <WebKit/WebController.h>
+#import <WebKit/WebView.h>
@interface WebStandardPanels (Private)
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 6748c8c..d3e5d0d 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -6,8 +6,6 @@
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
#import <WebKit/WebFrame.h>
@@ -18,6 +16,7 @@
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index 401a9e1..8d7ace9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -3,7 +3,6 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrame.h>
@@ -16,6 +15,7 @@
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPluginErrorPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResponse.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index d52295a..cde7c8f 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -6,7 +6,7 @@
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebBaseNetscapePluginViewPrivate.h>
-#import <WebKit/WebController.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebNSViewExtras.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index e51ebdd..4890541 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -3,11 +3,11 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNetscapePluginStream.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebFoundation.h>
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 486f12d..2a95e3b 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -3,7 +3,6 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
@@ -11,6 +10,7 @@
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index c484b2f..25898e3 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -8,7 +8,6 @@
#import <WebKit/WebPluginController.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameView.h>
@@ -17,6 +16,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginContainer.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebRequest.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 93929cf..6ae46fa 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -9,7 +9,6 @@
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebBasePluginPackage.h>
#import <WebKit/WebBaseResourceHandleDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
@@ -38,6 +37,7 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 03d4a01..de06c4f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -6,9 +6,9 @@
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 03d4a01..de06c4f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -6,9 +6,9 @@
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index a7849dd..9121991 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -258,10 +258,8 @@
65490EC903666E30000CED4B,
93154EF503A412E0008635CE,
5152FAD6033FC43400CA2ACD,
- 3944608E020F50ED0ECA1767,
5152FADA033FC44A00CA2ACD,
658CF8C103851FB5008C2A4B,
- 39446088020F50ED0ECA1767,
6523FAD1032DA06B005EFCFF,
3944608F020F50ED0ECA1767,
39446090020F50ED0ECA1767,
@@ -307,6 +305,8 @@
84CA5F7F042685E800CA2ACA,
51A8B53004282B5900CA2D3A,
51A8B53404282BD200CA2D3A,
+ 51A8B57B042834F700CA2D3A,
+ 51A8B57F0428353A00CA2D3A,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -388,9 +388,7 @@
F5F732D302FF4D4F01A80180,
51F6866F0366057300CA2D3A,
933D659C03413FF2008635CE,
- 3944609D020F50ED0ECA1767,
5152FADB033FC44A00CA2ACD,
- 3944609E020F50ED0ECA1767,
6523FAD2032DA06B005EFCFF,
394460A2020F50ED0ECA1767,
394460A3020F50ED0ECA1767,
@@ -425,6 +423,8 @@
70BC9EDD0414514E00A80182,
51A8B53104282B5900CA2D3A,
51A8B53504282BD200CA2D3A,
+ 51A8B57C042834F700CA2D3A,
+ 51A8B5800428353A00CA2D3A,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -865,24 +865,6 @@
//392
//393
//394
- 39446064020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebController.m;
- refType = 4;
- };
- 39446065020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebControllerPrivate.h;
- refType = 4;
- };
- 39446066020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebControllerPrivate.m;
- refType = 4;
- };
3944606B020F50ED0ECA1767 = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -901,12 +883,6 @@
path = WebPreferences.h;
refType = 4;
};
- 3944606F020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebController.h;
- refType = 4;
- };
39446070020F50ED0ECA1767 = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -973,15 +949,6 @@
path = WebHistoryItem.m;
refType = 4;
};
- 39446088020F50ED0ECA1767 = {
- fileRef = 39446065020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Private,
- );
- };
- };
3944608B020F50ED0ECA1767 = {
fileRef = 3944606B020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1000,15 +967,6 @@
);
};
};
- 3944608E020F50ED0ECA1767 = {
- fileRef = 3944606F020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
3944608F020F50ED0ECA1767 = {
fileRef = 39446070020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1057,18 +1015,6 @@
);
};
};
- 3944609D020F50ED0ECA1767 = {
- fileRef = 39446064020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 3944609E020F50ED0ECA1767 = {
- fileRef = 39446066020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
394460A1020F50ED0ECA1767 = {
fileRef = 3944606C020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1358,6 +1304,60 @@
settings = {
};
};
+ 51A8B579042834F700CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebView.h;
+ refType = 4;
+ };
+ 51A8B57A042834F700CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebView.m;
+ refType = 4;
+ };
+ 51A8B57B042834F700CA2D3A = {
+ fileRef = 51A8B579042834F700CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 51A8B57C042834F700CA2D3A = {
+ fileRef = 51A8B57A042834F700CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 51A8B57D0428353A00CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebViewPrivate.h;
+ refType = 4;
+ };
+ 51A8B57E0428353A00CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebViewPrivate.m;
+ refType = 4;
+ };
+ 51A8B57F0428353A00CA2D3A = {
+ fileRef = 51A8B57D0428353A00CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ 51A8B5800428353A00CA2D3A = {
+ fileRef = 51A8B57E0428353A00CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
51F6866C0366057300CA2D3A = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -2472,13 +2472,9 @@
933D659903413FF2008635CE,
933D659A03413FF2008635CE,
5152FAD5033FC43400CA2ACD,
- 3944606F020F50ED0ECA1767,
- 39446064020F50ED0ECA1767,
5152FAD7033FC44A00CA2ACD,
5152FAD8033FC44A00CA2ACD,
658CF8C003851FB5008C2A4B,
- 39446065020F50ED0ECA1767,
- 39446066020F50ED0ECA1767,
6523FACF032DA06B005EFCFF,
6523FAD0032DA06B005EFCFF,
39446070020F50ED0ECA1767,
@@ -2516,6 +2512,10 @@
F5AEBB3D024A527601C1A526,
9CAE9D070252A4130ECA16EA,
513D422E034CF55A00CA2ACD,
+ 51A8B579042834F700CA2D3A,
+ 51A8B57A042834F700CA2D3A,
+ 51A8B57D0428353A00CA2D3A,
+ 51A8B57E0428353A00CA2D3A,
511D5553033FD51000CA2ACD,
);
isa = PBXGroup;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 4197224..b46fee6 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -12,12 +12,12 @@
#import <WebFoundation/WebRequest.h>
#import <WebFoundation/WebResponse.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebViewPrivate.h>
@implementation WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
deleted file mode 100644
index 7a50723..0000000
--- a/WebKit/WebView.subproj/WebController.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- WebView.h
- Copyright 2001, 2002, Apple Computer, Inc.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class WebBackForwardList;
- at class WebHistoryItem;
- at class WebViewPrivate;
- at class WebDataSource;
- at class WebDownload;
- at class WebError;
- at class WebFrame;
- at class WebResource;
- at class WebPreferences;
- at class WebFrameView;
-
-
-// These strings are keys into the element dictionary provided in
-// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
-
-extern NSString *WebElementFrameKey; // WebFrame of the element
-extern NSString *WebElementImageAltStringKey; // NSString of the ALT attribute of the image element
-extern NSString *WebElementImageKey; // NSImage of the image element
-extern NSString *WebElementImageRectKey; // NSValue of an NSRect, the rect of the image element
-extern NSString *WebElementImageURLKey; // NSURL of the image element
-extern NSString *WebElementIsSelectedTextKey; // NSNumber of BOOL indicating whether the element is selected text or not
-extern NSString *WebElementLinkURLKey; // NSURL of the link if the element is within an anchor
-extern NSString *WebElementLinkTargetFrameKey; // NSString of the target of the anchor
-extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
-extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
-
-/*!
- @class WebView
- WebView manages the interaction between WebFrameViews and WebDataSources. Modification
- of the policies and behavior of the WebKit is largely managed by WebViews and their
- delegates.
-
- <p>
- Typical usage:
- </p>
- <pre>
- WebView *WebView;
- WebFrame *mainFrame;
-
- webView = [[WebController alloc] initWithFrame: NSMakeRect (0,0,640,480)];
- mainFrame = [webView mainFrame];
- [mainFrame loadRequest:request];
- </pre>
-
- WebViews have the following delegates: WebWindowOperationsDelegate,
- WebResourceLoadDelegate, WebContextMenuDelegate, WebLocationChangeDelegate,
- and WebPolicyDelegate.
-
- WebKit depends on the WebView's WebWindowOperationsDelegate for all window
- related management, including opening new windows and controlling the user interface
- elements in those windows.
-
- WebResourceLoadDelegate is used to monitor the progress of resources as they are
- loaded. This delegate may be used to present users with a progress monitor.
-
- WebView's WebContextMenuDelegate can customize the context menus that appear
- over content managed by the WebKit.
-
- The WebLocationChangeDelegate receives messages when the URL in a WebFrame is
- changed.
-
- WebView's WebPolicyDelegate can make determinations about how
- content should be handled, based on the resource's URL and MIME type.
-*/
- at interface WebView : NSView
-{
- at private
- WebViewPrivate *_private;
-}
-
-/*!
- @method canShowMIMEType:
- @abstract Checks if the WebKit can show content of a certain MIME type.
- @param MIMEType The MIME type to check.
- @result YES if the WebKit can show content with MIMEtype.
-*/
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-
-
-/*!
- @method initWithView:
- @abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
- @param view The view to use.
-*/
-- initWithView: (WebFrameView *)view;
-
-/*!
- @method initWithView:frameName:setName:
- @abstract The designated initializer for WebView.
- @discussion Initialize a WebView with the supplied parameters. This method will
- create a main WebFrame with the view. Passing a top level frame name is useful if you
- handle a targetted frame navigation that would normally open a window in some other
- way that still ends up creating a new WebView.
- @param view The main view to be associated with the controller. May be nil.
- @param frameName The name to use for the top level frame. May be nil.
- @param groupName The name of the controller set to which this controller will be added. May be nil.
- @result Returns an initialized WebView.
-*/
-- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
-
-/*!
- @method setWindowOperationsDelegate:
- @abstract Set the controller's WebWindowOperationsDelegate.
- @param delegate The WebWindowOperationsDelegate to set as the delegate.
-*/
-- (void)setWindowOperationsDelegate: (id)delegate;
-
-/*!
- @method windowOperationsDelegate
- @abstract Return the controller's WebWindowOperationsDelegate.
- @result The controller's WebWindowOperationsDelegate.
-*/
-- (id)windowOperationsDelegate;
-
-/*!
- @method setResourceLoadDelegate:
- @abstract Set the controller's WebResourceLoadDelegate load delegate.
- @param delegate The WebResourceLoadDelegate to set as the load delegate.
-*/
-- (void)setResourceLoadDelegate: (id)delegate;
-
-/*!
- @method resourceLoadDelegate
- @result Return the controller's WebResourceLoadDelegate.
-*/
-- (id)resourceLoadDelegate;
-
-/*!
- @method setDownloadDelegate:
- @abstract Set the controller's WebDownloadDelegate.
- @discussion The download delegate is retained by WebDownload when any downloads are in progress.
- @param delegate The WebDownloadDelegate to set as the download delegate.
-*/
-- (void)setDownloadDelegate: (id)delegate;
-
-/*!
- @method downloadDelegate
- @abstract Return the controller's WebDownloadDelegate.
- @result The controller's WebDownloadDelegate.
-*/
-- (id)downloadDelegate;
-
-/*!
- @method setContextMenuDelegate:
- @abstract Set the controller's WebContextMenuDelegate.
- @param delegate The WebContextMenuDelegate to set as the delegate.
-*/
-- (void)setContextMenuDelegate: (id)delegate;
-
-/*!
- @method contextMenuDelegate
- @abstract Return the controller's WebContextMenuDelegate.
- @result The controller's WebContextMenuDelegate.
-*/
-- (id)contextMenuDelegate;
-
-/*!
- @method setLocationChangeDelegate:
- @abstract Set the controller's WebLocationChangeDelegate delegate.
- @param delegate The WebLocationChangeDelegate to set as the delegate.
-*/
-- (void)setLocationChangeDelegate: (id)delegate;
-
-/*!
- @method locationChangeDelegate
- @abstract Return the controller's WebLocationChangeDelegate delegate.
- @result The controller's WebLocationChangeDelegate delegate.
-*/
-- (id)locationChangeDelegate;
-
-/*!
- @method setPolicyDelegate:
- @abstract Set the controller's WebPolicyDelegate delegate.
- @param delegate The WebPolicyDelegate to set as the delegate.
-*/
-- (void)setPolicyDelegate: (id)delegate;
-
-/*!
- @method policyDelegate
- @abstract Return the controller's WebPolicyDelegate.
- @result The controller's WebPolicyDelegate.
-*/
-- (id)policyDelegate;
-
-/*!
- @method mainFrame
- @abstract Return the top level frame.
- @discussion Note that even document that are not framesets will have a
- mainFrame.
- @result The main frame.
-*/
-- (WebFrame *)mainFrame;
-
-/*!
- @method backForwardList
- @result The backforward list for this controller.
-*/
-- (WebBackForwardList *)backForwardList;
-
-/*!
- @method setUseBackForwardList:
- @abstract Enable or disable the use of a backforward list for this controller.
- @param flag Turns use of the back forward list on or off
-*/
-- (void)setUsesBackForwardList: (BOOL)flag;
-
-/*!
- @method goBack
- @abstract Go back to the previous URL in the backforward list.
- @result YES if able to go back in the backforward list, NO otherwise.
-*/
-- (BOOL)goBack;
-
-/*!
- @method goForward
- @abstract Go forward to the next URL in the backforward list.
- @result YES if able to go forward in the backforward list, NO otherwise.
-*/
-- (BOOL)goForward;
-
-/*!
- @method goBackOrForwardToItem:
- @abstract Go back or forward to an item in the backforward list.
- @result YES if able to go to the item, NO otherwise.
-*/
-- (BOOL)goBackOrForwardToItem:(WebHistoryItem *)item;
-
-/*!
- @method setTextSizeMultiplier:
- @abstract Change the size of the text rendering in views managed by this controller.
- @param multiplier A fractional percentage value, 1.0 is 100%.
-*/
-- (void)setTextSizeMultiplier:(float)multiplier;
-
-/*!
- @method textSizeMultiplier
- @result The text size multipler.
-*/
-- (float)textSizeMultiplier;
-
-/*!
- @method setApplicationNameForUserAgent:
- @abstract Set the application name.
- @discussion This name will be used in user-agent strings
- that are chosen for best results in rendering web pages.
- @param applicationName The application name
-*/
-- (void)setApplicationNameForUserAgent:(NSString *)applicationName;
-
-/*!
- @method applicationNameForUserAgent
- @result The name of the application as used in the user-agent string.
-*/
-- (NSString *)applicationNameForUserAgent;
-
-/*!
- @method setCustomUserAgent:
- @abstract Set the user agent.
- @discussion Setting this means that the controller should use this user-agent string
- instead of constructing a user-agent string for each URL. Setting it to nil
- causes the controller to construct the user-agent string for each URL
- for best results rendering web pages.
- @param userAgentString The user agent description
-*/
-- (void)setCustomUserAgent:(NSString *)userAgentString;
-
-/*!
- @method customUserAgent
- @result The custom user-agent string or nil if no custom user-agent string has been set.
-*/
-- (NSString *)customUserAgent;
-
-/*!
- @method userAgentForURL:
- @abstract Get the appropriate user-agent string for a particular URL.
- @param URL The URL.
- @result The user-agent string for the supplied URL.
-*/
-- (NSString *)userAgentForURL:(NSURL *)URL;
-
-
-/*!
- @method supportsTextEncoding
- @abstract Find out if the current web page supports text encodings.
- @result YES if the document view of the current web page can
- support different text encodings.
-*/
-- (BOOL)supportsTextEncoding;
-
-/*!
- @method setCustomTextEncodingName:
- @discussion Make the page display with a different text encoding; stops any load in progress.
- The text encoding passed in overrides the normal text encoding smarts including
- what's specified in a web page's header or HTTP response.
- The text encoding automatically goes back to the default when the top level frame
- changes to a new location.
- Setting the text encoding name to nil makes the controller use default encoding rules.
- @param encoding The text encoding name to use to display a page or nil.
-*/
-- (void)setCustomTextEncodingName:(NSString *)encodingName;
-
-/*!
- @method customTextEncodingName
- @result The custom text encoding name or nil if no custom text encoding name has been set.
-*/
-- (NSString *)customTextEncodingName;
-
-/*!
- @method stringByEvaluatingJavaScriptFromString:
- @param script The text of the JavaScript.
- @result The result of the script, converted to a string, or nil for failure.
-*/
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
-
-/*!
- @method setPreferences:
- @param preferences The preferences to use for the controller.
- @abstract Override the standard setting for the controller.
-*/
-- (void)setPreferences: (WebPreferences *)prefs;
-
-/*!
- @method preferences
- @result Returns the preferences used by this controller.
- @discussion This method will return [WebPreferences standardPreferences] if no
- other instance of WebPreferences has been set.
-*/
-- (WebPreferences *)preferences;
-
- at end
-
-
- at interface WebView (WebIBActions)
-- (IBAction)stopLoading:(id)sender;
-- (IBAction)goBack:(id)sender;
-- (IBAction)goForward:(id)sender;
-- (IBAction)takeStringURLFrom:(id)sender;
- at end
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
deleted file mode 100644
index bc805c9..0000000
--- a/WebKit/WebView.subproj/WebController.m
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- WebView.m
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebController.h>
-
-#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerSets.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultPolicyDelegate.h>
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDynamicScrollBarsView.h>
-#import <WebKit/WebException.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameViewPrivate.h>
-#import <WebKit/WebHistoryItem.h>
-#import <WebKit/WebHistoryItemPrivate.h>
-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebKitStatisticsPrivate.h>
-#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebPreferences.h>
-#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebWindowOperationsDelegate.h>
-
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebNSUserDefaultsExtras.h>
-#import <WebFoundation/WebResource.h>
-
-static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
-
-// Turn off inlining to avoid warning with newer gcc.
-#undef __inline
-#define __inline
-#include "WebUserAgentSpoofTable.c"
-#undef __inline
-
-NSString *WebElementFrameKey = @"WebElementFrame";
-NSString *WebElementImageKey = @"WebElementImage";
-NSString *WebElementImageAltStringKey = @"WebElementImageAltString";
-NSString *WebElementImageRectKey = @"WebElementImageRect";
-NSString *WebElementImageURLKey = @"WebElementImageURL";
-NSString *WebElementIsSelectedTextKey = @"WebElementIsSelectedText";
-NSString *WebElementLinkURLKey = @"WebElementLinkURL";
-NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
-NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
-NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
-
-
-
-
- at implementation WebView
-
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType
-{
- if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
- return YES;
- }else{
- // Have the plug-ins register views and representations
- [WebPluginDatabase installedPlugins];
- if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
- return YES;
- }
- return NO;
-}
-
-- (void)_commonInitialization: (WebFrameView *)wv frameName:(NSString *)frameName groupName:(NSString *)groupName
-{
- _private = [[WebViewPrivate alloc] init];
- _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv webView: self];
- _private->controllerSetName = [groupName retain];
- if (_private->controllerSetName != nil) {
- [WebControllerSets addController:self toSetNamed:_private->controllerSetName];
- }
-
- [self setUsesBackForwardList: YES];
-
- ++WebControllerCount;
-
- [self _updateWebCoreSettingsFromPreferences: [WebPreferences standardPreferences]];
-
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)
- name:WebPreferencesChangedNotification object:[self preferences]];
-}
-
-- init
-{
- return [self initWithView: nil frameName: nil groupName: nil];
-}
-
-- initWithFrame: (NSRect)f
-{
- [super initWithFrame: f];
- WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
- [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
- [self addSubview: wv];
- [self _commonInitialization: wv frameName:nil groupName:nil];
- return self;
-}
-
-- initWithView: (WebFrameView *)view
-{
- return [self initWithView: view frameName: nil groupName: nil];
-}
-
-
-- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)groupName;
-{
- [super initWithFrame: NSZeroRect];
- [self _commonInitialization: view frameName:frameName groupName:groupName];
- return self;
-}
-
-- (void)dealloc
-{
- if (_private->controllerSetName != nil) {
- [WebControllerSets removeController:self fromSetNamed:_private->controllerSetName];
- }
-
- --WebControllerCount;
-
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [_private release];
- [super dealloc];
-}
-
-- (void)setPreferences: (WebPreferences *)prefs
-{
- if (_private->preferences != prefs){
- [[NSNotificationCenter defaultCenter] removeObserver: self name: WebPreferencesChangedNotification object: [self preferences]];
- [_private->preferences release];
- _private->preferences = [prefs retain];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)
- name:WebPreferencesChangedNotification object:[self preferences]];
- }
-}
-
-- (WebPreferences *)preferences
-{
- return _private->preferences ? _private->preferences : [WebPreferences standardPreferences];
-}
-
-- (void)setWindowOperationsDelegate:delegate
-{
- _private->windowContext = delegate;
-}
-
-- windowOperationsDelegate
-{
- return _private->windowContext;
-}
-
-- (void)setResourceLoadDelegate: delegate
-{
- _private->resourceProgressDelegate = delegate;
-}
-
-
-- resourceLoadDelegate
-{
- return _private->resourceProgressDelegate;
-}
-
-
-- (void)setDownloadDelegate: delegate
-{
- _private->downloadDelegate = delegate;
-}
-
-
-- downloadDelegate
-{
- return _private->downloadDelegate;
-}
-
-- (void)setContextMenuDelegate: delegate
-{
- _private->contextMenuDelegate = delegate;
-}
-
-- contextMenuDelegate
-{
- return _private->contextMenuDelegate;
-}
-
-- (void)setPolicyDelegate:delegate
-{
- _private->policyDelegate = delegate;
-}
-
-- policyDelegate
-{
- return _private->policyDelegate;
-}
-
-- (void)setLocationChangeDelegate:delegate
-{
- _private->locationChangeDelegate = delegate;
-}
-
-- locationChangeDelegate
-{
- return _private->locationChangeDelegate;
-}
-
-- (WebFrame *)mainFrame
-{
- return _private->mainFrame;
-}
-
-- (WebBackForwardList *)backForwardList
-{
- if (_private->useBackForwardList)
- return _private->backForwardList;
- return nil;
-}
-
-- (void)setUsesBackForwardList: (BOOL)flag
-{
- _private->useBackForwardList = flag;
-}
-
-- (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type
-{
- // We never go back/forward on a per-frame basis, so the target must be the main frame
- ASSERT([item target] == nil || [self _findFrameNamed:[item target]] == [self mainFrame]);
-
- // abort any current load if we're going back/forward
- [[self mainFrame] stopLoading];
- [[self mainFrame] _goToItem: item withLoadType: type];
-}
-
-- (BOOL)goBack
-{
- WebHistoryItem *item = [[self backForwardList] backEntry];
-
- if (item){
- [self _goToItem: item withLoadType: WebFrameLoadTypeBack];
- return YES;
- }
- return NO;
-}
-
-- (BOOL)goForward
-{
- WebHistoryItem *item = [[self backForwardList] forwardEntry];
-
- if (item){
- [self _goToItem: item withLoadType: WebFrameLoadTypeForward];
- return YES;
- }
- return NO;
-}
-
-- (BOOL)goBackOrForwardToItem:(WebHistoryItem *)item
-{
- [self _goToItem: item withLoadType: WebFrameLoadTypeIndexedBackForward];
- return YES;
-}
-
-- (void)setTextSizeMultiplier:(float)m
-{
- if (_private->textSizeMultiplier == m) {
- return;
- }
- _private->textSizeMultiplier = m;
- [[self mainFrame] _textSizeMultiplierChanged];
-}
-
-- (float)textSizeMultiplier
-{
- return _private->textSizeMultiplier;
-}
-
-- (void)setApplicationNameForUserAgent:(NSString *)applicationName
-{
- NSString *name = [applicationName copy];
- [_private->applicationNameForUserAgent release];
- _private->applicationNameForUserAgent = name;
- int i;
- for (i = 0; i != NumUserAgentStringTypes; ++i) {
- [_private->userAgent[i] release];
- _private->userAgent[i] = nil;
- }
-}
-
-- (NSString *)applicationNameForUserAgent
-{
- return [[_private->applicationNameForUserAgent retain] autorelease];
-}
-
-- (void)setCustomUserAgent:(NSString *)userAgentString
-{
- NSString *override = [userAgentString copy];
- [_private->userAgentOverride release];
- _private->userAgentOverride = override;
-}
-
-- (NSString *)customUserAgent
-{
- return [[_private->userAgentOverride retain] autorelease];
-}
-
-- (BOOL)supportsTextEncoding
-{
- id documentView = [[[self mainFrame] frameView] documentView];
- return [documentView conformsToProtocol:@protocol(WebDocumentText)]
- && [documentView supportsTextEncoding];
-}
-
-- (void)setCustomTextEncodingName:(NSString *)encoding
-{
- NSString *oldEncoding = [self customTextEncodingName];
- if (encoding == oldEncoding || [encoding isEqualToString:oldEncoding]) {
- return;
- }
- [[self mainFrame] _reloadAllowingStaleDataWithOverrideEncoding:encoding];
-}
-
-- (NSString *)_mainFrameOverrideEncoding
-{
- WebDataSource *dataSource = [[self mainFrame] provisionalDataSource];
- if (dataSource == nil) {
- dataSource = [[self mainFrame] dataSource];
- }
- if (dataSource == nil) {
- return nil;
- }
- return [dataSource _overrideEncoding];
-}
-
-- (NSString *)customTextEncodingName
-{
- return [self _mainFrameOverrideEncoding];
-}
-
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script
-{
- return [[[self mainFrame] _bridge] stringByEvaluatingJavaScriptFromString:script];
-}
-
-// Get the appropriate user-agent string for a particular URL.
-- (NSString *)userAgentForURL:(NSURL *)URL
-{
- if (_private->userAgentOverride) {
- return [[_private->userAgentOverride retain] autorelease];
- }
-
- // Look to see if we need to spoof.
- // First step is to get the host as a C-format string.
- UserAgentStringType type = Safari;
- NSString *host = [URL host];
- char hostBuffer[256];
- if (host && CFStringGetCString((CFStringRef)host, hostBuffer, sizeof(hostBuffer), kCFStringEncodingASCII)) {
- // Next step is to find the last part of the name.
- // We get the part with only two dots, and the part with only one dot.
- const char *thirdToLastPeriod = NULL;
- const char *nextToLastPeriod = NULL;
- const char *lastPeriod = NULL;
- char c;
- char *p = hostBuffer;
- while ((c = *p)) {
- if (c == '.') {
- thirdToLastPeriod = nextToLastPeriod;
- nextToLastPeriod = lastPeriod;
- lastPeriod = p;
- } else {
- *p = tolower(c);
- }
- ++p;
- }
- // Now look up that last part in the gperf spoof table.
- if (lastPeriod) {
- const char *lastPart;
- const struct UserAgentSpoofTableEntry *entry = NULL;
- if (nextToLastPeriod) {
- lastPart = thirdToLastPeriod ? thirdToLastPeriod + 1 : hostBuffer;
- entry = _web_findSpoofTableEntry(lastPart, p - lastPart);
- }
- if (!entry) {
- lastPart = nextToLastPeriod ? nextToLastPeriod + 1 : hostBuffer;
- entry = _web_findSpoofTableEntry(lastPart, p - lastPart);
- }
- if (entry) {
- type = entry->type;
- }
- }
- }
-
- NSString **userAgentStorage = &_private->userAgent[type];
-
- NSString *userAgent = *userAgentStorage;
- if (userAgent) {
- return [[userAgent retain] autorelease];
- }
-
- // FIXME: Some day we will start reporting the actual CPU here instead of hardcoding PPC.
-
- NSString *language = [NSUserDefaults _web_preferredLanguageCode];
- id sourceVersion = [[NSBundle bundleForClass:[WebView class]]
- objectForInfoDictionaryKey:(id)kCFBundleVersionKey];
- NSString *applicationName = _private->applicationNameForUserAgent;
-
- switch (type) {
- case Safari:
- if ([applicationName length]) {
- userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko) %@",
- language, sourceVersion, applicationName];
- } else {
- userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko)",
- language, sourceVersion];
- }
- break;
- case MacIE:
- if ([applicationName length]) {
- userAgent = [NSString stringWithFormat:@"Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@ %@",
- language, sourceVersion, applicationName];
- } else {
- userAgent = [NSString stringWithFormat:@"Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@",
- language, sourceVersion];
- }
- break;
- case WinIE:
- if ([applicationName length]) {
- userAgent = [NSString stringWithFormat:@"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT) AppleWebKit/%@ %@",
- language, sourceVersion, applicationName];
- } else {
- userAgent = [NSString stringWithFormat:@"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT) AppleWebKit/%@",
- language, sourceVersion];
- }
- break;
- }
-
- *userAgentStorage = [userAgent retain];
- return userAgent;
-}
-
- at end
-
-
- at implementation WebView (WebIBActions)
-
-- (IBAction)takeStringURLFrom: sender
-{
- NSString *URLString = [sender stringValue];
-
- [[self mainFrame] loadRequest: [WebRequest requestWithURL: [NSURL URLWithString: URLString]]];
-}
-
-- (IBAction)goBack:(id)sender
-{
- [self goBack];
-}
-
-- (IBAction)goForward:(id)sender
-{
- [self goForward];
-}
-
-- (IBAction)stopLoading:(id)sender
-{
- [[self mainFrame] stopLoading];
-}
-
-
- at end
-
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
deleted file mode 100644
index 8c5c050..0000000
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- WebViewPrivate.m
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPolicyDelegate.h>
-
- at class WebError;
- at class WebFrame;
- at class WebPreferences;
- at class WebCoreSettings;
- at protocol WebFormDelegate;
-
-typedef enum { Safari, MacIE, WinIE } UserAgentStringType;
-enum { NumUserAgentStringTypes = WinIE + 1 };
-
-#define NUM_LOCATION_CHANGE_DELEGATE_SELECTORS 10
-
- at interface WebViewPrivate : NSObject
-{
- at public
- WebFrame *mainFrame;
-
- id windowContext;
- id resourceProgressDelegate;
- id downloadDelegate;
- id contextMenuDelegate;
- id policyDelegate;
- id locationChangeDelegate;
- id <WebFormDelegate> formDelegate;
-
- id defaultContextMenuDelegate;
-
- WebBackForwardList *backForwardList;
- BOOL useBackForwardList;
-
- float textSizeMultiplier;
-
- NSString *applicationNameForUserAgent;
- NSString *userAgentOverride;
- NSString *userAgent[NumUserAgentStringTypes];
-
- BOOL defersCallbacks;
-
- NSString *controllerSetName;
-
- WebPreferences *preferences;
- WebCoreSettings *settings;
-
- BOOL lastElementWasNonNil;
-}
- at end
-
- at interface WebView (WebPrivate)
-
-/*!
- @method canShowFile:
- @abstract Checks if the WebKit can show the content of the file at the specified path.
- @param path The path of the file to check
- @result YES if the WebKit can show the content of the file at the specified path.
-*/
-+ (BOOL)canShowFile:(NSString *)path;
-
-/*!
- @method suggestedFileExtensionForMIMEType:
- @param MIMEType The MIME type to check.
- @result The extension based on the MIME type
-*/
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
-
-/*!
- @method frameForDataSource:
- @abstract Return the frame associated with the data source.
- @discussion Traverses the frame tree to find the frame associated
- with a datasource.
- @param datasource The datasource to match against each frame.
- @result The frame that has the associated datasource.
-*/
-- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource;
-
- /*!
- @method frameForView:
- @abstract Return the frame associated with the view.
- @discussion Traverses the frame tree to find the view.
- @param aView The view to match against each frame.
- @result The frame that has the associated view.
- */
-- (WebFrame *)_frameForView: (WebFrameView *)aView;
-
-
-- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
-
-- (void)_finishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
-- (void)_receivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
-- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
-+ (NSString *)_MIMETypeForFile:(NSString *)path;
-+ (NSArray *)_supportedImageMIMETypes;
-- (void)_downloadURL:(NSURL *)URL;
-- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directoryPath;
-
-- (BOOL)defersCallbacks;
-- (void)setDefersCallbacks:(BOOL)defers;
-
-- (void)_setTopLevelFrameName:(NSString *)name;
-- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
-- (WebFrame *)_findFrameNamed: (NSString *)name;
-
-- (WebView *)_openNewWindowWithRequest:(WebRequest *)request;
-
-- (NSMenu *)_menuForElement:(NSDictionary *)element;
-
-- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(unsigned)modifierFlags;
-
-// May well become public
-- (void)_setFormDelegate: (id<WebFormDelegate>)delegate;
-- (id<WebFormDelegate>)_formDelegate;
-
-- (WebCoreSettings *)_settings;
-- (void)_updateWebCoreSettingsFromPreferences: (WebPreferences *)prefs;
-
-- _locationChangeDelegateForwarder;
-- _resourceLoadDelegateForwarder;
-- _policyDelegateForwarder;
-- _contextMenuDelegateForwarder;
-- _windowOperationsDelegateForwarder;
- at end
-
- at interface _WebSafeForwarder : NSObject
-{
- id target; // Non-retainted. Don't retain delegates;
- id defaultTarget;
- Class templateClass;
-}
-+ safeForwarderWithTarget: t defaultTarget: dt templateClass: (Class)aClass;
- at end
-
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
deleted file mode 100644
index d11bf08..0000000
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- WebControllerPrivate.m
- Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebControllerSets.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultContextMenuDelegate.h>
-#import <WebKit/WebDefaultLocationChangeDelegate.h>
-#import <WebKit/WebDefaultPolicyDelegate.h>
-#import <WebKit/WebDefaultResourceLoadDelegate.h>
-#import <WebKit/WebDefaultWindowOperationsDelegate.h>
-#import <WebKit/WebDownloadPrivate.h>
-#import <WebKit/WebFormDelegatePrivate.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameViewPrivate.h>
-#import <WebKit/WebLocationChangeDelegate.h>
-#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebStandardPanelsPrivate.h>
-#import <WebKit/WebWindowOperationsDelegate.h>
-
-#import <WebFoundation/WebAssertions.h>
-
-#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebNSDataExtras.h>
-#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
-
-#import <WebCore/WebCoreSettings.h>
-
- at implementation WebViewPrivate
-
-- init
-{
- backForwardList = [[WebBackForwardList alloc] init];
- defaultContextMenuDelegate = [[WebDefaultContextMenuDelegate alloc] init];
- textSizeMultiplier = 1;
-
- settings = [[WebCoreSettings alloc] init];
-
- return self;
-}
-
-- (void)_clearControllerReferences: (WebFrame *)aFrame
-{
- NSArray *frames;
- WebFrame *nextFrame;
- int i, count;
-
- [[aFrame dataSource] _setController: nil];
- [[aFrame frameView] _setController: nil];
- [aFrame _setController: nil];
-
- // Walk the frame tree, niling the controller.
- frames = [aFrame children];
- count = [frames count];
- for (i = 0; i < count; i++){
- nextFrame = [frames objectAtIndex: i];
- [self _clearControllerReferences: nextFrame];
- }
-}
-
-- (void)dealloc
-{
- [self _clearControllerReferences: mainFrame];
- [mainFrame _controllerWillBeDeallocated];
-
- [mainFrame release];
- [defaultContextMenuDelegate release];
- [backForwardList release];
- [applicationNameForUserAgent release];
- [userAgentOverride release];
- int i;
- for (i = 0; i != NumUserAgentStringTypes; ++i) {
- [userAgent[i] release];
- }
-
- [controllerSetName release];
-
- [preferences release];
- [settings release];
-
- [super dealloc];
-}
-
- at end
-
-
- at implementation WebView (WebPrivate)
-
-+ (BOOL)canShowFile:(NSString *)path
-{
- NSString *MIMEType;
-
- MIMEType = [WebView _MIMETypeForFile:path];
- return [[self class] canShowMIMEType:MIMEType];
-}
-
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
-{
- return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
-}
-
-
-- (WebFrame *)_createFrameNamed:(NSString *)fname inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling
-{
- WebFrameView *childView = [[WebFrameView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
-
- [childView _setController:self];
- [childView setAllowsScrolling:allowsScrolling];
-
- WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView webView:self];
-
- [childView release];
-
- [parent _addChild:newFrame];
-
- [newFrame release];
-
- return newFrame;
-}
-
-- (void)_finishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
-{
- WebFrame *frame = [dataSource webFrame];
-
- ASSERT(dataSource != nil);
-
- // This resource has completed, so check if the load is complete for all frames.
- if (frame != nil) {
- [frame _transitionToLayoutAcceptable];
- [frame _checkLoadComplete];
- }
-}
-
-- (void)_mainReceivedBytesSoFar: (unsigned)bytesSoFar fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete
-{
- WebFrame *frame = [dataSource webFrame];
-
- ASSERT(dataSource != nil);
-
- // The frame may be nil if a previously cancelled load is still making progress callbacks.
- if (frame == nil)
- return;
-
- // This resource has completed, so check if the load is complete for all frames.
- if (isComplete){
- // If the load is complete, mark the primary load as done. The primary load is the load
- // of the main document. Other resources may still be arriving.
- [dataSource _setPrimaryLoadComplete: YES];
- [frame _checkLoadComplete];
- }
- else {
- // If the frame isn't complete it might be ready for a layout. Perform that check here.
- // Note that transitioning a frame to this state doesn't guarantee a layout, rather it
- // just indicates that an early layout can be performed.
- int timedLayoutSize = [[WebPreferences standardPreferences] _initialTimedLayoutSize];
- if ((int)bytesSoFar > timedLayoutSize)
- [frame _transitionToLayoutAcceptable];
- }
-}
-
-
-- (void)_receivedError: (WebError *)error fromDataSource: (WebDataSource *)dataSource
-{
- WebFrame *frame = [dataSource webFrame];
-
- [frame _checkLoadComplete];
-}
-
-
-- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
-{
- ASSERT(dataSource);
-#ifndef NDEBUG
- ASSERT([dataSource webFrame]);
-#endif
-
- [dataSource _setMainDocumentError: error];
-
- if (isComplete) {
- [dataSource _setPrimaryLoadComplete:YES];
- [[dataSource webFrame] _checkLoadComplete];
- }
-}
-
-+ (NSString *)_MIMETypeForFile:(NSString *)path
-{
- NSString *extension = [path pathExtension];
- NSString *MIMEType = nil;
-
- // Get the MIME type from the extension.
- if ([extension length] != 0) {
- MIMEType = [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
- }
-
- // If we can't get a known MIME type from the extension, sniff.
- if ([MIMEType length] == 0 || [MIMEType isEqualToString:@"application/octet-stream"]) {
- NSFileHandle *handle = [NSFileHandle fileHandleForReadingAtPath:path];
- NSData *data = [handle readDataOfLength:GUESS_MIME_TYPE_PEEK_LENGTH];
- [handle closeFile];
- if ([data length] != 0) {
- MIMEType = [data _web_guessedMIMEType];
- }
- if ([MIMEType length] == 0){
- MIMEType = @"application/octet-stream";
- }
- }
-
- return MIMEType;
-}
-
-+ (NSArray *)_supportedImageMIMETypes
-{
- static NSArray *imageMIMETypes = nil;
-
- if(!imageMIMETypes){
- NSEnumerator *enumerator = [[NSImage imageFileTypes] objectEnumerator];
- WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
- NSMutableSet *mimes = [NSMutableSet set];
- NSString *type;
-
- while ((type = [enumerator nextObject]) != nil) {
- NSString *mime = [mappings MIMETypeForExtension:type];
- if(mime && ![mime isEqualToString:@"application/octet-stream"] && ![mime isEqualToString:@"application/pdf"]){
- [mimes addObject:mime];
- }
- }
-
- imageMIMETypes = [[mimes allObjects] retain];
- }
-
- return imageMIMETypes;
-}
-
-- (void)_downloadURL:(NSURL *)URL
-{
- [self _downloadURL:URL toDirectory:nil];
-}
-
-- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directory
-{
- ASSERT(URL);
-
- WebRequest *request = [[WebRequest alloc] initWithURL:URL];
- WebDownload *download = [[WebDownload alloc] initWithRequest:request];
- [request release];
-
- if (directory != nil && [directory isAbsolutePath]) {
- [download _setDirectoryPath:directory];
- }
-
- // The download retains itself in loadWithDelegate.
- [download loadWithDelegate:_private->downloadDelegate];
- [download release];
-}
-
-- (BOOL)defersCallbacks
-{
- return _private->defersCallbacks;
-}
-
-- (void)setDefersCallbacks:(BOOL)defers
-{
- if (defers == _private->defersCallbacks) {
- return;
- }
-
- _private->defersCallbacks = defers;
- [_private->mainFrame _defersCallbacksChanged];
-}
-
-- (void)_setTopLevelFrameName:(NSString *)name
-{
- [[self mainFrame] _setName:name];
-}
-
-- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name
-{
- return [[self mainFrame] _descendantFrameNamed:name];
-}
-
-- (WebFrame *)_findFrameNamed: (NSString *)name
-{
- // Try this controller first
- WebFrame *frame = [self _findFrameInThisWindowNamed:name];
-
- if (frame != nil) {
- return frame;
- }
-
- // Try other controllers in the same set
- if (_private->controllerSetName != nil) {
- NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
- WebView *controller;
- while ((controller = [enumerator nextObject]) != nil && frame == nil) {
- frame = [controller _findFrameInThisWindowNamed:name];
- }
- }
-
- return frame;
-}
-
-- (WebView *)_openNewWindowWithRequest:(WebRequest *)request
-{
- id wd = [self windowOperationsDelegate];
- WebView *newWindowController = nil;
- if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
- newWindowController = [wd webView:self createWindowWithRequest:request];
- else {
- newWindowController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:self createWindowWithRequest: request];
- }
-
- [[newWindowController _windowOperationsDelegateForwarder] webViewShowWindow: self];
-
- return newWindowController;
-}
-
-- (NSMenu *)_menuForElement:(NSDictionary *)element
-{
- NSArray *defaultMenuItems = [_private->defaultContextMenuDelegate
- webView:self contextMenuItemsForElement:element defaultMenuItems:nil];
- NSArray *menuItems = defaultMenuItems;
- NSMenu *menu = nil;
- unsigned i;
-
- if (_private->contextMenuDelegate) {
- id cd = _private->contextMenuDelegate;
-
- if ([cd respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])
- menuItems = [cd webView:self contextMenuItemsForElement:element defaultMenuItems:defaultMenuItems];
- }
-
- if (menuItems && [menuItems count] > 0) {
- menu = [[[NSMenu alloc] init] autorelease];
-
- for (i=0; i<[menuItems count]; i++) {
- [menu addItem:[menuItems objectAtIndex:i]];
- }
- }
-
- return menu;
-}
-
-- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(unsigned)modifierFlags
-{
- // When the mouse isn't over this view at all, we'll get called with a dictionary of nil over
- // and over again. So it's a good idea to catch that here and not send multiple calls to the delegate
- // for that case.
-
- if (dictionary && _private->lastElementWasNonNil) {
- [[self _windowOperationsDelegateForwarder] webView:self mouseDidMoveOverElement:dictionary modifierFlags:modifierFlags];
- }
- _private->lastElementWasNonNil = dictionary != nil;
-}
-
-- (void)_setFormDelegate: (id<WebFormDelegate>)delegate
-{
- _private->formDelegate = delegate;
-}
-
-- (id<WebFormDelegate>)_formDelegate
-{
- if (!_private->formDelegate) {
- // create lazily, to give the client a chance to set one before we bother to alloc the shared one
- _private->formDelegate = [WebFormDelegate _sharedWebFormDelegate];
- }
- return _private->formDelegate;
-}
-
-- (WebCoreSettings *)_settings
-{
- return _private->settings;
-}
-
-- (void)_updateWebCoreSettingsFromPreferences: (WebPreferences *)preferences
-{
- [_private->settings setCursiveFontFamily:[preferences cursiveFontFamily]];
- [_private->settings setDefaultFixedFontSize:[preferences defaultFixedFontSize]];
- [_private->settings setDefaultFontSize:[preferences defaultFontSize]];
- [_private->settings setFantasyFontFamily:[preferences fantasyFontFamily]];
- [_private->settings setFixedFontFamily:[preferences fixedFontFamily]];
- [_private->settings setJavaEnabled:[preferences JavaEnabled]];
- [_private->settings setJavaScriptEnabled:[preferences JavaScriptEnabled]];
- [_private->settings setJavaScriptCanOpenWindowsAutomatically:[preferences JavaScriptCanOpenWindowsAutomatically]];
- [_private->settings setMinimumFontSize:[preferences minimumFontSize]];
- [_private->settings setPluginsEnabled:[preferences pluginsEnabled]];
- [_private->settings setSansSerifFontFamily:[preferences sansSerifFontFamily]];
- [_private->settings setSerifFontFamily:[preferences serifFontFamily]];
- [_private->settings setStandardFontFamily:[preferences standardFontFamily]];
- [_private->settings setWillLoadImagesAutomatically:[preferences willLoadImagesAutomatically]];
-
- if ([preferences userStyleSheetEnabled]) {
- [_private->settings setUserStyleSheetLocation:[preferences userStyleSheetLocation]];
- } else {
- [_private->settings setUserStyleSheetLocation:@""];
- }
-}
-
-- (void)_releaseUserAgentStrings
-{
- int i;
- for (i = 0; i != NumUserAgentStringTypes; ++i) {
- [_private->userAgent[i] release];
- _private->userAgent[i] = nil;
- }
-}
-
-
-- (void)_preferencesChangedNotification: (NSNotification *)notification
-{
- WebPreferences *preferences = (WebPreferences *)[notification object];
-
- ASSERT (preferences == [self preferences]);
- [self _releaseUserAgentStrings];
- [self _updateWebCoreSettingsFromPreferences: preferences];
-}
-
-- _locationChangeDelegateForwarder
-{
- return [_WebSafeForwarder safeForwarderWithTarget: [self locationChangeDelegate] defaultTarget: [WebDefaultLocationChangeDelegate sharedLocationChangeDelegate] templateClass: [WebDefaultLocationChangeDelegate class]];
-}
-
-- _resourceLoadDelegateForwarder
-{
- return [_WebSafeForwarder safeForwarderWithTarget: [self resourceLoadDelegate] defaultTarget: [WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] templateClass: [WebDefaultResourceLoadDelegate class]];
-}
-
-- _policyDelegateForwarder
-{
- return [_WebSafeForwarder safeForwarderWithTarget: [self policyDelegate] defaultTarget: [WebDefaultPolicyDelegate sharedPolicyDelegate] templateClass: [WebDefaultPolicyDelegate class]];
-}
-
-- _contextMenuDelegateForwarder
-{
- return [_WebSafeForwarder safeForwarderWithTarget: [self contextMenuDelegate] defaultTarget: [WebDefaultContextMenuDelegate sharedContextMenuDelegate] templateClass: [WebDefaultContextMenuDelegate class]];
-}
-
-- _windowOperationsDelegateForwarder
-{
- return [_WebSafeForwarder safeForwarderWithTarget: [self windowOperationsDelegate] defaultTarget: [WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] templateClass: [WebDefaultWindowOperationsDelegate class]];
-}
-
-
-- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
-{
- NSArray *frames;
- int i, count;
- WebFrame *result, *aFrame;
-
- if ([frame dataSource] == dataSource)
- return frame;
-
- if ([frame provisionalDataSource] == dataSource)
- return frame;
-
- frames = [frame children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForDataSource: dataSource fromFrame: aFrame];
- if (result)
- return result;
- }
-
- return nil;
-}
-
-
-- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource
-{
- WebFrame *frame = [self mainFrame];
-
- return [self _frameForDataSource: dataSource fromFrame: frame];
-}
-
-
-- (WebFrame *)_frameForView: (WebFrameView *)aView fromFrame: (WebFrame *)frame
-{
- NSArray *frames;
- int i, count;
- WebFrame *result, *aFrame;
-
- if ([frame frameView] == aView)
- return frame;
-
- frames = [frame children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForView: aView fromFrame: aFrame];
- if (result)
- return result;
- }
-
- return nil;
-}
-
-- (WebFrame *)_frameForView: (WebFrameView *)aView
-{
- WebFrame *frame = [self mainFrame];
-
- return [self _frameForView: aView fromFrame: frame];
-}
-
- at end
-
-
- at implementation _WebSafeForwarder
-
-- initWithTarget: t defaultTarget: dt templateClass: (Class)aClass
-{
- [super init];
- target = t; // Non retained.
- defaultTarget = dt;
- templateClass = aClass;
- return self;
-}
-
-
-// Used to send messages to delegates that implement informal protocols.
-+ safeForwarderWithTarget: t defaultTarget: dt templateClass: (Class)aClass;
-{
- return [[[_WebSafeForwarder alloc] initWithTarget: t defaultTarget: dt templateClass: aClass] autorelease];
-}
-
-- (void)forwardInvocation:(NSInvocation *)anInvocation
-{
- if ([target respondsToSelector: [anInvocation selector]])
- [anInvocation invokeWithTarget: target];
- else if ([defaultTarget respondsToSelector: [anInvocation selector]])
- [anInvocation invokeWithTarget: defaultTarget];
- // Do nothing quietly if method not implemented.
-}
-
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
-{
- return [templateClass instanceMethodSignatureForSelector: aSelector];
-}
-
- at end
-
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index e81aa62..ea0f8b4 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -3,16 +3,16 @@
Copyright 2001, 2002, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownload.h>
#import <WebKit/WebException.h>
-#import <WebKit/WebHTMLRepresentation.h>
-#import <WebKit/WebMainResourceClient.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebHTMLRepresentation.h>
#import <WebKit/WebKitStatisticsPrivate.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebView.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 0147dbd..c6bcb71 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -5,9 +5,7 @@
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownload.h>
#import <WebKit/WebException.h>
@@ -28,6 +26,7 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebTextRepresentation.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebHTTPResponse.h>
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 98f75d3..5a29f7b 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -7,13 +7,13 @@
#import <WebKit/WebBridge.h>
#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPrivate.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/WebViewPrivate.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebLocalizableStrings.h>
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index b1cc132..84abfe5 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -2,11 +2,12 @@
WebDefaultPolicyDelegate.m
Copyright 2002, Apple Computer, Inc.
*/
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebView.h>
+
#import <WebFoundation/WebResource.h>
#import <WebFoundation/WebRequest.h>
#import <WebFoundation/WebResponse.h>
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index a163c35..ce61110 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -11,7 +11,7 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebPluginError.h>
-#import <WebKit/WebController.h>
+#import <WebKit/WebView.h>
@implementation WebDefaultResourceLoadDelegate
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index ec9aa54..f72dd17 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -6,8 +6,8 @@
#import <WebFoundation/WebRequest.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
index ec9aa54..f72dd17 100644
--- a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
@@ -6,8 +6,8 @@
#import <WebFoundation/WebRequest.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index ee1841a..8c1291d 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -9,7 +9,6 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameViewPrivate.h>
@@ -19,6 +18,7 @@
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 832b0b6..bc833d9 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -8,10 +8,8 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebControllerPolicyDelegatePrivate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
@@ -28,6 +26,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 3c95c8b..54251d0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -6,7 +6,6 @@
#import <WebKit/WebClipView.h>
#import <WebKit/WebCookieAdapter.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
@@ -23,6 +22,7 @@
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextView.h>
#import <WebKit/WebViewFactory.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 5f1c52b..a1f3d25 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -7,12 +7,11 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebImageView.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebTextView.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebResponse.h>
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 56bbc1f..0be5e4f 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -8,8 +8,6 @@
#import <WebKit/WebBridge.h>
#import <WebKit/WebClipView.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDOMDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
@@ -28,6 +26,7 @@
#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebUnicode.h>
+#import <WebKit/WebViewPrivate.h>
#import <AppKit/NSResponder_Private.h>
#import <CoreGraphics/CGContextGState.h>
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index c34f6c1..5d8c4b8 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -15,9 +15,7 @@
#import <WebKit/WebBridge.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameViewPrivate.h>
@@ -30,6 +28,7 @@
#import <WebKit/WebPluginController.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebStringTruncator.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 9d953c3..4354316 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -6,13 +6,13 @@
#import <WebKit/WebImageView.h>
#import <WebCore/WebCoreImageRenderer.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRepresentation.h>
#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 4197224..b46fee6 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -12,12 +12,12 @@
#import <WebFoundation/WebRequest.h>
#import <WebFoundation/WebResponse.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebViewPrivate.h>
@implementation WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 7817527..1ddba06 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -15,12 +15,10 @@
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownloadPrivate.h>
#import <WebKit/WebFrame.h>
@@ -31,6 +29,7 @@
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebViewPrivate.h>
// FIXME: More that is in common with WebSubresourceClient should move up into WebBaseResourceHandleDelegate.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 7817527..1ddba06 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -15,12 +15,10 @@
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
-#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownloadPrivate.h>
#import <WebKit/WebFrame.h>
@@ -31,6 +29,7 @@
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebViewPrivate.h>
// FIXME: More that is in common with WebSubresourceClient should move up into WebBaseResourceHandleDelegate.
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index bd24176..60813cf 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -8,12 +8,12 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResponse.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPreferences.h>
+#import <WebKit/WebViewPrivate.h>
@implementation WebTextView
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 7a50723..7439952 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -43,10 +43,10 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
Typical usage:
</p>
<pre>
- WebView *WebView;
+ WebView *webView;
WebFrame *mainFrame;
- webView = [[WebController alloc] initWithFrame: NSMakeRect (0,0,640,480)];
+ webView = [[WebView alloc] initWithFrame: NSMakeRect (0,0,640,480)];
mainFrame = [webView mainFrame];
[mainFrame loadRequest:request];
</pre>
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index bc805c9..dd25db3 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2,16 +2,11 @@
WebView.m
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
-
-#import <WebKit/WebController.h>
-
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerSets.h>
#import <WebKit/WebControllerPolicyDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
@@ -27,6 +22,7 @@
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 8c5c050..3e4cfa0 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -3,9 +3,10 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
+#import <WebKit/WebView.h>
+ at class WebBackForwardList;
@class WebError;
@class WebFrame;
@class WebPreferences;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index d11bf08..67c2d48 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -5,7 +5,6 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebContextMenuDelegate.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebControllerSets.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuDelegate.h>
@@ -21,6 +20,7 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list