[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 06:44:51 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 640818e5ea76cd940e436aac5f7b8eed4662774f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 26 02:15:14 2002 +0000
API tweaks.
* Misc.subproj/WebKit.h:
Added headers.
* Misc.subproj/WebKitErrors.h:
Removed #defines.
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading]):
(-[WebDataSource _loadIcon]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
Removed isMainDocument.
Moved errors string #defines here.
* WebView.subproj/WebView.m:
Updated to reflect API tweaks.
* ContextMenuHandler.m:
(-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2172 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a4247d6..98a7084 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2002-09-25 Richard Williamson <rjw at apple.com>
+
+ API tweaks.
+ * Misc.subproj/WebKit.h:
+ Added headers.
+
+ * Misc.subproj/WebKitErrors.h:
+ Removed #defines.
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading]):
+ (-[WebDataSource _loadIcon]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
+ Removed isMainDocument.
+
+ Moved errors string #defines here.
+ * WebView.subproj/WebView.m:
+
2002-09-25 John Sullivan <sullivan at apple.com>
- fixed 3060773 -- Wrong title proposed when image link
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a4247d6..98a7084 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,24 @@
+2002-09-25 Richard Williamson <rjw at apple.com>
+
+ API tweaks.
+ * Misc.subproj/WebKit.h:
+ Added headers.
+
+ * Misc.subproj/WebKitErrors.h:
+ Removed #defines.
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading]):
+ (-[WebDataSource _loadIcon]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
+ Removed isMainDocument.
+
+ Moved errors string #defines here.
+ * WebView.subproj/WebView.m:
+
2002-09-25 John Sullivan <sullivan at apple.com>
- fixed 3060773 -- Wrong title proposed when image link
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index e0149a5..9e1012f 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -1,4 +1,26 @@
-/* WebKit.h
+/* #import <WebKit/WebKit.h>
Copyright 2001, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebContextMenuDelegate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
+#import <WebKit/WebControllerSets.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDefaultPolicyDelegate.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebHTMLRepresentation.h>
+#import <WebKit/WebHTMLView.h>
+#import <WebKit/WebHistory.h>
+#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryList.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebPreferences.h>
+#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebStandardPanels.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index bc37c4e..9920505 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -40,30 +40,6 @@ typedef enum {
WebErrorCannotNotFindApplicationForURL = 10011
} WebErrorCode;
-#define WebErrorDescriptionCannotFindFile NSLocalizedStringFromTable (@"Cannot find file", @"WebError", @"WebErrorCannotFindFile description")
-
-#define WebErrorDescriptionCannotCreateFile NSLocalizedStringFromTable (@"Cannot create file", @"WebError", @"WebErrorCannotCreateFile description")
-
-#define WebErrorDescriptionCannotOpenFile NSLocalizedStringFromTable (@"Cannot open file", @"WebError", @"WebErrorCannotOpenFile description")
-
-#define WebErrorDescriptionCannotReadFile NSLocalizedStringFromTable (@"Cannot read file", @"WebError", @"WebErrorCannotReadFile description")
-
-#define WebErrorDescriptionCannotWriteToFile NSLocalizedStringFromTable (@"Cannot write file", @"WebError", @"WebErrorCannotWriteToFile description")
-
-#define WebErrorDescriptionCannotRemoveFile NSLocalizedStringFromTable (@"Cannot remove file", @"WebError", @"WebErrorCannotRemoveFile description")
-
-#define WebErrorDescriptionCannotFindApplicationForFile NSLocalizedStringFromTable (@"Cannot find application for file", @"WebError", @"WebErrorCannotFindApplicationForFile description")
-
-#define WebErrorDescriptionFinderCannotOpenDirectory NSLocalizedStringFromTable (@"Finder cannot open directory", @"WebError", @"WebErrorFinderCannotOpenDirectory description")
-
-#define WebErrorDescriptionCannotShowDirectory NSLocalizedStringFromTable (@"Cannot show a file directory", @"WebError", @"WebErrorCannotShowDirectory description")
-
-#define WebErrorDescriptionCannotShowMIMEType NSLocalizedStringFromTable (@"Cannot show content with specified mime type", @"WebError", @"WebErrorCannotShowMIMEType description")
-
-#define WebErrorDescriptionCannotShowURL NSLocalizedStringFromTable (@"Cannot show URL", @"WebError", @"WebErrorCannotShowURL description")
-
-#define WebErrorDescriptionCannotFindApplicationForURL NSLocalizedStringFromTable (@"Cannot find application for URL", @"WebError", @"WebErrorCannotNotFindApplicationForURL description")
-
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 456fe7b..b1829c4 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -67,14 +67,6 @@
- (id <WebDocumentRepresentation>)representation;
/*!
- @method isMainDocument
- @discussion The main document is the 'top'
- document, typically either a frameset or a normal HTML document.
- @result Returns YES if this is the main document.
-*/
-- (BOOL)isMainDocument;
-
-/*!
@method parent
@result Returns nil if this data source represents the main document. Otherwise
returns the parent data source.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 01c77f1..4c00db8 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -90,15 +90,6 @@
return [[self webFrame] name];
}
-// Returns YES if this is the main document. The main document is the 'top'
-// document, typically either a frameset or a normal HTML document.
-- (BOOL)isMainDocument
-{
- if (_private->parent == nil)
- return YES;
- return NO;
-}
-
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
- (WebDataSource *)parent
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 923a3e3..deb9816 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -189,7 +189,7 @@
if (!_private->mainHandle) {
_private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
- if ([self isMainDocument]) {
+ if ([self webFrame] == [[self controller] mainFrame]) {
[_private->request setCookiePolicyBaseURL:[self URL]];
} else {
[_private->request setCookiePolicyBaseURL:[[[_private->controller mainFrame] dataSource] URL]];
@@ -461,7 +461,7 @@
{
ASSERT(!_private->iconLoader);
- if([self isMainDocument] && !_private->mainDocumentError){
+ if([self webFrame] == [[self controller] mainFrame] && !_private->mainDocumentError){
NSURL *dataSourceURL = [self URL];
WebIconDatabase *iconDB = [WebIconDatabase sharedIconDatabase];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 2e9d040..afe74cc 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -81,7 +81,7 @@
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
- if(![[webFrame dataSource] isMainDocument]){
+ if(webFrame != [[webFrame controller] mainFrame]){
[[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") action:@selector(openFrameInNewWindow:)
target:self
toArray:menuItems];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 94bc99a..d61b620 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -35,6 +35,30 @@ enum {
@implementation WebView
+#define WebErrorDescriptionCannotFindFile NSLocalizedStringFromTable (@"Cannot find file", @"WebError", @"WebErrorCannotFindFile description")
+
+#define WebErrorDescriptionCannotCreateFile NSLocalizedStringFromTable (@"Cannot create file", @"WebError", @"WebErrorCannotCreateFile description")
+
+#define WebErrorDescriptionCannotOpenFile NSLocalizedStringFromTable (@"Cannot open file", @"WebError", @"WebErrorCannotOpenFile description")
+
+#define WebErrorDescriptionCannotReadFile NSLocalizedStringFromTable (@"Cannot read file", @"WebError", @"WebErrorCannotReadFile description")
+
+#define WebErrorDescriptionCannotWriteToFile NSLocalizedStringFromTable (@"Cannot write file", @"WebError", @"WebErrorCannotWriteToFile description")
+
+#define WebErrorDescriptionCannotRemoveFile NSLocalizedStringFromTable (@"Cannot remove file", @"WebError", @"WebErrorCannotRemoveFile description")
+
+#define WebErrorDescriptionCannotFindApplicationForFile NSLocalizedStringFromTable (@"Cannot find application for file", @"WebError", @"WebErrorCannotFindApplicationForFile description")
+
+#define WebErrorDescriptionFinderCannotOpenDirectory NSLocalizedStringFromTable (@"Finder cannot open directory", @"WebError", @"WebErrorFinderCannotOpenDirectory description")
+
+#define WebErrorDescriptionCannotShowDirectory NSLocalizedStringFromTable (@"Cannot show a file directory", @"WebError", @"WebErrorCannotShowDirectory description")
+
+#define WebErrorDescriptionCannotShowMIMEType NSLocalizedStringFromTable (@"Cannot show content with specified mime type", @"WebError", @"WebErrorCannotShowMIMEType description")
+
+#define WebErrorDescriptionCannotShowURL NSLocalizedStringFromTable (@"Cannot show URL", @"WebError", @"WebErrorCannotShowURL description")
+
+#define WebErrorDescriptionCannotFindApplicationForURL NSLocalizedStringFromTable (@"Cannot find application for URL", @"WebError", @"WebErrorCannotNotFindApplicationForURL description")
+
+ (void)initialize
{
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list