[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:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit dcb54766a30eac6d5c86041ad4d8df61af841cd5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 19 05:13:03 2003 +0000
WebKit:
Renamed WebView*.[hm] to WebFrameView*.[hm]
Reviewed by me (I'm bad, it's just a file rename).
* Misc.subproj/WebKit.h:
* Misc.subproj/WebNSViewExtras.m:
* Panels.subproj/WebStandardPanels.m:
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
* Plugins.subproj/WebNetscapePluginRepresentation.m:
* Plugins.subproj/WebNullPluginView.m:
* Plugins.subproj/WebPluginController.m:
* Plugins.subproj/WebPluginDatabase.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebController.m:
* WebView.subproj/WebControllerPrivate.m:
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDebugDOMNode.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebFrameViewPrivate.h:
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebImageView.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebRenderNode.m:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebView.h: Removed.
* WebView.subproj/WebView.m: Removed.
* WebView.subproj/WebViewPrivate.h: Removed.
* WebView.subproj/WebViewPrivate.m: Removed.
WebBrowser:
Renamed WebView*.[hm] to WebFrameView*.[hm]
Reviewed by me (I'm bad, it's just a file rename).
* BrowserDocument.m:
* BrowserTabViewItem.m:
* BrowserWebController.m:
* BrowserWebViewExtras.h:
* BrowserWindowController.m:
* ContextMenuHandler.m:
* Debug/ViewTree.m:
* FormCompletionController.m:
* LocationChangeHandler.m:
Tests:
Renamed WebView*.[hm] to WebFrameView*.[hm]
Reviewed by me (I'm bad, it's just a file rename).
* DumpBackForward/main.m:
* DumpRenderTree/main.m:
* HeaderView/ApplicationController.m:
* HeaderView/DocumentController.m:
* IBViewer/ApplicationController.m:
* PDFBundle/PDFView.m:
* PDFViewer/ApplicationController.m:
* PDFViewer/DocumentController.m:
* PDFViewer/PDFRepresentation.m:
* SimpleViewer/ApplicationController.m:
* SimpleViewer/DocumentController.m:
* SnippetEditor/ApplicationController.m:
* SnippetEditor/SnippetController.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3860 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d523118..553b46c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,44 @@
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).
+
+ * Misc.subproj/WebKit.h:
+ * Misc.subproj/WebNSViewExtras.m:
+ * Panels.subproj/WebStandardPanels.m:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPluginController.m:
+ * Plugins.subproj/WebPluginDatabase.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebControllerPrivate.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDebugDOMNode.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebFrameViewPrivate.h:
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebImageView.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebRenderNode.m:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebView.h: Removed.
+ * WebView.subproj/WebView.m: Removed.
+ * WebView.subproj/WebViewPrivate.h: Removed.
+ * WebView.subproj/WebViewPrivate.m: Removed.
+
+2003-03-18 Richard Williamson <rjw at apple.com>
+
Stage 2 of WebController to WebView renaming.
Reviewed by hyatt.
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index 73cb969..ce33a3f 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -12,6 +12,7 @@
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownload.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebHTMLRepresentation.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebHistory.h>
@@ -23,5 +24,4 @@
#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/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 2aa9008..590c40a 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -3,10 +3,10 @@
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebNSImageExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebView.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 70f6dd4..b881aec 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -6,10 +6,10 @@
#import <WebKit/WebStandardPanels.h>
-#import <WebKit/WebStandardPanelsPrivate.h>
-#import <WebKit/WebPanelAuthenticationHandler.h>
#import <WebKit/WebFrame.h>
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
+#import <WebKit/WebPanelAuthenticationHandler.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebAuthenticationManager.h>
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index f154c73..6748c8c 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -12,12 +12,12 @@
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginStream.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index c120ac3..401a9e1 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -7,6 +7,7 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
@@ -15,7 +16,6 @@
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPluginErrorPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebView.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResponse.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index 082e563..d52295a 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -8,9 +8,9 @@
#import <WebKit/WebBaseNetscapePluginViewPrivate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebView.h>
#import <WebFoundation/WebRequest.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index e39dcdd..9ae7d16 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -5,9 +5,9 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
-#import <WebKit/WebView.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFoundation.h>
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index bccf7c1..486f12d 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -6,11 +6,11 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebPluginError.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebView.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 4e7efd8..c484b2f 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -11,12 +11,12 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginContainer.h>
-#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebRequest.h>
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 47ef7e9..af42439 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -7,14 +7,13 @@
#import <WebKit/WebBasePluginPackage.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPluginPackage.h>
-#import <WebKit/WebView.h>
-#import <WebKit/WebViewPrivate.h>
@implementation WebPluginDatabase
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 409eb2a..93929cf 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -13,10 +13,14 @@
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
+#import <WebKit/WebFileButton.h>
+#import <WebKit/WebFormDelegate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebHTMLRepresentationPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebJavaScriptTextInputPanel.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitStatisticsPrivate.h>
@@ -34,11 +38,7 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
-#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebKit/WebFormDelegate.h>
-#import <WebKit/WebFileButton.h>
-#import <WebKit/WebJavaScriptTextInputPanel.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index a7f37cf..a7849dd 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -287,8 +287,6 @@
657D8FA10366687600FA1ED0,
35081DAA02B6D4E40ACA2ACA,
35081DAC02B6D4E40ACA2ACA,
- 39446092020F50ED0ECA1767,
- 39446093020F50ED0ECA1767,
511D5554033FD51000CA2ACD,
516F297003A6C45A00CA2D3A,
832B2D1603B10990009CF105,
@@ -307,6 +305,8 @@
70BC9ED904144FC500A80182,
70BC9EDC0414514E00A80182,
84CA5F7F042685E800CA2ACA,
+ 51A8B53004282B5900CA2D3A,
+ 51A8B53404282BD200CA2D3A,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -410,8 +410,6 @@
F5F81C3C02B67C26018635CA,
35081DAB02B6D4E40ACA2ACA,
35081DAD02B6D4E40ACA2ACA,
- 394460A5020F50ED0ECA1767,
- 394460A6020F50ED0ECA1767,
832B2D1703B10990009CF105,
84A992C503CE696800CA2ACA,
2D81DAB503EB0B2D00A80166,
@@ -425,6 +423,8 @@
700BC50E04144DA100A80182,
70BC9ED704144F3200A80182,
70BC9EDD0414514E00A80182,
+ 51A8B53104282B5900CA2D3A,
+ 51A8B53504282BD200CA2D3A,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -937,30 +937,6 @@
path = WebFrame.h;
refType = 4;
};
- 39446076020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebView.h;
- refType = 4;
- };
- 39446077020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebView.m;
- refType = 4;
- };
- 39446078020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebViewPrivate.h;
- refType = 4;
- };
- 39446079020F50ED0ECA1767 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebViewPrivate.m;
- refType = 4;
- };
3944607A020F50ED0ECA1767 = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -1057,21 +1033,6 @@
);
};
};
- 39446092020F50ED0ECA1767 = {
- fileRef = 39446076020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 39446093020F50ED0ECA1767 = {
- fileRef = 39446078020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
39446094020F50ED0ECA1767 = {
fileRef = 3944607A020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1126,18 +1087,6 @@
settings = {
};
};
- 394460A5020F50ED0ECA1767 = {
- fileRef = 39446077020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 394460A6020F50ED0ECA1767 = {
- fileRef = 39446079020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
394460A7020F50ED0ECA1767 = {
fileRef = 3944607B020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1358,6 +1307,57 @@
settings = {
};
};
+ 51A8B52E04282B5900CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebFrameView.h;
+ refType = 4;
+ };
+ 51A8B52F04282B5900CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebFrameView.m;
+ refType = 4;
+ };
+ 51A8B53004282B5900CA2D3A = {
+ fileRef = 51A8B52E04282B5900CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 51A8B53104282B5900CA2D3A = {
+ fileRef = 51A8B52F04282B5900CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 51A8B53204282BD200CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebFrameViewPrivate.h;
+ refType = 4;
+ };
+ 51A8B53304282BD200CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebFrameViewPrivate.m;
+ refType = 4;
+ };
+ 51A8B53404282BD200CA2D3A = {
+ fileRef = 51A8B53204282BD200CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 51A8B53504282BD200CA2D3A = {
+ fileRef = 51A8B53304282BD200CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
51F6866C0366057300CA2D3A = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -2505,6 +2505,10 @@
F5143A370221DCCE01A80181,
9CF0E249021361B00ECA16EA,
9CF0E24A021361B00ECA16EA,
+ 51A8B52E04282B5900CA2D3A,
+ 51A8B52F04282B5900CA2D3A,
+ 51A8B53204282BD200CA2D3A,
+ 51A8B53304282BD200CA2D3A,
5152FAE5033FC52200CA2ACD,
F5D538E802441F2601A80181,
F5D538EC02441FDD01A80181,
@@ -2512,10 +2516,6 @@
F5AEBB3D024A527601C1A526,
9CAE9D070252A4130ECA16EA,
513D422E034CF55A00CA2ACD,
- 39446076020F50ED0ECA1767,
- 39446077020F50ED0ECA1767,
- 39446078020F50ED0ECA1767,
- 39446079020F50ED0ECA1767,
511D5553033FD51000CA2ACD,
);
isa = PBXGroup;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index d63ba4b..bc805c9 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -19,6 +19,7 @@
#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>
@@ -26,7 +27,6 @@
#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/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index f364157..d11bf08 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -16,11 +16,11 @@
#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/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 449d25e..0147dbd 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -12,6 +12,7 @@
#import <WebKit/WebDownload.h>
#import <WebKit/WebException.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHistory.h>
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHistoryItemPrivate.h>
@@ -27,7 +28,6 @@
#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/WebDebugDOMNode.m b/WebKit/WebView.subproj/WebDebugDOMNode.m
index a915052..bc435b1 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.m
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.m
@@ -5,8 +5,8 @@
#import "WebDebugDOMNode.h"
-#import <WebKit/WebView.h>
#import <WebKit/WebBridge.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebHTMLViewPrivate.h>
@interface WebKitDOMTreeCopier : NSObject <WebCoreDOMTreeCopier>
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 3d78758..98f75d3 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -12,7 +12,7 @@
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebNSPasteboardExtras.h>
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebHTTPRequest.h>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 777c022..ee1841a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -12,13 +12,13 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHTMLRepresentationPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#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 e64192e..832b0b6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -18,6 +18,7 @@
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebFormDelegate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHistoryPrivate.h>
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebHTMLRepresentation.h>
@@ -27,7 +28,6 @@
#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 3d6080b..3c95c8b 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -2,7 +2,7 @@
Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebClipView.h>
#import <WebKit/WebCookieAdapter.h>
@@ -11,6 +11,7 @@
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
@@ -21,7 +22,6 @@
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextView.h>
-#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebViewFactory.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 52be44d..60797a8 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
@class WebDynamicScrollBarsView;
@class WebView;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 52be44d..60797a8 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
@class WebDynamicScrollBarsView;
@class WebView;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index affacf0..5f1c52b 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index ff1f5bb..56bbc1f 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -16,6 +16,7 @@
#import <WebKit/WebException.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconLoader.h>
@@ -26,7 +27,6 @@
#import <WebKit/WebPluginController.h>
#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebTextRendererFactory.h>
-#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUnicode.h>
#import <AppKit/NSResponder_Private.h>
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 8a99e4a..c34f6c1 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -20,6 +20,7 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebNSImageExtras.h>
@@ -29,7 +30,6 @@
#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 46ed078..9d953c3 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -9,11 +9,10 @@
#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/WebView.h>
-#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index c2976dd..7817527 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -24,13 +24,13 @@
#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/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
-#import <WebKit/WebView.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 c2976dd..7817527 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -24,13 +24,13 @@
#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/WebResourceResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
-#import <WebKit/WebView.h>
// FIXME: More that is in common with WebSubresourceClient should move up into WebBaseResourceHandleDelegate.
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index b4069c2..71ac7ef 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -9,7 +9,7 @@
#import "WebRenderNode.h"
#import <WebKit/WebBridge.h>
-#import <WebKit/WebView.h>
+#import <WebKit/WebFrameView.h>
#import <WebKit/WebHTMLViewPrivate.h>
@interface WebKitRenderTreeCopier : NSObject <WebCoreRenderTreeCopier>
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 473e019..bd24176 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -11,9 +11,9 @@
#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.m b/WebKit/WebView.subproj/WebView.m
index d63ba4b..bc805c9 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -19,6 +19,7 @@
#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>
@@ -26,7 +27,6 @@
#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.m b/WebKit/WebView.subproj/WebViewPrivate.m
index f364157..d11bf08 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -16,11 +16,11 @@
#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/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list