[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 05:58:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 05fc8a49ba72664035d488c47015d9e9952101fe
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 22 23:11:24 2002 +0000
* WebKit.pbproj/project.pbxproj:
Added the MIME classes to WebKit.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a1f2ac9..8599346 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-22 Chris Blumenberg <cblu at apple.com>
+
+ * WebKit.pbproj/project.pbxproj:
+ Added the MIME clases to WebKit.
+
2002-03-22 John Sullivan <sullivan at apple.com>
* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a1f2ac9..8599346 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-03-22 Chris Blumenberg <cblu at apple.com>
+
+ * WebKit.pbproj/project.pbxproj:
+ Added the MIME clases to WebKit.
+
2002-03-22 John Sullivan <sullivan at apple.com>
* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
diff --git a/WebKit/MIME.subproj/IFMIMEDatabase.h b/WebKit/MIME.subproj/IFMIMEDatabase.h
new file mode 100644
index 0000000..67a918b
--- /dev/null
+++ b/WebKit/MIME.subproj/IFMIMEDatabase.h
@@ -0,0 +1,38 @@
+//
+// IFMIMEDatabase.h
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Mar 22 2002.
+// Copyright (c) 2002 Apple Computer Inc.. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <IFMIMEHandler.h>
+
+ at interface IFMIMEDatabase : NSObject {
+ NSMutableDictionary *mimeHandlers;
+}
+
+/*
+sharedMIMEDatabase creates a dictionary of MIME type keys and IFMIMEHandlers objects. sharedMIMEDatabase should only create entries in the dictionary for mime types that WebKit handles internally including plug-in types.
+
+At some point, sharedMIMEDatabase might interact with the defaults to provide for customization.
+*/
+
++ (IFMIMEDatabase *)sharedMIMEDatabase;
+
+
+/*
+MIMEHandlerForMIMEType does a simple dictionary lookup. If none is found IFMIMEHandler will return a IFMIMEHandler with an application handler type (look at IFMIMEHandler.h) which means that the file should be downloaded.
+*/
+
+- (IFMIMEHandler *)MIMEHandlerForMIMEType:(NSString *)mimeType;
+
+
+/*
+If a mime type is not available, MIMEHandlerForURL determines a IFMIMEHandler based on the URL's extension. This may require interaction with Launch Services.
+*/
+
+- (IFMIMEHandler *)MIMEHandlerForURL:(NSURL *)url;
+
+ at end
diff --git a/WebKit/MIME.subproj/IFMIMEDatabase.m b/WebKit/MIME.subproj/IFMIMEDatabase.m
new file mode 100644
index 0000000..94bad1a
--- /dev/null
+++ b/WebKit/MIME.subproj/IFMIMEDatabase.m
@@ -0,0 +1,31 @@
+//
+// IFMIMEDatabase.m
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Mar 22 2002.
+// Copyright (c) 2002 Apple Computer Inc.. All rights reserved.
+//
+
+#import "IFMIMEDatabase.h"
+
+
+ at implementation IFMIMEDatabase
+
++ (IFMIMEDatabase *)sharedMIMEDatabase
+{
+ return nil;
+}
+
+
+- (IFMIMEHandler *)MIMEHandlerForMIMEType:(NSString *)mimeType
+{
+ return nil;
+}
+
+
+- (IFMIMEHandler *)MIMEHandlerForURL:(NSURL *)url
+{
+ return nil;
+}
+
+ at end
diff --git a/WebKit/MIME.subproj/IFMIMEHandler.h b/WebKit/MIME.subproj/IFMIMEHandler.h
new file mode 100644
index 0000000..2b32fa7
--- /dev/null
+++ b/WebKit/MIME.subproj/IFMIMEHandler.h
@@ -0,0 +1,43 @@
+//
+// IFMIMEHandler.h
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Mar 22 2002.
+// Copyright (c) 2002 Apple Computer Inc.. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/*
+IFMIMEHandler is a simple data type object holding the MIME type, the type of handler and the handler's name (ie plugin's name or application's name).
+*/
+
+
+typedef enum {
+ IFMIMEHANDLERTYPE_HTML = 1, //WebKit handled html
+ IFMIMEHANDLERTYPE_IMAGE = 2, //WebKit handled image
+ IFMIMEHANDLERTYPE_TEXT = 3, //WebKit handled text
+ IFMIMEHANDLERTYPE_PLUG_IN = 4, //Plug-in handled file
+ IFMIMEHANDLERTYPE_APPLICATION = 5, //Application handled file
+} IFMIMEHandlerType;
+
+
+ at interface IFMIMEHandler : NSObject {
+ NSString *MIMEType, *MIMESupertype, *MIMESubtype, *handlerName;
+ IFMIMEHandlerType handlerType;
+}
+
+/*
+initWithMIMEType gets called by [IFMIMEDatabase sharedMIMEDatabase] for at least every mime type that WebKit handles. We, at some point, might want to store IFMIMEHandler's for types that other application handle. I hope not though.
+*/
+
+- initWithMIMEType:(NSString *)MIME handlerType:(IFMIMEHandlerType *)hType handlerName:(NSString *)handler;
+
+// Accessor methods
+- (NSString *)MIMEType;
+- (NSString *)MIMESupertype;
+- (NSString *)MIMESubtype;
+- (NSString *)handlerName;
+- (IFMIMEHandlerType)handlerType;
+
+ at end
diff --git a/WebKit/MIME.subproj/IFMIMEHandler.m b/WebKit/MIME.subproj/IFMIMEHandler.m
new file mode 100644
index 0000000..ee8d1c0
--- /dev/null
+++ b/WebKit/MIME.subproj/IFMIMEHandler.m
@@ -0,0 +1,52 @@
+//
+// IFMIMEHandler.m
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Mar 22 2002.
+// Copyright (c) 2002 Apple Computer Inc.. All rights reserved.
+//
+
+#import "IFMIMEHandler.h"
+
+
+ at implementation IFMIMEHandler
+
+
+- initWithMIMEType:(NSString *)MIME handlerType:(IFMIMEHandlerType *)hType handlerName:(NSString *)handler
+{
+ return nil;
+}
+
+
+// Accessor methods
+- (NSString *)MIMEType
+{
+ return nil;
+}
+
+
+- (NSString *)MIMESupertype
+{
+ return nil;
+}
+
+
+- (NSString *)MIMESubtype
+{
+ return nil;
+}
+
+
+- (NSString *)handlerName
+{
+ return nil;
+}
+
+
+- (IFMIMEHandlerType)handlerType
+{
+ return 1;
+}
+
+
+ at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c3f1971..633c169 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -84,6 +84,7 @@
9C7CABBB0190A37C0ECA16EA,
254DC334016E1D3F0ECA149E,
25A8176801B5474B0ECA149E,
+ F5F084B8024BBFFE01CA1520,
F5EBC45202134BB601CA1520,
089C1665FE841158C02AAC07,
0867D69AFE84028FC02AAC07,
@@ -194,6 +195,8 @@
F5B92B840223191D01C1A525,
F5DE3CB4023575AA01A80181,
F5D538EA02441F2601A80181,
+ F5F084BB024BDC8E01CA1520,
+ F5F084BF024BDCA701CA1520,
);
isa = PBXHeadersBuildPhase;
};
@@ -231,6 +234,8 @@
F5DE3CB5023575AA01A80181,
F5D538ED02441FDD01A80181,
F5AEBB3E024A527601C1A526,
+ F5F084BC024BDC8E01CA1520,
+ F5F084C0024BDCA701CA1520,
);
isa = PBXSourcesBuildPhase;
};
@@ -1200,6 +1205,66 @@
settings = {
};
};
+ F5F084B8024BBFFE01CA1520 = {
+ children = (
+ F5F084B9024BDC8E01CA1520,
+ F5F084BA024BDC8E01CA1520,
+ F5F084BD024BDCA701CA1520,
+ F5F084BE024BDCA701CA1520,
+ );
+ isa = PBXGroup;
+ name = MIME;
+ path = "";
+ refType = 2;
+ };
+ F5F084B9024BDC8E01CA1520 = {
+ isa = PBXFileReference;
+ name = IFMIMEHandler.h;
+ path = MIME.subproj/IFMIMEHandler.h;
+ refType = 4;
+ };
+ F5F084BA024BDC8E01CA1520 = {
+ isa = PBXFileReference;
+ name = IFMIMEHandler.m;
+ path = MIME.subproj/IFMIMEHandler.m;
+ refType = 4;
+ };
+ F5F084BB024BDC8E01CA1520 = {
+ fileRef = F5F084B9024BDC8E01CA1520;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F084BC024BDC8E01CA1520 = {
+ fileRef = F5F084BA024BDC8E01CA1520;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F084BD024BDCA701CA1520 = {
+ isa = PBXFileReference;
+ name = IFMIMEDatabase.h;
+ path = MIME.subproj/IFMIMEDatabase.h;
+ refType = 4;
+ };
+ F5F084BE024BDCA701CA1520 = {
+ isa = PBXFileReference;
+ name = IFMIMEDatabase.m;
+ path = MIME.subproj/IFMIMEDatabase.m;
+ refType = 4;
+ };
+ F5F084BF024BDCA701CA1520 = {
+ fileRef = F5F084BD024BDCA701CA1520;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F084C0024BDCA701CA1520 = {
+ fileRef = F5F084BE024BDCA701CA1520;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
};
rootObject = 0867D690FE84028FC02AAC07;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list