[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:32:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4b3e21c59a27b6ff8fb4f42c9048e27733260c24
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 8 18:05:30 2004 +0000
Tests:
Support for moving WebArchive to its own file.
Reviewed by kocienda.
* Blot/BlotApp.m:
WebKit:
Moved WebArchive to its own file.
Reviewed by kocienda.
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebArchive.h: Added.
* WebView.subproj/WebArchive.m: Added.
(-[WebArchive data]): renamed from dataRepresentation
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebHTMLRepresentation.m:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _writeSelectionToPasteboard:]): call renamed [WebArchive data]
* WebView.subproj/WebResource.h:
* WebView.subproj/WebResource.m:
WebBrowser:
Support for moving WebArchive to its own file.
Reviewed by kocienda.
* BrowserDocument.m:
(-[BrowserDocument dataRepresentationOfType:]): call renamed [WebArchive data]
(-[BrowserDocument mailPage:]): ditto
(-[BrowserDocument mailPageAddress:]): ditto
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6332 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2e869bb..1435699 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2004-04-08 Chris Blumenberg <cblu at apple.com>
+
+ Moved WebArchive to its own file.
+
+ Reviewed by kocienda.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebArchive.h: Added.
+ * WebView.subproj/WebArchive.m: Added.
+ (-[WebArchive data]): renamed from dataRepresentation
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _writeSelectionToPasteboard:]): call renamed [WebArchive data]
+ * WebView.subproj/WebResource.h:
+ * WebView.subproj/WebResource.m:
+
2004-04-07 Chris Blumenberg <cblu at apple.com>
Created WebDOMOperations which are WebKit-specific categories on DOM objects.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 33a7e03..e27c067 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -349,6 +349,7 @@
51C16E4106138EB400A1657B,
83255720061DF71E007B8054,
846171FB0624AE5B0071A4A3,
+ 8373435C0624EE0D00F3B289,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -466,6 +467,7 @@
84311A1505EAAAF00088EDA4,
BE95BEE705FD0805006E1513,
846171FC0624AE5B0071A4A3,
+ 8373435D0624EE0D00F3B289,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2099,6 +2101,37 @@
refType = 4;
sourceTree = "<group>";
};
+ 8373435A0624EE0D00F3B289 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = WebArchive.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 8373435B0624EE0D00F3B289 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
+ path = WebArchive.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 8373435C0624EE0D00F3B289 = {
+ fileRef = 8373435A0624EE0D00F3B289;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ 8373435D0624EE0D00F3B289 = {
+ fileRef = 8373435B0624EE0D00F3B289;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
8398847A03426FB000BC5F5E = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -2903,6 +2936,8 @@
F52CA6BD02DF9D0F018635CA,
F52CA6BE02DF9D49018635CA,
F52CA6BF02DF9D4D018635CA,
+ 8373435A0624EE0D00F3B289,
+ 8373435B0624EE0D00F3B289,
51F6866C0366057300CA2D3A,
51F6866D0366057300CA2D3A,
933D659903413FF2008635CE,
diff --git a/WebKit/WebView.subproj/WebArchive.h b/WebKit/WebView.subproj/WebArchive.h
new file mode 100644
index 0000000..e057578
--- /dev/null
+++ b/WebKit/WebView.subproj/WebArchive.h
@@ -0,0 +1,29 @@
+/*
+ WebArchive.h
+ Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
+
+ Public header file.
+*/
+
+#import <Foundation/Foundation.h>
+
+ at class WebArchivePrivate;
+ at class WebResource;
+
+extern NSString *WebArchivePboardType;
+
+ at interface WebArchive : NSObject
+{
+ @private
+ WebArchivePrivate *_private;
+}
+
+- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources;
+- (id)initWithData:(NSData *)data;
+
+- (WebResource *)mainResource;
+- (NSArray *)subresources;
+
+- (NSData *)data;
+
+ at end
diff --git a/WebKit/WebView.subproj/WebArchive.m b/WebKit/WebView.subproj/WebArchive.m
new file mode 100644
index 0000000..9d0092c
--- /dev/null
+++ b/WebKit/WebView.subproj/WebArchive.m
@@ -0,0 +1,124 @@
+/*
+ WebArchive.m
+ Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebArchive.h>
+
+#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebResourcePrivate.h>
+
+ at interface WebArchivePrivate : NSObject
+{
+ @public
+ WebResource *mainResource;
+ NSArray *subresources;
+}
+ at end
+
+ at implementation WebArchivePrivate
+
+- (void)dealloc
+{
+ [mainResource release];
+ [subresources release];
+ [super dealloc];
+}
+
+ at end
+
+ at implementation WebArchive
+
+- (id)init
+{
+ [super init];
+ _private = [[WebArchivePrivate alloc] init];
+ return self;
+}
+
+- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources
+{
+ [self init];
+
+ _private->mainResource = [mainResource retain];
+ _private->subresources = [subresources retain];
+
+ if (!_private->mainResource && [_private->subresources count] == 0) {
+ [self release];
+ return nil;
+ }
+
+ return self;
+}
+
+- (id)initWithData:(NSData *)data
+{
+ [self init];
+
+#if !LOG_DISABLED
+ CFAbsoluteTime start = CFAbsoluteTimeGetCurrent();
+#endif
+ NSDictionary *propertyList = [NSPropertyListSerialization propertyListFromData:data
+ mutabilityOption:NSPropertyListImmutable
+ format:nil
+ errorDescription:nil];
+#if !LOG_DISABLED
+ CFAbsoluteTime end = CFAbsoluteTimeGetCurrent();
+ CFAbsoluteTime duration = end - start;
+#endif
+ LOG(Timing, "Parsing web archive with [NSPropertyListSerialization propertyListFromData::::] took %f seconds", duration);
+ if (![propertyList isKindOfClass:[NSDictionary class]]) {
+ [self release];
+ return nil;
+ }
+
+ _private->mainResource = [[WebResource alloc] _initWithPropertyList:[propertyList objectForKey:WebMainResourceKey]];
+ _private->subresources = [[WebResource _resourcesFromPropertyLists:[propertyList objectForKey:WebSubresourcesKey]] retain];
+
+ if (!_private->mainResource && [_private->subresources count] == 0) {
+ [self release];
+ return nil;
+ }
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [_private release];
+ [super dealloc];
+}
+
+- (WebResource *)mainResource
+{
+ return [[_private->mainResource retain] autorelease];
+}
+
+- (NSArray *)subresources
+{
+ return [[_private->subresources retain] autorelease];
+}
+
+- (NSData *)data
+{
+ NSMutableDictionary *propertyList = [NSMutableDictionary dictionary];
+ if (_private->mainResource) {
+ [propertyList setObject:[_private->mainResource _propertyListRepresentation] forKey:WebMainResourceKey];
+ }
+ NSArray *propertyLists = [WebResource _propertyListsFromResources:_private->subresources];
+ if ([propertyLists count] > 0) {
+ [propertyList setObject:propertyLists forKey:WebSubresourcesKey];
+ }
+#if !LOG_DISABLED
+ CFAbsoluteTime start = CFAbsoluteTimeGetCurrent();
+#endif
+ NSData *data = [NSPropertyListSerialization dataFromPropertyList:propertyList format:NSPropertyListBinaryFormat_v1_0 errorDescription:nil];
+#if !LOG_DISABLED
+ CFAbsoluteTime end = CFAbsoluteTimeGetCurrent();
+ CFAbsoluteTime duration = end - start;
+#endif
+ LOG(Timing, "Serializing web archive with [NSPropertyListSerialization dataFromPropertyList:::] took %f seconds", duration);
+ return data;
+}
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 48c303e..be18bdc 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -3,9 +3,11 @@
Copyright 2001, 2002, Apple, Inc. All rights reserved.
*/
+#import <WebKit/WebDataSourcePrivate.h>
+
+#import <WebKit/WebArchive.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataProtocol.h>
-#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebException.h>
#import <WebKit/WebFramePrivate.h>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 317924f..0f452f4 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -3,47 +3,40 @@
Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebFrame.h>
-
-#import <Cocoa/Cocoa.h>
+#import <WebKit/WebFramePrivate.h>
#import <WebKit/DOM.h>
+#import <WebKit/WebArchive.h>
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebDefaultUIDelegate.h>
+#import <WebKit/WebDocumentInternal.h>
+#import <WebKit/WebFrameLoadDelegate.h>
#import <WebKit/WebFrameViewPrivate.h>
-#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryPrivate.h>
+#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebHTMLRepresentationPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
-#import <WebKit/WebKitStatisticsPrivate.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebResourcePrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSURLRequest.h>
#import <Foundation/NSString_NSURLExtras.h>
-
-#import <objc/objc-runtime.h>
#import <Foundation/NSURLRequestPrivate.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebHistoryItemPrivate.h>
-#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebHistoryPrivate.h>
-#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebFrameLoadDelegate.h>
-#import <WebKit/WebKitErrorsPrivate.h>
-#import <WebKit/WebDocumentInternal.h>
-#import <WebKit/WebDefaultUIDelegate.h>
+#import <objc/objc-runtime.h>
#ifndef NDEBUG
static const char * const stateNames[] = {
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 84328cd..229b9bf 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -6,6 +6,7 @@
#import <WebKit/WebHTMLRepresentation.h>
#import <WebKit/DOM.h>
+#import <WebKit/WebArchive.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a63005d..22af4c8 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -6,47 +6,46 @@
#import <WebKit/WebHTMLView.h>
#import <WebKit/DOM.h>
+#import <WebKit/WebArchive.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebClipView.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocumentInternal.h>
#import <WebKit/WebDOMOperations.h>
#import <WebKit/WebException.h>
-#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebHTMLRepresentationPrivate.h>
-#import <WebKit/WebNetscapePluginEmbeddedView.h>
+#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
+#import <WebKit/WebNetscapePluginEmbeddedView.h>
+#import <WebKit/WebNSEventExtras.h>
+#import <WebKit/WebNSImageExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSPrintOperationExtras.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginController.h>
+#import <WebKit/WebPreferences.h>
#import <WebKit/WebResourcePrivate.h>
+#import <WebKit/WebStringTruncator.h>
#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebUIDelegatePrivate.h>
#import <WebKit/WebUnicode.h>
#import <WebKit/WebViewPrivate.h>
+#import <AppKit/NSAccessibility.h>
#import <AppKit/NSGraphicsContextPrivate.h>
#import <AppKit/NSResponder_Private.h>
-#import <CoreGraphics/CGContextGState.h>
-
-#import <AppKit/NSAccessibility.h>
-
-#import <WebKit/WebImageRenderer.h>
-#import <WebKit/WebKitNSStringExtras.h>
-#import <WebKit/WebNSEventExtras.h>
-#import <WebKit/WebNSImageExtras.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebPreferences.h>
-#import <WebKit/WebStringTruncator.h>
#import <Foundation/NSFileManager_NSURLExtras.h>
#import <Foundation/NSURL_NSURLExtras.h>
+#import <CoreGraphics/CGContextGState.h>
+
// The link drag hysteresis is much larger than the others because there
// needs to be enough space to cancel the link press without starting a link drag,
// and because dragging links is rare.
@@ -541,7 +540,7 @@ static WebHTMLView *lastHitView = nil;
NSString *markupString;
WebArchive *archive = [self _selectedArchive:&markupString];
[pasteboard setString:markupString forType:NSHTMLPboardType];
- [pasteboard setData:[archive dataRepresentation] forType:WebArchivePboardType];
+ [pasteboard setData:[archive data] forType:WebArchivePboardType];
// Put attributed string on the pasteboard (RTF format).
NSAttributedString *attributedString = [self selectedAttributedString];
diff --git a/WebKit/WebView.subproj/WebResource.h b/WebKit/WebView.subproj/WebResource.h
index 3e74580..5a1c660 100644
--- a/WebKit/WebView.subproj/WebResource.h
+++ b/WebKit/WebView.subproj/WebResource.h
@@ -7,11 +7,8 @@
#import <Foundation/Foundation.h>
- at class WebArchivePrivate;
@class WebResourcePrivate;
-extern NSString *WebArchivePboardType;
-
@interface WebResource : NSObject
{
@private
@@ -26,20 +23,3 @@ extern NSString *WebArchivePboardType;
- (NSString *)textEncodingName;
@end
-
-
- at interface WebArchive : NSObject
-{
- at private
- WebArchivePrivate *_private;
-}
-
-- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources;
-- (id)initWithData:(NSData *)data;
-
-- (WebResource *)mainResource;
-- (NSArray *)subresources;
-
-- (NSData *)dataRepresentation;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebResource.m b/WebKit/WebView.subproj/WebResource.m
index b054c24..f86cca7 100644
--- a/WebKit/WebView.subproj/WebResource.m
+++ b/WebKit/WebView.subproj/WebResource.m
@@ -4,7 +4,6 @@
*/
#import <WebKit/WebResourcePrivate.h>
-#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
@@ -28,14 +27,6 @@ NSString *WebSubresourcesKey = @"WebSubresources";
}
@end
- at interface WebArchivePrivate : NSObject
-{
- @public
- WebResource *mainResource;
- NSArray *subresources;
-}
- at end
-
@implementation WebResourcePrivate
- (void)dealloc
@@ -49,17 +40,6 @@ NSString *WebSubresourcesKey = @"WebSubresources";
@end
- at implementation WebArchivePrivate
-
-- (void)dealloc
-{
- [mainResource release];
- [subresources release];
- [super dealloc];
-}
-
- at end
-
@implementation WebResource
- (id)initWithData:(NSData *)data URL:(NSURL *)URL MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName
@@ -199,99 +179,3 @@ NSString *WebSubresourcesKey = @"WebSubresources";
}
@end
-
- at implementation WebArchive
-
-- (id)init
-{
- [super init];
- _private = [[WebArchivePrivate alloc] init];
- return self;
-}
-
-- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources
-{
- [self init];
-
- _private->mainResource = [mainResource retain];
- _private->subresources = [subresources retain];
-
- if (!_private->mainResource && [_private->subresources count] == 0) {
- [self release];
- return nil;
- }
-
- return self;
-}
-
-- (id)initWithData:(NSData *)data
-{
- [self init];
-
-#if !LOG_DISABLED
- CFAbsoluteTime start = CFAbsoluteTimeGetCurrent();
-#endif
- NSDictionary *propertyList = [NSPropertyListSerialization propertyListFromData:data
- mutabilityOption:NSPropertyListImmutable
- format:nil
- errorDescription:nil];
-#if !LOG_DISABLED
- CFAbsoluteTime end = CFAbsoluteTimeGetCurrent();
- CFAbsoluteTime duration = end - start;
-#endif
- LOG(Timing, "Parsing web archive with [NSPropertyListSerialization propertyListFromData::::] took %f seconds", duration);
- if (![propertyList isKindOfClass:[NSDictionary class]]) {
- [self release];
- return nil;
- }
-
- _private->mainResource = [[WebResource alloc] _initWithPropertyList:[propertyList objectForKey:WebMainResourceKey]];
- _private->subresources = [[WebResource _resourcesFromPropertyLists:[propertyList objectForKey:WebSubresourcesKey]] retain];
-
- if (!_private->mainResource && [_private->subresources count] == 0) {
- [self release];
- return nil;
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (WebResource *)mainResource
-{
- return [[_private->mainResource retain] autorelease];
-}
-
-- (NSArray *)subresources
-{
- return [[_private->subresources retain] autorelease];
-}
-
-- (NSData *)dataRepresentation
-{
- NSMutableDictionary *propertyList = [NSMutableDictionary dictionary];
- if (_private->mainResource) {
- [propertyList setObject:[_private->mainResource _propertyListRepresentation] forKey:WebMainResourceKey];
- }
- NSArray *propertyLists = [WebResource _propertyListsFromResources:_private->subresources];
- if ([propertyLists count] > 0) {
- [propertyList setObject:propertyLists forKey:WebSubresourcesKey];
- }
-#if !LOG_DISABLED
- CFAbsoluteTime start = CFAbsoluteTimeGetCurrent();
-#endif
- NSData *data = [NSPropertyListSerialization dataFromPropertyList:propertyList format:NSPropertyListBinaryFormat_v1_0 errorDescription:nil];
-#if !LOG_DISABLED
- CFAbsoluteTime end = CFAbsoluteTimeGetCurrent();
- CFAbsoluteTime duration = end - start;
-#endif
- LOG(Timing, "Serializing web archive with [NSPropertyListSerialization dataFromPropertyList:::] took %f seconds", duration);
- return data;
-}
-
- at end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list