- first stage of cleaning up SPI usage in WebKit
* Carbon.subproj/CarbonUtils.m:
* DOM.subproj/WebDOMOperations.m:
(-[DOMHTMLLinkElement _subresourceURLs]):
(-[DOMHTMLParamElement _subresourceURLs]):
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem _setFormInfoFromRequest:]):
* Misc.subproj/WebDatabase.m:
(-[WebDatabase setObject:forKey:]):
(-[WebDatabase removeObjectForKey:]):
(-[WebDatabase removeAllObjects]):
(-[WebDatabase objectForKey:]):
(-[WebDatabase open]):
(-[WebDatabase close]):
(-[WebDatabase sync]):
(-[WebDatabase count]):
(-[WebDatabase setSizeLimit:]):
* Misc.subproj/WebIconDatabase.m:
(-[WebIconDatabase iconForURL:withSize:cache:]):
(-[WebIconDatabase _iconForFileURL:withSize:]):
* Misc.subproj/WebKitNSStringExtras.h:
* Misc.subproj/WebKitNSStringExtras.m:
(+[NSString _web_encodingForResource:]):
(-[NSString _webkit_isCaseInsensitiveEqualToString:]):
* Misc.subproj/WebNSEventExtras.h:
* Misc.subproj/WebNSEventExtras.m:
(-[NSEvent _web_isTabKeyEvent]):
* Misc.subproj/WebNSURLExtras.h:
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _webkit_isFileURL]):
(-[NSString _webkit_isJavaScriptURL]):
(-[NSString _webkit_isFileURL]):
* Panels.subproj/WebPanelAuthenticationHandler.m:
(-[NSMutableDictionary _webkit_setObject:forUncopiedKey:]):
(-[WebPanelAuthenticationHandler enqueueChallenge:forWindow:]):
(-[WebPanelAuthenticationHandler startAuthentication:window:]):
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebBasePluginPackage.m:
(-[WebBasePluginPackage isQuickTimePlugIn]):
(-[WebBasePluginPackage isJavaPlugIn]):
* Plugins.subproj/WebPluginPackage.m:
(-[WebPluginPackage initWithPath:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge canTargetLoadInFrame:]):
(-[WebBridge valueForKey:keys:values:]):
* WebCoreSupport.subproj/WebGlyphBuffer.m:
* WebCoreSupport.subproj/WebImageDecodeItem.h:
* WebCoreSupport.subproj/WebImageDecodeItem.m:
* WebCoreSupport.subproj/WebImageDecoder.h:
* WebCoreSupport.subproj/WebImageDecoder.m:
* WebCoreSupport.subproj/WebTextRenderer.h:
* WebKitPrefix.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate _canUseResourceForRequest:]):
* WebView.subproj/WebDataProtocol.m:
(+[WebDataProtocol _webIsDataProtocolURL:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame _shouldAllowAccessFrom:]):
(-[WebFrame reload]):
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation _isDisplayingWebArchive]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient didReceiveResponse:]):
* WebView.subproj/WebPDFView.m:
* WebView.subproj/WebView.m:
(+[WebView _MIMETypeForFile:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9258
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
*
*/
#import <AppKit/NSBitmapImageRep_Private.h>
+#import <Foundation/NSPrivateDecls.h>
#include "CarbonUtils.h"
+2005-06-02 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by John.
+
+ - first stage of cleaning up SPI usage in WebKit
+
+ * Carbon.subproj/CarbonUtils.m:
+ * DOM.subproj/WebDOMOperations.m:
+ (-[DOMHTMLLinkElement _subresourceURLs]):
+ (-[DOMHTMLParamElement _subresourceURLs]):
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem _setFormInfoFromRequest:]):
+ * Misc.subproj/WebDatabase.m:
+ (-[WebDatabase setObject:forKey:]):
+ (-[WebDatabase removeObjectForKey:]):
+ (-[WebDatabase removeAllObjects]):
+ (-[WebDatabase objectForKey:]):
+ (-[WebDatabase open]):
+ (-[WebDatabase close]):
+ (-[WebDatabase sync]):
+ (-[WebDatabase count]):
+ (-[WebDatabase setSizeLimit:]):
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase iconForURL:withSize:cache:]):
+ (-[WebIconDatabase _iconForFileURL:withSize:]):
+ * Misc.subproj/WebKitNSStringExtras.h:
+ * Misc.subproj/WebKitNSStringExtras.m:
+ (+[NSString _web_encodingForResource:]):
+ (-[NSString _webkit_isCaseInsensitiveEqualToString:]):
+ * Misc.subproj/WebNSEventExtras.h:
+ * Misc.subproj/WebNSEventExtras.m:
+ (-[NSEvent _web_isTabKeyEvent]):
+ * Misc.subproj/WebNSURLExtras.h:
+ * Misc.subproj/WebNSURLExtras.m:
+ (-[NSURL _webkit_isFileURL]):
+ (-[NSString _webkit_isJavaScriptURL]):
+ (-[NSString _webkit_isFileURL]):
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ (-[NSMutableDictionary _webkit_setObject:forUncopiedKey:]):
+ (-[WebPanelAuthenticationHandler enqueueChallenge:forWindow:]):
+ (-[WebPanelAuthenticationHandler startAuthentication:window:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebBasePluginPackage.m:
+ (-[WebBasePluginPackage isQuickTimePlugIn]):
+ (-[WebBasePluginPackage isJavaPlugIn]):
+ * Plugins.subproj/WebPluginPackage.m:
+ (-[WebPluginPackage initWithPath:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge canTargetLoadInFrame:]):
+ (-[WebBridge valueForKey:keys:values:]):
+ * WebCoreSupport.subproj/WebGlyphBuffer.m:
+ * WebCoreSupport.subproj/WebImageDecodeItem.h:
+ * WebCoreSupport.subproj/WebImageDecodeItem.m:
+ * WebCoreSupport.subproj/WebImageDecoder.h:
+ * WebCoreSupport.subproj/WebImageDecoder.m:
+ * WebCoreSupport.subproj/WebTextRenderer.h:
+ * WebKitPrefix.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate _canUseResourceForRequest:]):
+ * WebView.subproj/WebDataProtocol.m:
+ (+[WebDataProtocol _webIsDataProtocolURL:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _shouldAllowAccessFrom:]):
+ (-[WebFrame reload]):
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation _isDisplayingWebArchive]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient didReceiveResponse:]):
+ * WebView.subproj/WebPDFView.m:
+ * WebView.subproj/WebView.m:
+ (+[WebView _MIMETypeForFile:]):
+
2005-06-01 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
@implementation DOMNode (WebDOMNodeOperations)
- (NSArray *)_subresourceURLs
{
NSString *rel = [self rel];
- if ([rel _web_isCaseInsensitiveEqualToString:@"stylesheet"] || [rel _web_isCaseInsensitiveEqualToString:@"icon"]) {
+ if ([rel _webkit_isCaseInsensitiveEqualToString:@"stylesheet"] || [rel _webkit_isCaseInsensitiveEqualToString:@"icon"]) {
return [self _URLsFromSelectors:@selector(href), nil];
}
return nil;
- (NSArray *)_subresourceURLs
{
NSString *name = [self name];
- if ([name _web_isCaseInsensitiveEqualToString:@"data"] ||
- [name _web_isCaseInsensitiveEqualToString:@"movie"] ||
- [name _web_isCaseInsensitiveEqualToString:@"src"]) {
+ if ([name _webkit_isCaseInsensitiveEqualToString:@"data"] ||
+ [name _webkit_isCaseInsensitiveEqualToString:@"movie"] ||
+ [name _webkit_isCaseInsensitiveEqualToString:@"src"]) {
return [self _URLsFromSelectors:@selector(value), nil];
}
return nil;
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginController.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLRequestPrivate.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
NSArray *newData = nil;
NSString *newContentType = nil;
NSString *newReferrer = nil;
- if ([[request HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ if ([[request HTTPMethod] _webkit_isCaseInsensitiveEqualToString:@"POST"]) {
// save form state iff this is a POST
// FIXME: Eventually we have to make this smart enough to handle the case where
Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
*/
-#import <Foundation/NSPrivateDecls.h>
#import <WebKit/WebDatabase.h>
+#import <WebKit/WebAssertions.h>
// implementation WebDatabase ------------------------------------------------------------------------
-(void)setObject:(id)object forKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(void)removeObjectForKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(void)removeAllObjects
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(id)objectForKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
return nil;
}
-(void)open
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(void)close
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(void)sync
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(NSString *)path
-(unsigned)count
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
return 0;
}
-(void)setSizeLimit:(unsigned)limit
{
- NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+ ASSERT_NOT_REACHED();
}
-(unsigned)usage
#import <WebKit/WebFileDatabase.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNSURLExtras.h>
-
-#import <Foundation/NSString_NSURLExtras.h>
+#import <WebKit/WebKitNSStringExtras.h>
NSString * const WebIconDatabaseVersionKey = @"WebIconDatabaseVersion";
NSString * const WebURLToIconURLKey = @"WebSiteURLToIconURLKey";
return [self defaultIconWithSize:size];
}
- if ([URL _web_isFileURL]) {
+ if ([URL _webkit_isFileURL]) {
return [self _iconForFileURL:URL withSize:size];
}
NSString *suffix = [path pathExtension];
NSImage *icon = nil;
- if ([suffix _web_isCaseInsensitiveEqualToString:@"htm"] || [suffix _web_isCaseInsensitiveEqualToString:@"html"]) {
+ if ([suffix _webkit_isCaseInsensitiveEqualToString:@"htm"] || [suffix _webkit_isCaseInsensitiveEqualToString:@"html"]) {
if (!_private->htmlIcons) {
icon = [workspace iconForFileType:@"html"];
_private->htmlIcons = [[self _iconsBySplittingRepresentationsOfIcon:icon] retain];
+ (NSStringEncoding)_web_encodingForResource:(Handle)resource;
+- (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string;
+
@end
#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebTextRendererFactory.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <unicode/uchar.h>
@implementation NSString (WebKitExtras)
// Get the lproj directory name
path = [path stringByDeletingLastPathComponent];
- if (![[path pathExtension] _web_isCaseInsensitiveEqualToString:@"lproj"]) {
+ if (![[path pathExtension] _webkit_isCaseInsensitiveEqualToString:@"lproj"]) {
return NSMacOSRomanStringEncoding;
}
return CFStringConvertEncodingToNSStringEncoding(encoding);
}
+- (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string
+{
+ return [self compare:string options:(NSCaseInsensitiveSearch|NSLiteralSearch)] == NSOrderedSame;
+}
+
@end
-(BOOL)_web_isReturnOrEnterKeyEvent;
-(BOOL)_web_isTabKeyEvent;
-- (BOOL)_web_keyBindingManagerHasBinding;
-
@end
#import <WebKit/WebNSEventExtras.h>
-#import <AppKit/NSKeyBindingManager.h>
-
@implementation NSEvent (WebExtras)
-(BOOL)_web_isKeyEvent:(unichar)key
return [self _web_isKeyEvent:tabKey] || [self _web_isKeyEvent:shiftTabKey];
}
-- (BOOL)_web_keyBindingManagerHasBinding
-{
- NSDictionary *keyBindings = [[NSKeyBindingManager sharedKeyBindingManager] dictionary];
- return [keyBindings objectForKey:[self characters]] != nil;
-}
-
@end
- (NSString *)_web_encodeHostName; // turns Unicode into funny-looking ASCII form, returns self if no decoding needed, convenient cover
// FIXME: change these names back to _web_ when identically-named
-// methods are removed from Foundation
+// methods are removed from or renamed in Foundation
- (BOOL)_webkit_isJavaScriptURL;
- (NSString *)_webkit_scriptIfJavaScriptURL;
- (BOOL)_webkit_isFTPDirectoryURL;
+- (BOOL)_webkit_isFileURL;
@end
return [[self _web_originalDataAsString] _webkit_isJavaScriptURL];
}
+- (BOOL)_webkit_isFileURL
+{
+ return [[self _web_originalDataAsString] _webkit_isFileURL];
+}
+
- (NSString *)_webkit_scriptIfJavaScriptURL
{
return [[self _web_originalDataAsString] _webkit_scriptIfJavaScriptURL];
return [self _web_hasCaseInsensitivePrefix:@"javascript:"];
}
+- (BOOL)_webkit_isFileURL
+{
+ return [self _web_hasCaseInsensitivePrefix:@"file:"];
+}
+
- (NSString *)_webkit_stringByReplacingValidPercentEscapes
{
NSString *s = [self stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
#import <WebKit/WebAuthenticationPanel.h>
#import <Foundation/NSURLAuthenticationChallenge.h>
#import <WebKit/WebAssertions.h>
-#import <Foundation/NSDictionary_NSURLExtras.h>
static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
@interface NSMutableDictionary (WebExtras)
-- (void)_web_setObject:(id)object forUncopiedKey:(id)key;
+- (void)_webkit_setObject:(id)object forUncopiedKey:(id)key;
@end
@implementation NSMutableDictionary (WebExtras)
--(void)_web_setObject:(id)object forUncopiedKey:(id)key
+-(void)_webkit_setObject:(id)object forUncopiedKey:(id)key
{
CFDictionarySetValue((CFMutableDictionaryRef)self, key, object);
}
NSMutableArray *queue = [windowToChallengeQueue objectForKey:window];
if (queue == nil) {
queue = [[NSMutableArray alloc] init];
- [windowToChallengeQueue _web_setObject:queue forUncopiedKey:window];
+ [windowToChallengeQueue _webkit_setObject:queue forUncopiedKey:window];
[queue release];
}
[queue addObject:challenge];
}
WebAuthenticationPanel *panel = [[WebAuthenticationPanel alloc] initWithCallback:self selector:@selector(_authenticationDoneWithChallenge:result:)];
- [challengeToWindow _web_setObject:window forUncopiedKey:challenge];
- [windowToPanel _web_setObject:panel forUncopiedKey:window];
+ [challengeToWindow _webkit_setObject:window forUncopiedKey:challenge];
+ [windowToPanel _webkit_setObject:panel forUncopiedKey:window];
[panel release];
if (window == WebModalDialogPretendWindow) {
for (i = 0; i < count; i++) {
NSString *key = [keys objectAtIndex:i];
NSString *value = [values objectAtIndex:i];
- if ([key _web_isCaseInsensitiveEqualToString:@"height"]) {
+ if ([key _webkit_isCaseInsensitiveEqualToString:@"height"]) {
specifiedHeight = [value intValue];
- } else if ([key _web_isCaseInsensitiveEqualToString:@"width"]) {
+ } else if ([key _webkit_isCaseInsensitiveEqualToString:@"width"]) {
specifiedWidth = [value intValue];
}
// Avoid Window Media Player crash when these attributes are present.
- if (isWMP && ([key _web_isCaseInsensitiveEqualToString:@"SAMIStyle"] || [key _web_isCaseInsensitiveEqualToString:@"SAMILang"])) {
+ if (isWMP && ([key _webkit_isCaseInsensitiveEqualToString:@"SAMIStyle"] || [key _webkit_isCaseInsensitiveEqualToString:@"SAMILang"])) {
continue;
}
cAttributes[argsCount] = strdup([key UTF8String]);
#import <WebKit/WebBasePluginPackage.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebPluginPackage.h>
#import <Foundation/NSPrivateDecls.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <CoreFoundation/CFBundlePriv.h>
- (BOOL)isQuickTimePlugIn
{
NSString *bundleIdentifier = [[self bundle] bundleIdentifier];
- return [bundleIdentifier _web_isCaseInsensitiveEqualToString:QuickTimeCarbonPluginIdentifier] ||
- [bundleIdentifier _web_isCaseInsensitiveEqualToString:QuickTimeCocoaPluginIdentifier];
+ return [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:QuickTimeCarbonPluginIdentifier] ||
+ [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:QuickTimeCocoaPluginIdentifier];
}
- (BOOL)isJavaPlugIn
{
NSString *bundleIdentifier = [[self bundle] bundleIdentifier];
- return [bundleIdentifier _web_isCaseInsensitiveEqualToString:JavaCocoaPluginIdentifier] ||
- [bundleIdentifier _web_isCaseInsensitiveEqualToString:JavaCarbonPluginIdentifier] ||
- [[path lastPathComponent] _web_isCaseInsensitiveEqualToString:JavaCFMPluginFilename];
+ return [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:JavaCocoaPluginIdentifier] ||
+ [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:JavaCarbonPluginIdentifier] ||
+ [[path lastPathComponent] _webkit_isCaseInsensitiveEqualToString:JavaCFMPluginFilename];
}
@end
#import <WebKit/WebPluginPackage.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <Foundation/NSPrivateDecls.h>
-#import <Foundation/NSString_NSURLExtras.h>
NSString *WebPlugInBaseURLKey = @"WebPlugInBaseURLKey";
NSString *WebPlugInAttributesKey = @"WebPlugInAttributesKey";
return nil;
}
- if (![[pluginPath pathExtension] _web_isCaseInsensitiveEqualToString:@"webplugin"]) {
+ if (![[pluginPath pathExtension] _webkit_isCaseInsensitiveEqualToString:@"webplugin"]) {
UInt32 type = 0;
CFBundleGetPackageInfo([bundle _cfBundle], &type, NULL);
if (type != FOUR_CHAR_CODE('WBPL')) {
#import <WebKit/WebJavaScriptTextInputPanel.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitSystemBits.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSURLRequestPrivate.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
}
NSString *parentDomain = [[parentFrame _bridge] domain];
- if (parentDomain != nil && [thisDomain _web_isCaseInsensitiveEqualToString:parentDomain]) {
+ if (parentDomain != nil && [thisDomain _webkit_isCaseInsensitiveEqualToString:parentDomain]) {
// Allow if the domain of the parent of the targeted frame equals this domain.
return YES;
}
unsigned count = [keys count];
unsigned i;
for (i = 0; i < count; i++) {
- if ([[keys objectAtIndex:i] _web_isCaseInsensitiveEqualToString:key]) {
+ if ([[keys objectAtIndex:i] _webkit_isCaseInsensitiveEqualToString:key]) {
return [values objectAtIndex:i];
}
}
#import "WebNSObjectExtras.h"
-#import <CoreGraphics/CoreGraphicsPrivate.h>
+#import <CoreGraphics/CGContext.h>
@implementation WebGlyphBuffer
WebImageDecodeItem.h
Copyright 2004, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebImageData.h>
-
#ifndef OMIT_TIGER_FEATURES
+#import <Cocoa/Cocoa.h>
+
+@class WebImageData;
+
@interface WebImageDecodeItem : NSObject
{
@public
- initWithImage:(WebImageData *)img data:(CFDataRef)d isComplete:(BOOL)f callback:(id)c;
@end
-#endif
\ No newline at end of file
+#endif
Copyright 2004, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebImageDecodeItem.h>
+#import <WebKit/WebImageData.h>
#ifndef OMIT_TIGER_FEATURES
@end
-#endif
\ No newline at end of file
+#endif
WebImageDecoder.h
Copyright 2004, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebImageData.h>
-#import <WebKit/WebImageDecodeItem.h>
#ifndef OMIT_TIGER_FEATURES
+#import <WebKit/WebImageDecodeItem.h>
+@class WebImageData;
+
@interface WebImageDecoder : NSObject
{
@public
- (void)decodeItem:(WebImageDecodeItem *)item;
@end
-#endif
\ No newline at end of file
+#endif
*/
#import <WebKit/WebAssertions.h>
#import <WebKit/WebImageDecoder.h>
+#import <WebKit/WebImageData.h>
#ifndef OMIT_TIGER_FEATURES
pthread_attr_destroy(&attr);
}
-#endif
\ No newline at end of file
+#endif
*/
#import <WebCore/WebCoreTextRenderer.h>
+#import <QD/ATSUnicodePriv.h>
typedef struct WidthMap WidthMap;
typedef struct WidthEntry WidthEntry;
#import <ApplicationServices/ApplicationServices.h>
#import <Carbon/Carbon.h>
-#import <QD/ATSUnicodePriv.h>
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-#import <Foundation/NSPrivateDecls.h>
#endif
#endif
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
return NO;
} else if ([theRequest valueForHTTPHeaderField:@"Cache-Control"] != nil) {
return NO;
- } else if ([[theRequest HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ } else if ([[theRequest HTTPMethod] _webkit_isCaseInsensitiveEqualToString:@"POST"]) {
return NO;
} else {
return YES;
#import <WebKit/WebDataProtocol.h>
#import <Foundation/NSURLResponse.h>
-#import <Foundation/NSURLResponsePrivate.h>
-#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
NSString *WebDataProtocolScheme = @"applewebdata";
static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
{
ASSERT(URL);
NSString *scheme = [URL scheme];
- return scheme && [scheme _web_isCaseInsensitiveEqualToString:WebDataProtocolScheme];
+ return scheme && [scheme _webkit_isCaseInsensitiveEqualToString:WebDataProtocolScheme];
}
+(BOOL)canInitWithRequest:(NSURLRequest *)request
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
WebFrame *ancestor = self;
while (ancestor != nil) {
NSString *ancestorDomain = [[ancestor _bridge] domain];
- if (ancestorDomain != nil && [sourceDomain _web_isCaseInsensitiveEqualToString:ancestorDomain]) {
+ if (ancestorDomain != nil && [sourceDomain _webkit_isCaseInsensitiveEqualToString:ancestorDomain]) {
return YES;
}
ancestor = [ancestor parentFrame];
// recursion here.
if ([self parentFrame] == nil) {
NSString *openerDomain = [[[self _bridge] opener] domain];
- if (openerDomain != nil && [sourceDomain _web_isCaseInsensitiveEqualToString:openerDomain]) {
+ if (openerDomain != nil && [sourceDomain _webkit_isCaseInsensitiveEqualToString:openerDomain]) {
return YES;
}
}
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
// If we're about to rePOST, set up action so the app can warn the user
- if ([[request HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ if ([[request HTTPMethod] _webkit_isCaseInsensitiveEqualToString:@"POST"]) {
NSDictionary *action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:[request URL]];
[newDataSource _setTriggeringAction:action];
}
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocumentPrivate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebResourcePrivate.h>
#import <WebKit/WebView.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLResponse.h>
@interface WebHTMLRepresentationPrivate : NSObject
- (BOOL)_isDisplayingWebArchive
{
- return [[[_private->dataSource response] MIMEType] _web_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
+ return [[[_private->dataSource response] MIMEType] _webkit_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
}
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
return NO;
} else if ([theRequest valueForHTTPHeaderField:@"Cache-Control"] != nil) {
return NO;
- } else if ([[theRequest HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ } else if ([[theRequest HTTPMethod] _webkit_isCaseInsensitiveEqualToString:@"POST"]) {
return NO;
} else {
return YES;
#import <Foundation/NSHTTPCookie.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
{
// Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
BOOL isRemote = ![URL isFileURL] && ![WebDataProtocol _webIsDataProtocolURL:URL];
- BOOL isRemoteWebArchive = isRemote && [MIMEType _web_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
+ BOOL isRemoteWebArchive = isRemote && [MIMEType _webkit_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
if (![WebView canShowMIMEType:MIMEType] || isRemoteWebArchive) {
[[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:URL];
// Check reachedTerminalState since the load may have already been cancelled inside of _handleUnimplementablePolicyWithErrorCode::.
// FIXME: This is a workaround to make web archive files work with Foundations that
// are too old to know about web archive files. We should remove this before we ship.
NSURL *URL = [r URL];
- if ([[[URL path] pathExtension] _web_isCaseInsensitiveEqualToString:@"webarchive"]) {
+ if ([[[URL path] pathExtension] _webkit_isCaseInsensitiveEqualToString:@"webarchive"]) {
r = [[[NSURLResponse alloc] initWithURL:URL
MIMEType:@"application/x-webarchive"
expectedContentLength:[r expectedContentLength]
#import <Foundation/NSHTTPCookie.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
{
// Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
BOOL isRemote = ![URL isFileURL] && ![WebDataProtocol _webIsDataProtocolURL:URL];
- BOOL isRemoteWebArchive = isRemote && [MIMEType _web_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
+ BOOL isRemoteWebArchive = isRemote && [MIMEType _webkit_isCaseInsensitiveEqualToString:@"application/x-webarchive"];
if (![WebView canShowMIMEType:MIMEType] || isRemoteWebArchive) {
[[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:URL];
// Check reachedTerminalState since the load may have already been cancelled inside of _handleUnimplementablePolicyWithErrorCode::.
// FIXME: This is a workaround to make web archive files work with Foundations that
// are too old to know about web archive files. We should remove this before we ship.
NSURL *URL = [r URL];
- if ([[[URL path] pathExtension] _web_isCaseInsensitiveEqualToString:@"webarchive"]) {
+ if ([[[URL path] pathExtension] _webkit_isCaseInsensitiveEqualToString:@"webarchive"]) {
r = [[[NSURLResponse alloc] initWithURL:URL
MIMEType:@"application/x-webarchive"
expectedContentLength:[r expectedContentLength]
#ifndef OMIT_TIGER_FEATURES
-#import <Foundation/NSString_NSURLExtras.h>
-
#import <WebKit/WebAssertions.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebLocalizableStrings.h>
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <Foundation/NSData_NSURLExtras.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <Foundation/NSURLFileTypeMappings.h>
// FIXME: This is a workaround to make web archive files work with Foundations that
// are too old to know about web archive files. We should remove this before we ship.
- if ([extension _web_isCaseInsensitiveEqualToString:@"webarchive"]) {
+ if ([extension _webkit_isCaseInsensitiveEqualToString:@"webarchive"]) {
return @"application/x-webarchive";
}