+2006-10-10 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Eric.
+
+ - moved a big honkin' pile of code over from WebKit; made minimal needed changes to compile
+
+ * WebCore.exp:
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/mac/LoaderNSURLExtras.m: Added.
+ * loader/mac/WebDataProtocol.m: Added.
+ * loader/mac/WebDocumentLoader.m: Added.
+ * loader/mac/WebFormDataStream.m: Added.
+ * loader/mac/WebFrameLoader.m: Added.
+ * loader/mac/WebLoader.m: Added.
+ (-[NSURLProtocol didReceiveResponse:]):
+ (-[NSURLProtocol didReceiveData:lengthReceived:allAtOnce:]):
+ * loader/mac/WebMainResourceLoader.m: Added.
+ (-[WebMainResourceLoader didReceiveResponse:]):
+ * loader/mac/WebPolicyDecider.m: Added.
+ * loader/mac/WebSubresourceLoader.h: Added.
+ * loader/mac/WebSubresourceLoader.m: Added.
+
2006-10-10 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver (sort of?)
.objc_class_name_WebCoreStringTruncator
.objc_class_name_WebCoreViewFactory
.objc_class_name_WebDashboardRegion
+.objc_class_name_WebDocumentLoader
+.objc_class_name_WebFrameLoader
+.objc_class_name_WebLoader
+.objc_class_name_WebNetscapePlugInStreamLoader
+.objc_class_name_WebPolicyDecider
.objc_class_name_WebScriptObject
.objc_class_name_WebScriptObjectPrivate
+.objc_class_name_WebSubresourceLoader
.objc_class_name_WebUndefined
_WebCoreDrawTextAtPoint
_WebCoreFindFont
_WebCoreSetShouldUseFontSmoothing
_WebCoreShouldUseFontSmoothing
_WebCoreTextFloatWidth
+_canonicalURL
+_isBackForwardLoadType
+_stringIsFileURL
+_urlByRemovingComponent
+_urlByRemovingFragment
+_urlByRemovingResourceSpecifier
+_urlIsEmpty
+_urlIsFileURL
+_urlOriginalData
+_urlOriginalDataAsString
+_urlWithData
+_urlWithDataRelativeToURL
+_webSetHTTPBody
_wkCGContextGetShouldSmoothFonts
_wkClearGlyphVector
_wkConvertCharToGlyphs
6565820009D1508D000E61D7 /* SVGNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
6565820209D1508D000E61D7 /* XLinkNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581EB09D1508D000E61D7 /* XLinkNames.h */; };
6565821309D15111000E61D7 /* ksvgcssvalues.h in Headers */ = {isa = PBXBuildFile; fileRef = 6565820F09D15111000E61D7 /* ksvgcssvalues.h */; };
+ 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */; };
+ 656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37350ADBA5DE00A4554D /* WebDataProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */; };
+ 656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37370ADBA5DE00A4554D /* WebDocumentLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */; };
+ 656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37200ADBA5DE00A4554D /* WebFormDataStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37210ADBA5DE00A4554D /* WebFormDataStream.m */; };
+ 656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37220ADBA5DE00A4554D /* WebFormState.h */; };
+ 656D373B0ADBA5DE00A4554D /* WebFormState.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* WebFormState.m */; };
+ 656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37240ADBA5DE00A4554D /* WebFrameLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D373D0ADBA5DE00A4554D /* WebFrameLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* WebFrameLoader.m */; };
+ 656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37270ADBA5DE00A4554D /* WebLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37400ADBA5DE00A4554D /* WebLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37280ADBA5DE00A4554D /* WebLoader.m */; };
+ 656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */; };
+ 656D37420ADBA5DE00A4554D /* WebMainResourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */; };
+ 656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */; };
+ 656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37460ADBA5DE00A4554D /* WebPolicyDecider.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37470ADBA5DE00A4554D /* WebPolicyDecider.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */; };
+ 656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 656D37490ADBA5DE00A4554D /* WebSubresourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */; };
657429170A9C2D0B00C52C97 /* IconDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429140A9C2D0B00C52C97 /* IconDataCache.h */; };
657429180A9C2D0B00C52C97 /* SQLStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429150A9C2D0B00C52C97 /* SQLStatement.h */; };
657429190A9C2D0B00C52C97 /* SQLTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429160A9C2D0B00C52C97 /* SQLTransaction.h */; };
6565820E09D15111000E61D7 /* ksvgcssvalues.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.gperf; sourceTree = "<group>"; };
6565820F09D15111000E61D7 /* ksvgcssvalues.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ksvgcssvalues.h; sourceTree = "<group>"; };
6565821009D15111000E61D7 /* ksvgcssvalues.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.in; sourceTree = "<group>"; };
+ 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LoaderNSURLExtras.h; sourceTree = "<group>"; };
+ 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LoaderNSURLExtras.m; sourceTree = "<group>"; };
+ 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
+ 656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDataProtocol.m; sourceTree = "<group>"; };
+ 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
+ 656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDocumentLoader.m; sourceTree = "<group>"; };
+ 656D37200ADBA5DE00A4554D /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
+ 656D37210ADBA5DE00A4554D /* WebFormDataStream.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormDataStream.m; sourceTree = "<group>"; };
+ 656D37220ADBA5DE00A4554D /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
+ 656D37230ADBA5DE00A4554D /* WebFormState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormState.m; sourceTree = "<group>"; };
+ 656D37240ADBA5DE00A4554D /* WebFrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoader.h; sourceTree = "<group>"; };
+ 656D37250ADBA5DE00A4554D /* WebFrameLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFrameLoader.m; sourceTree = "<group>"; };
+ 656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoaderClient.h; sourceTree = "<group>"; };
+ 656D37270ADBA5DE00A4554D /* WebLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebLoader.h; sourceTree = "<group>"; };
+ 656D37280ADBA5DE00A4554D /* WebLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebLoader.m; sourceTree = "<group>"; };
+ 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
+ 656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebMainResourceLoader.m; sourceTree = "<group>"; };
+ 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
+ 656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePlugInStreamLoader.m; sourceTree = "<group>"; };
+ 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
+ 656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDecider.h; sourceTree = "<group>"; };
+ 656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDecider.m; sourceTree = "<group>"; };
+ 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
+ 656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebSubresourceLoader.m; sourceTree = "<group>"; };
657429140A9C2D0B00C52C97 /* IconDataCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconDataCache.h; sourceTree = "<group>"; };
657429150A9C2D0B00C52C97 /* SQLStatement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SQLStatement.h; sourceTree = "<group>"; };
657429160A9C2D0B00C52C97 /* SQLTransaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SQLTransaction.h; sourceTree = "<group>"; };
93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */,
F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */,
51A1D2C50AB69120000D732C /* IconLoaderMac.mm */,
+ 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */,
+ 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */,
+ 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */,
+ 656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */,
+ 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */,
+ 656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */,
+ 656D37200ADBA5DE00A4554D /* WebFormDataStream.h */,
+ 656D37210ADBA5DE00A4554D /* WebFormDataStream.m */,
+ 656D37220ADBA5DE00A4554D /* WebFormState.h */,
+ 656D37230ADBA5DE00A4554D /* WebFormState.m */,
+ 656D37240ADBA5DE00A4554D /* WebFrameLoader.h */,
+ 656D37250ADBA5DE00A4554D /* WebFrameLoader.m */,
+ 656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */,
+ 656D37270ADBA5DE00A4554D /* WebLoader.h */,
+ 656D37280ADBA5DE00A4554D /* WebLoader.m */,
+ 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */,
+ 656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */,
+ 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */,
+ 656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */,
+ 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */,
+ 656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */,
+ 656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */,
+ 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */,
+ 656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */,
);
path = mac;
sourceTree = "<group>";
85CE1A9C0ADAC708003BBDEA /* DOMSVGSVGElement.h in Headers */,
85CE1AA10ADAC752003BBDEA /* DOMSVGSVGElementInternal.h in Headers */,
85CE1AF30ADAD440003BBDEA /* DOMSVGPathSegInternal.h in Headers */,
+ 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
+ 656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */,
+ 656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */,
+ 656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */,
+ 656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */,
+ 656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */,
+ 656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */,
+ 656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */,
+ 656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */,
+ 656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */,
+ 656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */,
+ 656D37460ADBA5DE00A4554D /* WebPolicyDecider.h in Headers */,
+ 656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
- projectRoot = "";
targets = (
93F198A508245E59001E9ABC /* WebCore */,
DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
85CE1A920ADAC650003BBDEA /* DOMSVGPathSegClosePath.mm in Sources */,
85CE1A9D0ADAC708003BBDEA /* DOMSVGSVGElement.mm in Sources */,
85CE1B020ADADA96003BBDEA /* DOMSVGPathSegInternal.mm in Sources */,
+ 656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */,
+ 656D37350ADBA5DE00A4554D /* WebDataProtocol.m in Sources */,
+ 656D37370ADBA5DE00A4554D /* WebDocumentLoader.m in Sources */,
+ 656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */,
+ 656D373B0ADBA5DE00A4554D /* WebFormState.m in Sources */,
+ 656D373D0ADBA5DE00A4554D /* WebFrameLoader.m in Sources */,
+ 656D37400ADBA5DE00A4554D /* WebLoader.m in Sources */,
+ 656D37420ADBA5DE00A4554D /* WebMainResourceLoader.m in Sources */,
+ 656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m in Sources */,
+ 656D37470ADBA5DE00A4554D /* WebPolicyDecider.m in Sources */,
+ 656D37490ADBA5DE00A4554D /* WebSubresourceLoader.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebCore.exp;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREFIX_HEADER = WebCorePrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_DEFINES)",
#import "LoaderNSURLExtras.h"
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
NSURL *urlByRemovingComponent(NSURL *url, CFURLComponentType component)
{
#import "WebDataProtocol.h"
#import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
NSString *WebDataProtocolScheme = @"applewebdata";
static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
#import "WebDocumentLoader.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
#import "WebFrameLoader.h"
#import "WebDataProtocol.h"
-#import "WebFrameBridge.h"
-#import <WebCore/WebCoreSystemInterface.h>
+#import "WebCoreFrameBridge.h"
+#import "WebCoreSystemInterface.h"
@implementation WebDocumentLoader
#import <sys/types.h>
#import <sys/stat.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
static void formEventCallback(CFReadStreamRef stream, CFStreamEventType type, void *context);
#import "WebFrameLoaderClient.h"
#import "WebMainResourceLoader.h"
#import "WebPolicyDecider.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
#import <WebKit/DOMHTML.h>
-#import <WebCore/WebCoreFrameBridge.h>
-#import <WebCore/WebCoreIconDatabaseBridge.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import "WebCoreFrameBridge.h"
+#import "WebCoreIconDatabaseBridge.h"
+#import "WebCoreSystemInterface.h"
static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
{
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
static unsigned inNSURLConnectionCallback;
static BOOL NSURLConnectionSupportsBufferedData;
// If the URL is one of our whacky applewebdata URLs then
// fake up a substitute URL to present to the delegate.
- if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
- r = [[[NSURLResponse alloc] initWithURL:[request _webDataRequestExternalURL] MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
- }
+ if([WebDataProtocol _webIsDataProtocolURL:[r URL]])
+ r = [[[NSURLResponse alloc] initWithURL:[request _webDataRequestExternalURL] MIMEType:[r MIMEType] expectedContentLength:(int)[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
[r retain];
[response release];
[self addData:data allAtOnce:allAtOnce];
- [frameLoader _didReceiveData:data contentLength:lengthReceived forResource:identifier];
+ [frameLoader _didReceiveData:data contentLength:(int)lengthReceived forResource:identifier];
[self release];
}
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
// FIXME: More that is in common with WebSubresourceLoader should move up into WebLoader.
// anything including possibly releasing self; one example of this is 3266216
[self retain];
[frameLoader _setResponse:r];
- _contentLength = [r expectedContentLength];
+ _contentLength = (int)[r expectedContentLength];
_response = [r retain];
[self checkContentPolicy];
*/
#import "WebPolicyDecider.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
@implementation WebPolicyDecider
#import "WebLoader.h"
-#import <WebCore/WebCoreResourceLoader.h>
+#import "WebCoreResourceLoader.h"
@class WebFrameLoader;
#import "WebFormDataStream.h"
#import "WebFrameLoader.h"
#import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreResourceLoader.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreResourceLoader.h"
+#import "WebCoreSystemInterface.h"
@implementation WebSubresourceLoader
+2006-10-10 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Eric.
+
+ - moved a whole bunch of stuff over to WebCore - updated includes appropriately
+
+ * Loader/LoaderNSURLExtras.h: Removed.
+ * Loader/LoaderNSURLExtras.m: Removed.
+ * Loader/WebDataProtocol.h: Removed.
+ * Loader/WebDataProtocol.m: Removed.
+ * Loader/WebDocumentLoader.h: Removed.
+ * Loader/WebDocumentLoader.m: Removed.
+ * Loader/WebFormDataStream.h: Removed.
+ * Loader/WebFormDataStream.m: Removed.
+ * Loader/WebFormState.h: Removed.
+ * Loader/WebFormState.m: Removed.
+ * Loader/WebFrameLoader.h: Removed.
+ * Loader/WebFrameLoader.m: Removed.
+ * Loader/WebFrameLoaderClient.h: Removed.
+ * Loader/WebLoader.h: Removed.
+ * Loader/WebLoader.m: Removed.
+ * Loader/WebMainResourceLoader.h: Removed.
+ * Loader/WebMainResourceLoader.m: Removed.
+ * Loader/WebNetscapePlugInStreamLoader.h: Removed.
+ * Loader/WebNetscapePlugInStreamLoader.m: Removed.
+ * Loader/WebPlugInStreamLoaderDelegate.h: Removed.
+ * Loader/WebPolicyDecider.h: Removed.
+ * Loader/WebPolicyDecider.m: Removed.
+ * Loader/WebSubresourceLoader.h: Removed.
+ * Loader/WebSubresourceLoader.m: Removed.
+ * Misc/WebNSURLExtras.m:
+ * Plugins/WebBaseNetscapePluginStream.h:
+ * Plugins/WebBaseNetscapePluginView.m:
+ * Plugins/WebNetscapePluginStream.m:
+ * Plugins/WebPluginContainerCheck.m:
+ * Plugins/WebPluginController.m:
+ * WebCoreSupport/WebFrameBridge.m:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebView/WebDataSource.m:
+ * WebView/WebDocumentLoaderMac.h:
+ * WebView/WebFrame.m:
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.m:
+ * WebView/WebPolicyDeciderMac.h:
+ * WebView/WebPolicyDelegate.m:
+ * WebView/WebView.m:
+
2006-10-10 Mark Rowe <bdash@webkit.org>
Reviewed by Maciej.
#import <WebKit/WebNSDataExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebLocalizableStrings.h>
-#import "LoaderNSURLExtras.h"
+#import <WebCore/LoaderNSURLExtras.h>
#import <WebKitSystemInterface.h>
#import "WebSystemInterface.h"
#import <Foundation/Foundation.h>
#import <WebKit/npfunctions.h>
-#import <WebKit/WebPlugInStreamLoaderDelegate.h>
+#import <WebCore/WebPlugInStreamLoaderDelegate.h>
@class WebBaseNetscapePluginView;
@class NSURLResponse;
#import <WebKit/WebDataSourceInternal.h>
#import <WebKit/WebDefaultUIDelegate.h>
#import <WebKit/WebFrameInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebNetscapePluginStream.h>
-#import <WebKit/WebLoader.h>
#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebDataSourceInternal.h>
#import <WebKit/WebFrameInternal.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebNetscapePluginStreamLoader.h>
+#import <WebCore/WebNetscapePluginStreamLoader.h>
#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebViewInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
#import <Foundation/NSURLConnection.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebView.h>
#import <WebKit/WebViewInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
#import <objc/objc-runtime.h>
@implementation WebPluginContainerCheck
#import <WebKit/WebPluginController.h>
-#import <WebKit/WebDocumentLoader.h>
+#import <WebCore/WebDocumentLoader.h>
#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebFrameInternal.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebViewInternal.h>
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebDataSourceInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
#import <WebCore/WebCoreFrameBridge.h>
#import "WebBasePluginPackage.h"
#import "WebDataSourceInternal.h"
#import "WebDefaultUIDelegate.h"
-#import "WebDocumentLoader.h"
+#import <WebCore/WebDocumentLoader.h>
#import "WebEditingDelegate.h"
-#import "WebFormDataStream.h"
#import "WebFormDelegate.h"
+#import <WebCore/WebFormDataStream.h>
#import "WebFrameInternal.h"
-#import "WebFrameLoadDelegate.h"
-#import "WebFrameLoader.h"
+#import <WebKit/WebFrameLoadDelegate.h>
+#import <WebCore/WebFrameLoader.h>
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentationPrivate.h"
#import "WebHTMLViewInternal.h"
#import "WebKitNSStringExtras.h"
#import "WebKitStatisticsPrivate.h"
#import "WebKitSystemBits.h"
-#import "WebLoader.h"
+#import <WebCore/WebLoader.h>
#import "WebLocalizableStrings.h"
#import "WebNSObjectExtras.h"
#import "WebNSURLExtras.h"
#import "WebPreferencesPrivate.h"
#import "WebResourcePrivate.h"
#import "WebScriptDebugServerPrivate.h"
-#import "WebSubresourceLoader.h"
+#import <WebCore/WebSubresourceLoader.h>
#import "WebUIDelegatePrivate.h"
#import "WebViewInternal.h"
#import <Foundation/NSURLConnection.h>
51E4D39A0A886B5E00ECEE2C /* WebIconDatabaseBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E4D3980A886B5E00ECEE2C /* WebIconDatabaseBridge.m */; };
650F74E409E488F70020118A /* WebUnarchivingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F74E209E488F70020118A /* WebUnarchivingState.h */; };
650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 650F74E309E488F70020118A /* WebUnarchivingState.m */; };
- 651A93870A83F883007FEDF0 /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 651A93850A83F883007FEDF0 /* WebDataProtocol.h */; };
- 651A93880A83F883007FEDF0 /* WebDataProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 651A93860A83F883007FEDF0 /* WebDataProtocol.m */; };
- 6538B1C80A90596D00A07522 /* WebFormDataStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6538B1C60A90596D00A07522 /* WebFormDataStream.h */; };
- 6538B1C90A90596E00A07522 /* WebFormDataStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 6538B1C70A90596D00A07522 /* WebFormDataStream.m */; };
65488DA1084FBCCB00831AD0 /* WebNSDictionaryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */; };
65488DA2084FBCCB00831AD0 /* WebNSDictionaryExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */; };
- 654B3C330A82C47200E1AE3D /* WebFrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C290A82C47200E1AE3D /* WebFrameLoader.h */; };
- 654B3C340A82C47200E1AE3D /* WebFrameLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */; };
- 654B3C350A82C47200E1AE3D /* WebLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2B0A82C47200E1AE3D /* WebLoader.h */; };
- 654B3C360A82C47200E1AE3D /* WebLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2C0A82C47200E1AE3D /* WebLoader.m */; };
- 654B3C370A82C47200E1AE3D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */; };
- 654B3C380A82C47200E1AE3D /* WebMainResourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */; };
- 654B3C390A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */; };
- 654B3C3A0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */; };
- 654B3C3B0A82C47200E1AE3D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */; };
- 654B3C3C0A82C47200E1AE3D /* WebSubresourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */; };
6550B7C7099EFAE90090D781 /* WebArchiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B7C5099EFAE90090D781 /* WebArchiver.h */; };
6550B7C8099EFAE90090D781 /* WebArchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 6550B7C6099EFAE90090D781 /* WebArchiver.m */; };
- 656D8B540ADA4EA400B34CBB /* WebFormState.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D8B520ADA4EA400B34CBB /* WebFormState.h */; };
- 656D8B550ADA4EA400B34CBB /* WebFormState.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D8B530ADA4EA400B34CBB /* WebFormState.m */; };
658A40960A14853B005E6987 /* WebDataSourceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 658A40950A14853B005E6987 /* WebDataSourceInternal.h */; };
- 658BA6610ADB2D8900AEB387 /* WebPolicyDecider.h in Headers */ = {isa = PBXBuildFile; fileRef = 658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */; };
- 658BA6620ADB2D8900AEB387 /* WebPolicyDecider.m in Sources */ = {isa = PBXBuildFile; fileRef = 658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */; };
658BA6FC0ADB39DE00AEB387 /* WebPolicyDeciderMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 658BA6FA0ADB39DE00AEB387 /* WebPolicyDeciderMac.h */; };
658BA6FD0ADB39DE00AEB387 /* WebPolicyDeciderMac.m in Sources */ = {isa = PBXBuildFile; fileRef = 658BA6FB0ADB39DE00AEB387 /* WebPolicyDeciderMac.m */; };
- 659044280A9D3B4200E89459 /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 659044260A9D3B4200E89459 /* WebDocumentLoader.h */; };
- 659044290A9D3B4200E89459 /* WebDocumentLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 659044270A9D3B4200E89459 /* WebDocumentLoader.m */; };
65A0006908527D1A005620FA /* libWebKitSystemInterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A0006808527D1A005620FA /* libWebKitSystemInterface.a */; };
- 65A734610A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */; };
65C7F42C0979DE640022E453 /* WebPageBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7F42A0979DE640022E453 /* WebPageBridge.h */; };
65C7F42D0979DE640022E453 /* WebPageBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 65C7F42B0979DE640022E453 /* WebPageBridge.m */; };
65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F88208500917007E5CB9 /* WebNSURLRequestExtras.h */; };
65E0F88508500917007E5CB9 /* WebNSURLRequestExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E0F88308500917007E5CB9 /* WebNSURLRequestExtras.m */; };
65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F9E408500F23007E5CB9 /* WebNSUserDefaultsExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
65E0F9E708500F23007E5CB9 /* WebNSUserDefaultsExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E0F9E508500F23007E5CB9 /* WebNSUserDefaultsExtras.m */; };
- 65E1FDF90ADB8ED7003E1DC1 /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */; };
- 65E1FDFA0ADB8ED7003E1DC1 /* LoaderNSURLExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */; };
65EEDE53084FFB920002DB25 /* WebNSCalendarDateExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EEDE51084FFB920002DB25 /* WebNSCalendarDateExtras.h */; };
65EEDE54084FFB920002DB25 /* WebNSCalendarDateExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65EEDE52084FFB920002DB25 /* WebNSCalendarDateExtras.m */; };
65EEDE57084FFC9E0002DB25 /* WebNSFileManagerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EEDE55084FFC9E0002DB25 /* WebNSFileManagerExtras.h */; };
7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.m */; };
7E6FEF0A08985A7200C44C3F /* WebScriptDebugDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0708985A7200C44C3F /* WebScriptDebugDelegatePrivate.h */; };
- 930653940AD6FEF6008E969A /* WebFrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */; };
939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
51E94C6906C0347500A9B09E /* WebPDFRepresentation.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPDFRepresentation.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
650F74E209E488F70020118A /* WebUnarchivingState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebUnarchivingState.h; sourceTree = "<group>"; };
650F74E309E488F70020118A /* WebUnarchivingState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebUnarchivingState.m; sourceTree = "<group>"; };
- 651A93850A83F883007FEDF0 /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
- 651A93860A83F883007FEDF0 /* WebDataProtocol.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDataProtocol.m; sourceTree = "<group>"; };
- 6538B1C60A90596D00A07522 /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
- 6538B1C70A90596D00A07522 /* WebFormDataStream.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormDataStream.m; sourceTree = "<group>"; };
65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDictionaryExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSDictionaryExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 654B3C290A82C47200E1AE3D /* WebFrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoader.h; sourceTree = "<group>"; };
- 654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFrameLoader.m; sourceTree = "<group>"; };
- 654B3C2B0A82C47200E1AE3D /* WebLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebLoader.h; sourceTree = "<group>"; };
- 654B3C2C0A82C47200E1AE3D /* WebLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebLoader.m; sourceTree = "<group>"; };
- 654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
- 654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebMainResourceLoader.m; sourceTree = "<group>"; };
- 654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
- 654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePlugInStreamLoader.m; sourceTree = "<group>"; };
- 654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
- 654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebSubresourceLoader.m; sourceTree = "<group>"; };
6550B7C5099EFAE90090D781 /* WebArchiver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebArchiver.h; sourceTree = "<group>"; };
6550B7C6099EFAE90090D781 /* WebArchiver.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebArchiver.m; sourceTree = "<group>"; };
- 656D8B520ADA4EA400B34CBB /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
- 656D8B530ADA4EA400B34CBB /* WebFormState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormState.m; sourceTree = "<group>"; };
6578F5DE045F817400000128 /* WebDownload.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownload.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
6578F5DF045F817400000128 /* WebDownload.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDownload.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainerPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
658A40950A14853B005E6987 /* WebDataSourceInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataSourceInternal.h; sourceTree = "<group>"; };
- 658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDecider.h; sourceTree = "<group>"; };
- 658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDecider.m; sourceTree = "<group>"; };
658BA6FA0ADB39DE00AEB387 /* WebPolicyDeciderMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDeciderMac.h; sourceTree = "<group>"; };
658BA6FB0ADB39DE00AEB387 /* WebPolicyDeciderMac.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDeciderMac.m; sourceTree = "<group>"; };
- 659044260A9D3B4200E89459 /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
- 659044270A9D3B4200E89459 /* WebDocumentLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDocumentLoader.m; sourceTree = "<group>"; };
65A0006808527D1A005620FA /* libWebKitSystemInterface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebKitSystemInterface.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebUIDelegatePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65C7F42A0979DE640022E453 /* WebPageBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPageBridge.h; sourceTree = "<group>"; };
65C7F42B0979DE640022E453 /* WebPageBridge.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPageBridge.m; sourceTree = "<group>"; };
65E0F9E508500F23007E5CB9 /* WebNSUserDefaultsExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSUserDefaultsExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainerCheck.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65E1150407EFFEBF009B8BF7 /* WebPluginContainerCheck.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginContainerCheck.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LoaderNSURLExtras.h; sourceTree = "<group>"; };
- 65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LoaderNSURLExtras.m; sourceTree = "<group>"; };
65EEDE51084FFB920002DB25 /* WebNSCalendarDateExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSCalendarDateExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65EEDE52084FFB920002DB25 /* WebNSCalendarDateExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSCalendarDateExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65EEDE55084FFC9E0002DB25 /* WebNSFileManagerExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSFileManagerExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
84D4BFF70348EF7600CA2ACA /* WebNetscapePluginEmbeddedView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEmbeddedView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
84D4BFF80348EF7600CA2ACA /* WebNetscapePluginEmbeddedView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePluginEmbeddedView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9305892A070868B300E79D96 /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameLoaderClient.h; sourceTree = "<group>"; };
930D02BB06275F640076701E /* WebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
930D02BD06275F710076701E /* WebFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93154EF103A41270008635CE /* WebPanelAuthenticationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPanelAuthenticationHandler.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F52CA6C002DF9D78018635CA /* Download */,
F57D194A034E732C01A80180 /* DOM */,
25A8176801B5474B0ECA149E /* History */,
- 654B3C280A82C47200E1AE3D /* Loader */,
254DC334016E1D3F0ECA149E /* Misc */,
F8CA15B4029A399401000122 /* Panels */,
F5EBC45202134BB601CA1520 /* Plugins */,
path = DefaultDelegates;
sourceTree = "<group>";
};
- 654B3C280A82C47200E1AE3D /* Loader */ = {
- isa = PBXGroup;
- children = (
- 65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */,
- 65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */,
- 651A93850A83F883007FEDF0 /* WebDataProtocol.h */,
- 651A93860A83F883007FEDF0 /* WebDataProtocol.m */,
- 659044260A9D3B4200E89459 /* WebDocumentLoader.h */,
- 659044270A9D3B4200E89459 /* WebDocumentLoader.m */,
- 6538B1C60A90596D00A07522 /* WebFormDataStream.h */,
- 6538B1C70A90596D00A07522 /* WebFormDataStream.m */,
- 656D8B520ADA4EA400B34CBB /* WebFormState.h */,
- 656D8B530ADA4EA400B34CBB /* WebFormState.m */,
- 654B3C290A82C47200E1AE3D /* WebFrameLoader.h */,
- 654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */,
- 930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */,
- 654B3C2B0A82C47200E1AE3D /* WebLoader.h */,
- 654B3C2C0A82C47200E1AE3D /* WebLoader.m */,
- 654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */,
- 654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */,
- 654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */,
- 654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */,
- 65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */,
- 658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */,
- 658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */,
- 654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */,
- 654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */,
- );
- path = Loader;
- sourceTree = "<group>";
- };
848DFF410365F6FB00CA2ACA /* Netscape Plug-ins */ = {
isa = PBXGroup;
children = (
DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */,
1C0706630A431E01001078F6 /* WebScriptDebugServer.h in Headers */,
1C07079A0A433E22001078F6 /* WebScriptDebugServerPrivate.h in Headers */,
- 654B3C330A82C47200E1AE3D /* WebFrameLoader.h in Headers */,
- 654B3C350A82C47200E1AE3D /* WebLoader.h in Headers */,
- 654B3C370A82C47200E1AE3D /* WebMainResourceLoader.h in Headers */,
- 654B3C390A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h in Headers */,
- 654B3C3B0A82C47200E1AE3D /* WebSubresourceLoader.h in Headers */,
- 651A93870A83F883007FEDF0 /* WebDataProtocol.h in Headers */,
51E4D3990A886B5E00ECEE2C /* WebIconDatabaseBridge.h in Headers */,
- 6538B1C80A90596D00A07522 /* WebFormDataStream.h in Headers */,
- 65A734610A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h in Headers */,
- 659044280A9D3B4200E89459 /* WebDocumentLoader.h in Headers */,
1C0D40870AC1C8F40009C113 /* WebKitVersionChecks.h in Headers */,
65FFB7FC0AD0B7D30048CD05 /* WebDocumentLoaderMac.h in Headers */,
- 930653940AD6FEF6008E969A /* WebFrameLoaderClient.h in Headers */,
- 656D8B540ADA4EA400B34CBB /* WebFormState.h in Headers */,
- 658BA6610ADB2D8900AEB387 /* WebPolicyDecider.h in Headers */,
658BA6FC0ADB39DE00AEB387 /* WebPolicyDeciderMac.h in Headers */,
51B2A1000ADB15D0002A9BEE /* WebIconDatabaseDelegate.h in Headers */,
- 65E1FDF90ADB8ED7003E1DC1 /* LoaderNSURLExtras.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */,
93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */,
1C07073D0A433BD8001078F6 /* WebScriptDebugServer.m in Sources */,
- 654B3C340A82C47200E1AE3D /* WebFrameLoader.m in Sources */,
- 654B3C360A82C47200E1AE3D /* WebLoader.m in Sources */,
- 654B3C380A82C47200E1AE3D /* WebMainResourceLoader.m in Sources */,
- 654B3C3A0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m in Sources */,
- 654B3C3C0A82C47200E1AE3D /* WebSubresourceLoader.m in Sources */,
- 651A93880A83F883007FEDF0 /* WebDataProtocol.m in Sources */,
51E4D39A0A886B5E00ECEE2C /* WebIconDatabaseBridge.m in Sources */,
- 6538B1C90A90596E00A07522 /* WebFormDataStream.m in Sources */,
- 659044290A9D3B4200E89459 /* WebDocumentLoader.m in Sources */,
1C0D40880AC1C8F40009C113 /* WebKitVersionChecks.m in Sources */,
65FFB7FD0AD0B7D30048CD05 /* WebDocumentLoaderMac.m in Sources */,
- 656D8B550ADA4EA400B34CBB /* WebFormState.m in Sources */,
- 658BA6620ADB2D8900AEB387 /* WebPolicyDecider.m in Sources */,
658BA6FD0ADB39DE00AEB387 /* WebPolicyDeciderMac.m in Sources */,
- 65E1FDFA0ADB8ED7003E1DC1 /* LoaderNSURLExtras.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
#import "WebArchive.h"
#import "WebArchiver.h"
-#import "WebDataProtocol.h"
-#import "WebDataSourceInternal.h"
+#import <WebCore/WebDataProtocol.h>
+#import <WebKit/WebDataSourceInternal.h>
#import "WebDefaultResourceLoadDelegate.h"
#import "WebDocument.h"
#import "WebFrameBridge.h"
#import "WebFrameInternal.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
#import "WebFrameLoadDelegate.h"
#import "WebHTMLRepresentation.h"
#import "WebKitErrorsPrivate.h"
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebDocumentLoader.h>
+#import <WebCore/WebDocumentLoader.h>
@class WebDataSource;
#import "WebArchive.h"
#import "WebBackForwardList.h"
-#import "WebDataProtocol.h"
+#import <WebCore/WebDataProtocol.h>
#import "WebDataSourceInternal.h"
#import "WebDefaultResourceLoadDelegate.h"
#import "WebDefaultUIDelegate.h"
#import "WebDocumentInternal.h"
#import "WebDocumentLoaderMac.h"
#import "WebDownloadInternal.h"
-#import "WebFormDataStream.h"
+#import <WebCore/WebFormDataStream.h>
#import "WebFrameBridge.h"
#import "WebFrameLoadDelegate.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentationPrivate.h"
#import "WebHTMLViewInternal.h"
#import "WebKitLogging.h"
#import "WebKitNSStringExtras.h"
#import "WebKitStatisticsPrivate.h"
-#import "WebLoader.h"
+#import <WebCore/WebLoader.h>
#import "WebNSDictionaryExtras.h"
#import "WebNSObjectExtras.h"
#import "WebNSURLExtras.h"
#import "WebFramePrivate.h"
-#import "WebFrameLoaderClient.h"
+#import <WebCore/WebFrameLoaderClient.h>
+#import <WebCore/WebFrameLoader.h>
#import "WebPolicyDelegatePrivate.h"
-#import "WebFrameLoader.h"
@class WebDocumentLoader;
@class WebInspector;
#import <WebKit/WebBaseNetscapePluginViewInternal.h>
#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebClipView.h>
-#import <WebKit/WebDataProtocol.h>
+#import <WebCore/WebDataProtocol.h>
#import <WebKit/WebDataSourceInternal.h>
#import <WebKit/WebDefaultUIDelegate.h>
#import <WebKit/WebDocumentInternal.h>
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WebPolicyDecider.h"
+#import <WebCore/WebPolicyDecider.h>
@class WebPolicyDecisionListener;
*/
#import "WebPolicyDelegatePrivate.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
#import <objc/objc-runtime.h>
#import "WebBaseNetscapePluginView.h"
#import "WebDOMOperationsPrivate.h"
#import "WebDashboardRegion.h"
-#import "WebDataProtocol.h"
+#import <WebCore/WebDataProtocol.h>
#import "WebDataSourceInternal.h"
#import "WebDefaultEditingDelegate.h"
#import "WebDefaultFrameLoadDelegate.h"
#import "WebDefaultUIDelegate.h"
#import "WebDocument.h"
#import "WebDocumentInternal.h"
-#import "WebDocumentLoader.h"
+#import <WebCore/WebDocumentLoader.h>
#import "WebDownload.h"
#import "WebDownloadInternal.h"
#import "WebDynamicScrollBarsView.h"
#import "WebFormDelegatePrivate.h"
#import "WebFrameBridge.h"
#import "WebFrameInternal.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentation.h"
#import "WebHTMLViewInternal.h"
git://git.webkit.org / WebKit-https.git / commitdiff