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:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.m b/WebKit/Carbon.subproj/CarbonUtils.m
index cc1fbf01c2a351868f26969f79c2dd6eaa2bf4d0..5d7e9638daa0fdad0099b0fc2412021f9fdefda6 100644 (file)
--- a/WebKit/Carbon.subproj/CarbonUtils.m
+++ b/WebKit/Carbon.subproj/CarbonUtils.m
@@ -7,6 +7,7 @@
  *
  */
 #import <AppKit/NSBitmapImageRep_Private.h>
+#import <Foundation/NSPrivateDecls.h>
 
 #include "CarbonUtils.h"
 

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f62331cf997d95d043b388d4909233bc5957409b..3c870ec9abbd957753c701bc501167f4e356e00e 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,76 @@
+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.

diff --git a/WebKit/DOM.subproj/WebDOMOperations.m b/WebKit/DOM.subproj/WebDOMOperations.m
index 0593dbaf32e8ff03dd0a93e2abe9f7b0f0f2a20f..6669aaa6644d7dcd162e372f526f3b7992ca7922 100644 (file)
--- a/WebKit/DOM.subproj/WebDOMOperations.m
+++ b/WebKit/DOM.subproj/WebDOMOperations.m
@@ -11,8 +11,8 @@
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebKitNSStringExtras.h>
 
-#import <Foundation/NSString_NSURLExtras.h>
 
 @implementation DOMNode (WebDOMNodeOperations)
 
@@ -136,7 +136,7 @@
 - (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;
@@ -187,9 +187,9 @@
 - (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;

diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 717e386c8a45932a181c3ca4bb64a01695e8d06b..d6755d23e20aed4260443804389192df69147a18 100644 (file)
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -12,13 +12,13 @@
 #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>
@@ -453,7 +453,7 @@ NSString *WebHistoryItemChangedNotification = @"WebHistoryItemChangedNotificatio
     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

diff --git a/WebKit/Misc.subproj/WebDatabase.m b/WebKit/Misc.subproj/WebDatabase.m
index 58f346b592230a2bfa2581884c5a803f07e9232f..5eb5b35c2be5a727fd4af2e1105155096dbd18ea 100644 (file)
--- a/WebKit/Misc.subproj/WebDatabase.m
+++ b/WebKit/Misc.subproj/WebDatabase.m
@@ -3,8 +3,8 @@
     Copyright (C) 2003 Apple Computer, Inc. All rights reserved.    
 */
 
-#import <Foundation/NSPrivateDecls.h>
 #import <WebKit/WebDatabase.h>
+#import <WebKit/WebAssertions.h>
 
 // implementation WebDatabase ------------------------------------------------------------------------
 
@@ -12,22 +12,22 @@
 
 -(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;
 }
 
@@ -74,17 +74,17 @@
 
 -(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
@@ -99,7 +99,7 @@
 
 -(unsigned)count
 {
-    NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+    ASSERT_NOT_REACHED();
     return 0;
 }
 
@@ -110,7 +110,7 @@
 
 -(void)setSizeLimit:(unsigned)limit
 {
-    NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
+    ASSERT_NOT_REACHED();
 }
 
 -(unsigned)usage

diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 2d988b1293a24c851300fd28846f527b59e95437..1e642758fb795d75dbafe9025fa740e116fc4536 100644 (file)
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -12,8 +12,7 @@
 #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";
@@ -122,7 +121,7 @@ NSSize WebIconLargeSize = {128, 128};
         return [self defaultIconWithSize:size];
     }
 
-    if ([URL _web_isFileURL]) {
+    if ([URL _webkit_isFileURL]) {
         return [self _iconForFileURL:URL withSize:size];
     }
     
@@ -539,7 +538,7 @@ NSSize WebIconLargeSize = {128, 128};
     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];

diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
index 66ecc54f9631e5d5d0dfa16da544481e2ddf7521..6f396bab9d2200cd74159e44042ae52988317098 100644 (file)
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.h
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -22,4 +22,6 @@
 
 + (NSStringEncoding)_web_encodingForResource:(Handle)resource;
 
+- (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string;
+
 @end

diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.m b/WebKit/Misc.subproj/WebKitNSStringExtras.m
index c8be2fe3318b121b464f4324a5f092d03cb20f8c..6c786c32acedccf25e2fc0cbff7bf591fe479ba0 100644 (file)
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.m
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.m
@@ -9,7 +9,6 @@
 #import <WebKit/WebTextRenderer.h>
 #import <WebKit/WebTextRendererFactory.h>
 
-#import <Foundation/NSString_NSURLExtras.h>
 #import <unicode/uchar.h>
 
 @implementation NSString (WebKitExtras)
@@ -155,7 +154,7 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
     
     // Get the lproj directory name
     path = [path stringByDeletingLastPathComponent];
-    if (![[path pathExtension] _web_isCaseInsensitiveEqualToString:@"lproj"]) {
+    if (![[path pathExtension] _webkit_isCaseInsensitiveEqualToString:@"lproj"]) {
         return NSMacOSRomanStringEncoding;
     }
     
@@ -182,4 +181,9 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
     return CFStringConvertEncodingToNSStringEncoding(encoding);
 }
 
+- (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string
+{
+  return [self compare:string options:(NSCaseInsensitiveSearch|NSLiteralSearch)] == NSOrderedSame;
+}
+
 @end

diff --git a/WebKit/Misc.subproj/WebNSEventExtras.h b/WebKit/Misc.subproj/WebNSEventExtras.h
index b90cb61798e5653458685667ce986cbc0683c74e..600d534fc6ae3945b138ce6002de59f8bc70747b 100644 (file)
--- a/WebKit/Misc.subproj/WebNSEventExtras.h
+++ b/WebKit/Misc.subproj/WebNSEventExtras.h
@@ -15,6 +15,4 @@
 -(BOOL)_web_isReturnOrEnterKeyEvent;
 -(BOOL)_web_isTabKeyEvent;
 
-- (BOOL)_web_keyBindingManagerHasBinding;
-
 @end

diff --git a/WebKit/Misc.subproj/WebNSEventExtras.m b/WebKit/Misc.subproj/WebNSEventExtras.m
index 2743dfef5cacef2fe81a78ef3bd351c46c8d772b..f9c0881e061e9ef15b671a3351dede16fd744b80 100644 (file)
--- a/WebKit/Misc.subproj/WebNSEventExtras.m
+++ b/WebKit/Misc.subproj/WebNSEventExtras.m
@@ -5,8 +5,6 @@
 
 #import <WebKit/WebNSEventExtras.h>
 
-#import <AppKit/NSKeyBindingManager.h>
-
 @implementation NSEvent (WebExtras)
 
 -(BOOL)_web_isKeyEvent:(unichar)key
@@ -58,10 +56,4 @@
     return [self _web_isKeyEvent:tabKey] || [self _web_isKeyEvent:shiftTabKey];
 }
 
-- (BOOL)_web_keyBindingManagerHasBinding
-{
-    NSDictionary *keyBindings = [[NSKeyBindingManager sharedKeyBindingManager] dictionary];
-    return [keyBindings objectForKey:[self characters]] != nil;
-}
-
 @end

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.h b/WebKit/Misc.subproj/WebNSURLExtras.h
index 83a5878ba20edee723c22eeaecaababd319d40c5..9db9e4d53fbacd847e23d2fdd1e3fc88d61ce74c 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLExtras.h
@@ -58,9 +58,10 @@
 - (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

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index 0598ee46917c398da4ee9f6da6a74ea555c7c779..3cc6f2eccee2dc8d8332d7079a36b47ac0473aa0 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -528,6 +528,11 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
     return [[self _web_originalDataAsString] _webkit_isJavaScriptURL];
 }
 
+- (BOOL)_webkit_isFileURL
+{
+    return [[self _web_originalDataAsString] _webkit_isFileURL];
+}
+
 - (NSString *)_webkit_scriptIfJavaScriptURL
 {
     return [[self _web_originalDataAsString] _webkit_scriptIfJavaScriptURL];
@@ -752,6 +757,11 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
     return [self _web_hasCaseInsensitivePrefix:@"javascript:"];
 }
 
+- (BOOL)_webkit_isFileURL
+{
+    return [self _web_hasCaseInsensitivePrefix:@"file:"];
+}
+
 - (NSString *)_webkit_stringByReplacingValidPercentEscapes
 {
     NSString *s = [self stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];

diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 7dfa76a829c12ad4946ffa360c0920c38adbb904..718390f054641aeea40eaa8bb566218bc971a504 100644 (file)
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -9,16 +9,15 @@
 #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);
 }
@@ -62,7 +61,7 @@ WebPanelAuthenticationHandler *sharedHandler;
     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];
@@ -114,8 +113,8 @@ WebPanelAuthenticationHandler *sharedHandler;
     }
 
     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) {

diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index ffca44681d84fe5af689a878dc96e56494633a09..0b814f7fb0cc15c290d500863f308f3c3b0c08d1 100644 (file)
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1088,13 +1088,13 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
     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]);

diff --git a/WebKit/Plugins.subproj/WebBasePluginPackage.m b/WebKit/Plugins.subproj/WebBasePluginPackage.m
index ff18099fc787e46f4881d3286796adfc582d4f47..f1cada866de2fdf3ca6959f5820b7be06d7a5b09 100644 (file)
--- a/WebKit/Plugins.subproj/WebBasePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebBasePluginPackage.m
@@ -8,12 +8,12 @@
 
 #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>
 
@@ -372,16 +372,16 @@
 - (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

diff --git a/WebKit/Plugins.subproj/WebPluginPackage.m b/WebKit/Plugins.subproj/WebPluginPackage.m
index efcd4c3ba9d13d1fef100a85746595240ca12017..331ff94fdd46929e78f4e8d249e915da83c4cc4b 100644 (file)
--- a/WebKit/Plugins.subproj/WebPluginPackage.m
+++ b/WebKit/Plugins.subproj/WebPluginPackage.m
@@ -9,9 +9,9 @@
 #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";
@@ -35,7 +35,7 @@ extern NSString *WebPlugInContainingElementKey;
         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')) {

diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 76dba8651aa41a26de8ca6f98d2eeabf495560fb..62ad25f4d23b2eba86798cb79e487280c919e84c 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -28,6 +28,7 @@
 #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>
@@ -51,8 +52,8 @@
 
 #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>
@@ -628,7 +629,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     }
     
     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;
     }
@@ -887,7 +888,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     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];
         }
     }

diff --git a/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.m b/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.m
index df9fe0e5541856b1a6046313d9adf1ce144a67e6..9547f11ef62b549c551083b8977e04f31f51ab19 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.m
+++ b/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.m
@@ -7,7 +7,7 @@
 
 #import "WebNSObjectExtras.h"
 
-#import <CoreGraphics/CoreGraphicsPrivate.h>
+#import <CoreGraphics/CGContext.h>
 
 @implementation WebGlyphBuffer
 

diff --git a/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h b/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h
index 4208abece8842fbd8a2cd51bbe8a186d298a4be3..0f4b1285d448a8f5b7942e6e270ca01260a1cb6f 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h
@@ -2,10 +2,12 @@
     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
@@ -18,4 +20,4 @@
 - initWithImage:(WebImageData *)img data:(CFDataRef)d isComplete:(BOOL)f callback:(id)c;
 @end
 
-#endif
\ No newline at end of file
+#endif

diff --git a/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m b/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m
index 8eadad081469b059c7c16f528d309f256b86960c..10cd408869bcdddd5ba9eaf7090dc57c6c38ccc8 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m
@@ -3,6 +3,7 @@
        Copyright 2004, Apple, Inc. All rights reserved.
 */
 #import <WebKit/WebImageDecodeItem.h>
+#import <WebKit/WebImageData.h>
 
 #ifndef OMIT_TIGER_FEATURES
 
@@ -39,4 +40,4 @@
 
 @end
 
-#endif
\ No newline at end of file
+#endif

diff --git a/WebKit/WebCoreSupport.subproj/WebImageDecoder.h b/WebKit/WebCoreSupport.subproj/WebImageDecoder.h
index 300b7d1bb469f2377a42d928e91088e2e56365b9..b9724c7021cafaae44b86a27a75c5793db488dba 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageDecoder.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageDecoder.h
@@ -2,11 +2,12 @@
     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
@@ -24,4 +25,4 @@
 - (void)decodeItem:(WebImageDecodeItem *)item;
 @end
 
-#endif
\ No newline at end of file
+#endif

diff --git a/WebKit/WebCoreSupport.subproj/WebImageDecoder.m b/WebKit/WebCoreSupport.subproj/WebImageDecoder.m
index 1a277e85e8821753e9fa6195a45be2f6ec3c1798..b5382ce73cd767e2e3526ccc51cdff8f9cb04466 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageDecoder.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageDecoder.m
@@ -4,6 +4,7 @@
 */
 #import <WebKit/WebAssertions.h>
 #import <WebKit/WebImageDecoder.h>
+#import <WebKit/WebImageData.h>
 
 #ifndef OMIT_TIGER_FEATURES
 
@@ -282,4 +283,4 @@ static void startDecoderThread() {
     pthread_attr_destroy(&attr);
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
index 66a58e12cd3ee824b26124c62db1ee5fda7121f1..3016107ab7a641e60f722be48ac1f16017df0a7d 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
@@ -4,6 +4,7 @@
 */
 
 #import <WebCore/WebCoreTextRenderer.h>
+#import <QD/ATSUnicodePriv.h>
 
 typedef struct WidthMap WidthMap;
 typedef struct WidthEntry WidthEntry;

diff --git a/WebKit/WebKitPrefix.h b/WebKit/WebKitPrefix.h
index 766eb7673b78813f9bd6d2a94c6c1dfc61899071..e6f79d6d1e3cf43f64d3ce44e350f8dd490ac753 100644 (file)
--- a/WebKit/WebKitPrefix.h
+++ b/WebKit/WebKitPrefix.h
@@ -27,11 +27,9 @@
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Carbon/Carbon.h>
-#import <QD/ATSUnicodePriv.h>
 
 #ifdef __OBJC__
 #import <Cocoa/Cocoa.h>
-#import <Foundation/NSPrivateDecls.h>
 #endif
 
 #endif

diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 3db87f7013e0c7f431224bd785db196029684cc0..169afe72b0d7e051f2566e25b2a53a80a5544a91 100644 (file)
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -13,7 +13,6 @@
 #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>
@@ -21,6 +20,7 @@
 #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>
@@ -185,7 +185,7 @@ static BOOL NSURLConnectionSupportsBufferedData;
         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;

diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 21c0cddd58c77ed631f4f098f63589464671ac9b..6bed8b4ae428e552cd0b887f20091f4f236e6c1a 100644 (file)
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -5,11 +5,9 @@
 #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";
@@ -207,7 +205,7 @@ 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

diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index af361afd70f44274e6a2fd815e0b95093e3439f1..dd0f8f9b9d92f845a3df2b979032643b7a424b59 100644 (file)
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -23,6 +23,7 @@
 #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>
@@ -508,7 +509,7 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     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];
@@ -519,7 +520,7 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     //     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;
         }
     }
@@ -2876,7 +2877,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     [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];
     }

diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index b668480dc2d0746986fd33b839525622711e7a83..e8e844b4551aa72a19d6c725b7b35cdf2559aee9 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -12,12 +12,12 @@
 #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
@@ -81,7 +81,7 @@
 
 - (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

diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 3db87f7013e0c7f431224bd785db196029684cc0..169afe72b0d7e051f2566e25b2a53a80a5544a91 100644 (file)
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -13,7 +13,6 @@
 #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>
@@ -21,6 +20,7 @@
 #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>
@@ -185,7 +185,7 @@ static BOOL NSURLConnectionSupportsBufferedData;
         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;

diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 40d9c7a4e44cdf865a5206a95ea63f6b009067a7..ca5dd815fe1ff0d26285b5f46511429bca378d44 100644 (file)
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -7,7 +7,6 @@
 
 #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>
@@ -27,6 +26,7 @@
 #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>
@@ -210,7 +210,7 @@
     {
         // 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::.
@@ -313,7 +313,7 @@
     // 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] 

diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 40d9c7a4e44cdf865a5206a95ea63f6b009067a7..ca5dd815fe1ff0d26285b5f46511429bca378d44 100644 (file)
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -7,7 +7,6 @@
 
 #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>
@@ -27,6 +26,7 @@
 #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>
@@ -210,7 +210,7 @@
     {
         // 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::.
@@ -313,7 +313,7 @@
     // 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] 

diff --git a/WebKit/WebView.subproj/WebPDFView.m b/WebKit/WebView.subproj/WebPDFView.m
index 914a4279b65feaf62adcf0ec92021d6249398a68..30f3fd93a8e6d9da48d37b0afc95d7deecdc13d9 100644 (file)
--- a/WebKit/WebView.subproj/WebPDFView.m
+++ b/WebKit/WebView.subproj/WebPDFView.m
@@ -5,8 +5,6 @@
 
 #ifndef OMIT_TIGER_FEATURES
 
-#import <Foundation/NSString_NSURLExtras.h>
-
 #import <WebKit/WebAssertions.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebLocalizableStrings.h>

diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index a5e19a2fba7a38bb9fef94e6d2ded6487e22e1c9..24460650e163d3790d3b43f12c23eb51fc60aa93 100644 (file)
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -36,6 +36,7 @@
 #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>
@@ -59,7 +60,6 @@
 
 #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>
@@ -506,7 +506,7 @@ static bool debugWidget = true;
 
     // 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";
     }