WebCore:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Oct 2006 00:57:20 +0000 (00:57 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Oct 2006 00:57:20 +0000 (00:57 +0000)
        - did the do-webcore-rename renames, including a number of changes
          to the names of loader files (and WebResourceLoader -> ResourceLoader),
          jScript() to scriptProxy(), jScriptEnabled() to javaScriptEnabled(),
          and improvements to the names of decoder classes and their source
          files (Decoder -> TextResourceDecoder, StreamingTextDecoder -> TextCodec)

WebKit:

        - update for the WebCore renames

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

86 files changed:
WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/WebCore.exp
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/bindings/js/kjs_binding.cpp
WebCore/bindings/js/kjs_events.cpp
WebCore/bindings/js/kjs_html.cpp
WebCore/bindings/js/kjs_traversal.cpp
WebCore/bindings/js/kjs_window.cpp
WebCore/bindings/objc/DOMInternal.mm
WebCore/bridge/mac/FrameMac.mm
WebCore/bridge/mac/WebCoreEncodings.mm
WebCore/bridge/mac/WebCoreFrameBridge.mm
WebCore/bridge/win/FrameWin.cpp
WebCore/dom/Document.cpp
WebCore/dom/Document.h
WebCore/dom/EventTargetNode.cpp
WebCore/html/HTMLParser.cpp
WebCore/html/HTMLPlugInElement.cpp
WebCore/html/HTMLScriptElement.cpp
WebCore/html/HTMLTokenizer.cpp
WebCore/ksvg2/misc/SVGDocumentExtensions.cpp
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedCSSStyleSheet.h
WebCore/loader/CachedXBLDocument.cpp
WebCore/loader/CachedXBLDocument.h
WebCore/loader/CachedXSLStyleSheet.cpp
WebCore/loader/CachedXSLStyleSheet.h
WebCore/loader/DocumentLoader.h [moved from WebCore/loader/WebDocumentLoader.h with 100% similarity]
WebCore/loader/FrameLoader.cpp
WebCore/loader/FrameLoader.h
WebCore/loader/FrameLoaderClient.h
WebCore/loader/MainResourceLoader.h [moved from WebCore/loader/WebMainResourceLoader.h with 97% similarity]
WebCore/loader/NetscapePlugInStreamLoader.h [moved from WebCore/loader/WebNetscapePlugInStreamLoader.h with 96% similarity]
WebCore/loader/Request.h
WebCore/loader/ResourceLoader.h [moved from WebCore/loader/WebLoader.h with 97% similarity]
WebCore/loader/SubresourceLoader.h [moved from WebCore/loader/WebSubresourceLoader.h with 97% similarity]
WebCore/loader/TextResourceDecoder.cpp [moved from WebCore/loader/Decoder.cpp with 95% similarity]
WebCore/loader/TextResourceDecoder.h [moved from WebCore/loader/Decoder.h with 90% similarity]
WebCore/loader/loader.cpp
WebCore/loader/mac/DocumentLoaderMac.mm
WebCore/loader/mac/FormDataStream.h [moved from WebCore/loader/mac/WebFormDataStream.h with 100% similarity]
WebCore/loader/mac/FormDataStream.m [moved from WebCore/loader/mac/WebFormDataStream.m with 99% similarity]
WebCore/loader/mac/FrameLoaderMac.mm
WebCore/loader/mac/ImageDocumentMac.mm
WebCore/loader/mac/LoaderFunctionsMac.mm
WebCore/loader/mac/MainResourceLoaderMac.mm
WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm
WebCore/loader/mac/ResourceLoaderMac.mm
WebCore/loader/mac/SubresourceLoaderMac.mm
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/platform/TextCodec.cpp [moved from WebCore/platform/StreamingTextDecoder.cpp with 98% similarity]
WebCore/platform/TextCodec.h [moved from WebCore/platform/StreamingTextDecoder.h with 96% similarity]
WebCore/platform/TextCodecICU.cpp [moved from WebCore/platform/StreamingTextDecoderICU.cpp with 99% similarity]
WebCore/platform/TextCodecICU.h [moved from WebCore/platform/StreamingTextDecoderICU.h with 94% similarity]
WebCore/platform/TextCodecLatin1.h
WebCore/platform/TextCodecUTF16.h
WebCore/platform/TextDecoder.h
WebCore/platform/TextEncoding.cpp
WebCore/platform/TextEncodingRegistry.cpp
WebCore/platform/image-decoders/jpeg/jmorecfg.h
WebCore/platform/mac/TextCodecMac.cpp [moved from WebCore/platform/mac/StreamingTextDecoderMac.cpp with 99% similarity]
WebCore/platform/mac/TextCodecMac.h [moved from WebCore/platform/mac/StreamingTextDecoderMac.h with 95% similarity]
WebCore/platform/network/ResourceHandleInternal.h
WebCore/platform/network/mac/ResourceHandleMac.mm
WebCore/platform/qt/FrameQt.cpp
WebCore/platform/qt/LoaderFunctionsQt.cpp
WebCore/rendering/RenderObject.cpp
WebCore/xml/XSLTProcessor.cpp
WebCore/xml/xmlhttprequest.cpp
WebCore/xml/xmlhttprequest.h
WebKit/ChangeLog
WebKit/Plugins/WebNetscapePluginStream.mm
WebKit/Plugins/WebPluginController.mm
WebKit/WebCoreSupport/WebFrameBridge.mm
WebKit/WebCoreSupport/WebFrameLoaderClient.h
WebKit/WebCoreSupport/WebFrameLoaderClient.mm
WebKit/WebCoreSupport/WebPageBridge.mm
WebKit/WebView/WebDocumentLoaderMac.h
WebKit/WebView/WebFrame.mm
WebKit/WebView/WebHTMLRepresentation.m
WebKit/WebView/WebView.mm

index fb9a840..f606afc 100644 (file)
@@ -978,7 +978,7 @@ set(WebCore_SRCS
     loader/CachedXBLDocument.cpp
     loader/CachedResource.cpp
     loader/Cache.cpp
-    loader/Decoder.cpp
+    loader/TextResourceDecoder.cpp
     loader/FormData.cpp
     platform/CString.cpp
     platform/AtomicString.cpp
@@ -998,8 +998,8 @@ set(WebCore_SRCS
     platform/ArrayImpl.cpp
     platform/FloatPoint.cpp
     platform/SegmentedString.cpp
-    platform/StreamingTextDecoder.cpp
-    platform/StreamingTextDecoderICU.cpp
+    platform/TextCodec.cpp
+    platform/TextCodecICU.cpp
     platform/DeprecatedString.cpp
     platform/DeprecatedCString.cpp
     platform/TextCodecLatin1.cpp
index c638d18..d9c77aa 100644 (file)
@@ -1,5 +1,240 @@
 2006-10-29  Darin Adler  <darin@apple.com>
 
+        - did the do-webcore-rename renames, including a number of changes
+          to the names of loader files (and WebResourceLoader -> ResourceLoader),
+          jScript() to scriptProxy(), jScriptEnabled() to javaScriptEnabled(),
+          and improvements to the names of decoder classes and their source
+          files (Decoder -> TextResourceDecoder, StreamingTextDecoder -> TextCodec)
+
+        * CMakeLists.txt:
+        * WebCore.exp:
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/kjs_binding.cpp:
+        (KJS::ScriptInterpreter::updateDOMNodeDocument):
+        * bindings/js/kjs_events.cpp:
+        (KJS::JSAbstractEventListener::handleEvent):
+        (KJS::JSLazyEventListener::parseCode):
+        * bindings/js/kjs_html.cpp:
+        (KJS::JSHTMLElement::implementsCall):
+        * bindings/js/kjs_traversal.cpp:
+        (KJS::JSNodeFilterCondition::acceptNode):
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::interpreter):
+        (KJS::Window::retrieveWindow):
+        (KJS::Window::retrieve):
+        (KJS::ScheduledAction::execute):
+        * bindings/objc/DOMInternal.mm:
+        (-[WebScriptObject _initializeScriptDOMNodeImp]):
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::executionContextForDOM):
+        (WebCore::FrameMac::bindingRootObject):
+        (WebCore::FrameMac::windowScriptObject):
+        (WebCore::FrameMac::windowScriptNPObject):
+        (WebCore::FrameMac::partClearedInBegin):
+        * bridge/mac/WebCoreEncodings.mm:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge aeDescByEvaluatingJavaScriptFromString:]):
+        (-[WebCoreFrameBridge stringWithData:]):
+        (-[WebCoreFrameBridge executionContextForView:]):
+        * bridge/win/FrameWin.cpp:
+        * dom/Document.cpp:
+        (WebCore::Document::inputEncoding):
+        (WebCore::Document::setCharset):
+        (WebCore::Document::createHTMLEventListener):
+        (WebCore::Document::setDecoder):
+        * dom/Document.h:
+        (WebCore::Document::decoder):
+        * dom/EventTargetNode.cpp:
+        (WebCore::EventTargetNode::dispatchGenericEvent):
+        * html/HTMLParser.cpp:
+        (WebCore::HTMLParser::noscriptCreateErrorCheck):
+        (WebCore::HTMLParser::canvasCreateErrorCheck):
+        (WebCore::HTMLParser::isInline):
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::createNPObject):
+        * html/HTMLScriptElement.cpp:
+        (WebCore::HTMLScriptElement::evaluateScript):
+        * html/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::parseTag):
+        (WebCore::HTMLTokenizer::processToken):
+        * ksvg2/misc/SVGDocumentExtensions.cpp:
+        (WebCore::SVGDocumentExtensions::createSVGEventListener):
+        * loader/CachedCSSStyleSheet.cpp:
+        (WebCore::CachedCSSStyleSheet::CachedCSSStyleSheet):
+        (WebCore::CachedCSSStyleSheet::setEncoding):
+        * loader/CachedCSSStyleSheet.h:
+        * loader/CachedXBLDocument.cpp:
+        (WebCore::CachedXBLDocument::CachedXBLDocument):
+        (WebCore::CachedXBLDocument::setEncoding):
+        * loader/CachedXBLDocument.h:
+        * loader/CachedXSLStyleSheet.cpp:
+        (WebCore::CachedXSLStyleSheet::CachedXSLStyleSheet):
+        (WebCore::CachedXSLStyleSheet::setEncoding):
+        * loader/CachedXSLStyleSheet.h:
+        * loader/Decoder.cpp: Removed.
+        * loader/Decoder.h: Removed.
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * loader/FrameLoaderClient.h:
+        * loader/MainResourceLoader.h: Added.
+        * loader/NetscapePlugInStreamLoader.h: Added.
+        * loader/Request.h:
+        (WebCore::Request::cachedResource):
+        * loader/ResourceLoader.h: Added.
+        * loader/SubresourceLoader.h: Added.
+        * loader/TextResourceDecoder.cpp: Added.
+        (WebCore::TextResourceDecoder::determineContentType):
+        (WebCore::TextResourceDecoder::defaultEncoding):
+        (WebCore::TextResourceDecoder::TextResourceDecoder):
+        (WebCore::TextResourceDecoder::~TextResourceDecoder):
+        (WebCore::TextResourceDecoder::setEncoding):
+        (WebCore::TextResourceDecoder::checkForBOM):
+        (WebCore::TextResourceDecoder::checkForCSSCharset):
+        (WebCore::TextResourceDecoder::checkForHeadCharset):
+        (WebCore::TextResourceDecoder::detectJapaneseEncoding):
+        (WebCore::TextResourceDecoder::decode):
+        (WebCore::TextResourceDecoder::flush):
+        * loader/TextResourceDecoder.h: Added.
+        * loader/WebDocumentLoader.h: Removed.
+        * loader/WebLoader.h: Removed.
+        * loader/WebMainResourceLoader.h: Removed.
+        * loader/WebNetscapePlugInStreamLoader.h: Removed.
+        * loader/WebSubresourceLoader.h: Removed.
+        * loader/loader.cpp:
+        (WebCore::Loader::servePendingRequests):
+        (WebCore::Loader::receivedAllData):
+        (WebCore::Loader::receivedResponse):
+        (WebCore::Loader::didReceiveData):
+        (WebCore::Loader::cancelRequests):
+        (WebCore::Loader::jobForRequest):
+        * loader/mac/DocumentLoaderMac.mm:
+        * loader/mac/FormDataStream.m: Added.
+        * loader/mac/FrameLoaderMac.mm:
+        (WebCore::FrameLoader::cancelPendingArchiveLoad):
+        (WebCore::FrameLoader::addPlugInStreamLoader):
+        (WebCore::FrameLoader::removePlugInStreamLoader):
+        (WebCore::FrameLoader::addSubresourceLoader):
+        (WebCore::FrameLoader::removeSubresourceLoader):
+        (WebCore::FrameLoader::willSendRequest):
+        (WebCore::FrameLoader::didReceiveAuthenticationChallenge):
+        (WebCore::FrameLoader::didCancelAuthenticationChallenge):
+        (WebCore::FrameLoader::didReceiveResponse):
+        (WebCore::FrameLoader::didReceiveData):
+        (WebCore::FrameLoader::didFinishLoad):
+        (WebCore::FrameLoader::didFailToLoad):
+        (WebCore::FrameLoader::open):
+        (WebCore::FrameLoader::willUseArchive):
+        (WebCore::FrameLoader::isArchiveLoadPending):
+        * loader/mac/ImageDocumentMac.mm:
+        * loader/mac/LoaderFunctionsMac.mm:
+        (WebCore::CheckCacheObjectStatus):
+        * loader/mac/MainResourceLoaderMac.mm:
+        (WebCore::MainResourceLoader::MainResourceLoader):
+        (WebCore::MainResourceLoader::releaseDelegate):
+        (WebCore::MainResourceLoader::didCancel):
+        (WebCore::MainResourceLoader::addData):
+        (WebCore::MainResourceLoader::willSendRequest):
+        (WebCore::MainResourceLoader::continueAfterContentPolicy):
+        (WebCore::MainResourceLoader::didReceiveData):
+        (WebCore::MainResourceLoader::didFinishLoading):
+        (WebCore::MainResourceLoader::setDefersLoading):
+        * loader/mac/NetscapePlugInStreamLoaderMac.mm:
+        (WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
+        (WebCore::NetscapePlugInStreamLoader::releaseResources):
+        (WebCore::NetscapePlugInStreamLoader::didReceiveResponse):
+        (WebCore::NetscapePlugInStreamLoader::didReceiveData):
+        (WebCore::NetscapePlugInStreamLoader::didFinishLoading):
+        (WebCore::NetscapePlugInStreamLoader::didFail):
+        (WebCore::NetscapePlugInStreamLoader::didCancel):
+        * loader/mac/ResourceLoaderMac.mm:
+        (WebCore::ResourceLoader::ResourceLoader):
+        (WebCore::ResourceLoader::~ResourceLoader):
+        (WebCore::ResourceLoader::releaseResources):
+        (WebCore::ResourceLoader::load):
+        (WebCore::ResourceLoader::setDefersLoading):
+        (WebCore::ResourceLoader::frameLoader):
+        (WebCore::ResourceLoader::addData):
+        (WebCore::ResourceLoader::resourceData):
+        (WebCore::ResourceLoader::clearResourceData):
+        (WebCore::ResourceLoader::willSendRequest):
+        (WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceLoader::didCancelAuthenticationChallenge):
+        (WebCore::ResourceLoader::didReceiveResponse):
+        (WebCore::ResourceLoader::didReceiveData):
+        (WebCore::ResourceLoader::willStopBufferingData):
+        (WebCore::ResourceLoader::didFinishLoading):
+        (WebCore::ResourceLoader::didFinishLoadingOnePart):
+        (WebCore::ResourceLoader::didFail):
+        (WebCore::ResourceLoader::willCacheResponse):
+        (WebCore::ResourceLoader::didCancel):
+        (WebCore::ResourceLoader::cancel):
+        (WebCore::ResourceLoader::setIdentifier):
+        (WebCore::ResourceLoader::response):
+        (WebCore::ResourceLoader::inConnectionCallback):
+        (WebCore::ResourceLoader::cancelledError):
+        (WebCore::ResourceLoader::receivedCredential):
+        (WebCore::ResourceLoader::receivedRequestToContinueWithoutCredential):
+        (WebCore::ResourceLoader::receivedCancellation):
+        (WebCore::ResourceLoader::delegate):
+        (WebCore::ResourceLoader::releaseDelegate):
+        (-[WebCoreResourceLoaderAsDelegate initWithLoader:]):
+        * loader/mac/SubresourceLoaderMac.mm:
+        (WebCore::SubresourceLoader::SubresourceLoader):
+        (WebCore::SubresourceLoader::willSendRequest):
+        (WebCore::SubresourceLoader::didReceiveResponse):
+        (WebCore::SubresourceLoader::didReceiveData):
+        (WebCore::SubresourceLoader::didFinishLoading):
+        (WebCore::SubresourceLoader::didFail):
+        (WebCore::SubresourceLoader::didCancel):
+        * loader/mac/WebFormDataStream.h: Removed.
+        * loader/mac/WebFormDataStream.m: Removed.
+        * page/Frame.cpp:
+        (WebCore::Frame::javaScriptEnabled):
+        (WebCore::Frame::scriptProxy):
+        (WebCore::Frame::executeScript):
+        (WebCore::Frame::write):
+        (WebCore::Frame::userGestureHint):
+        (WebCore::Frame::saveInterpreterBuiltins):
+        (WebCore::Frame::restoreInterpreterBuiltins):
+        (WebCore::Frame::backslashAsCurrencySymbol):
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        * platform/StreamingTextDecoder.cpp: Removed.
+        * platform/StreamingTextDecoder.h: Removed.
+        * platform/StreamingTextDecoderICU.cpp: Removed.
+        * platform/StreamingTextDecoderICU.h: Removed.
+        * platform/TextCodec.cpp: Added.
+        * platform/TextCodec.h: Added.
+        * platform/TextCodecICU.cpp: Added.
+        * platform/TextCodecICU.h: Added.
+        * platform/TextCodecLatin1.h:
+        * platform/TextCodecUTF16.h:
+        * platform/TextDecoder.h:
+        * platform/TextEncoding.cpp:
+        * platform/TextEncodingRegistry.cpp:
+        * platform/image-decoders/jpeg/jmorecfg.h:
+        * platform/mac/StreamingTextDecoderMac.cpp: Removed.
+        * platform/mac/StreamingTextDecoderMac.h: Removed.
+        * platform/mac/TextCodecMac.cpp: Added.
+        * platform/mac/TextCodecMac.h: Added.
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/qt/FrameQt.cpp:
+        (WebCore::FrameQt::bindingRootObject):
+        * platform/qt/LoaderFunctionsQt.cpp:
+        (WebCore::CheckCacheObjectStatus):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::backslashAsCurrencySymbol):
+        * xml/XSLTProcessor.cpp:
+        (WebCore::XSLTProcessor::createDocumentFromSource):
+        * xml/xmlhttprequest.cpp:
+        (WebCore::XMLHttpRequest::didReceiveData):
+        * xml/xmlhttprequest.h:
+
+2006-10-29  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Adam (kinda).
 
         - add Mac suffixes and correct filenames inside loader/mac
index ce1da47..7f7a772 100644 (file)
@@ -137,12 +137,12 @@ __ZN7WebCore11FrameLoader16detachFromParentEv
 __ZN7WebCore11FrameLoader17actionInformationENS_13FrameLoadTypeEbP7NSEventP5NSURL
 __ZN7WebCore11FrameLoader17actionInformationENS_14NavigationTypeEP7NSEventP5NSURL
 __ZN7WebCore11FrameLoader19requestFromDelegateEP12NSURLRequestRP11objc_objectRP7NSError
-__ZN7WebCore11FrameLoader21addPlugInStreamLoaderEPNS_17WebResourceLoaderE
+__ZN7WebCore11FrameLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
 __ZN7WebCore11FrameLoader21commitProvisionalLoadEP12NSDictionary
 __ZN7WebCore11FrameLoader23addExtraFieldsToRequestEP19NSMutableURLRequestbb
 __ZN7WebCore11FrameLoader23reloadAllowingStaleDataERKNS_6StringE
 __ZN7WebCore11FrameLoader23timeOfLastCompletedLoadEv
-__ZN7WebCore11FrameLoader24removePlugInStreamLoaderEPNS_17WebResourceLoaderE
+__ZN7WebCore11FrameLoader24removePlugInStreamLoaderEPNS_14ResourceLoaderE
 __ZN7WebCore11FrameLoader25provisionalDocumentLoaderEv
 __ZN7WebCore11FrameLoader29sendRemainingDelegateMessagesEP11objc_objectP13NSURLResponsejP7NSError
 __ZN7WebCore11FrameLoader4loadEP12NSURLRequest
@@ -157,8 +157,8 @@ __ZN7WebCore11FrameLoader8safeLoadEP5NSURL
 __ZN7WebCore11FrameLoader9setClientEPNS_17FrameLoaderClientE
 __ZN7WebCore11RenderLayer18gAlignCenterAlwaysE
 __ZN7WebCore12AtomicString3addEPNS_10StringImplE
-__ZN7WebCore13HitTestResultC1ERKS0_
 __ZN7WebCore13HitTestResultC1ERKNS_8IntPointEbbb
+__ZN7WebCore13HitTestResultC1ERKS0_
 __ZN7WebCore13HitTestResultD1Ev
 __ZN7WebCore13HitTestResultaSERKS0_
 __ZN7WebCore14DocumentLoader12setCommittedEb
@@ -170,10 +170,10 @@ __ZN7WebCore14DocumentLoader32replaceRequestURLForAnchorScrollEP5NSURL
 __ZN7WebCore14DocumentLoader7requestEv
 __ZN7WebCore14DocumentLoaderC2EP12NSURLRequest
 __ZN7WebCore14DocumentLoaderD2Ev
+__ZN7WebCore14ResourceLoader14cancelledErrorEv
+__ZN7WebCore14ResourceLoader20inConnectionCallbackEv
 __ZN7WebCore16DeprecatedStringD1Ev
 __ZN7WebCore17FrameLoaderClientD2Ev
-__ZN7WebCore17WebResourceLoader14cancelledErrorEv
-__ZN7WebCore17WebResourceLoader20inConnectionCallbackEv
 __ZN7WebCore19SelectionController5clearEv
 __ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
 __ZN7WebCore26NetscapePlugInStreamLoader6createEPNS_5FrameEP11objc_object
@@ -250,7 +250,7 @@ __ZNK7WebCore14DocumentLoader3URLEv
 __ZNK7WebCore14DocumentLoader5titleEv
 __ZNK7WebCore14DocumentLoader8responseEv
 __ZNK7WebCore14DocumentLoader9isLoadingEv
-__ZNK7WebCore17WebResourceLoader11frameLoaderEv
+__ZNK7WebCore14ResourceLoader11frameLoaderEv
 __ZNK7WebCore26NetscapePlugInStreamLoader6isDoneEv
 __ZNK7WebCore4Page14frameNamespaceEv
 __ZNK7WebCore4Page19dragCaretControllerEv
index 293398b..fab81ba 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\loader\Decoder.cpp"
+                               RelativePath="..\..\loader\TextResourceDecoder.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\loader\Decoder.h"
+                               RelativePath="..\..\loader\TextResourceDecoder.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\StreamingTextDecoder.cpp"
+                               RelativePath="..\..\platform\TextCodec.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\StreamingTextDecoder.h"
+                               RelativePath="..\..\platform\TextCodec.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\StreamingTextDecoderICU.cpp"
+                               RelativePath="..\..\platform\TextCodecICU.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\StreamingTextDecoderICU.h"
+                               RelativePath="..\..\platform\TextCodecICU.h"
                                >
                        </File>
                        <File
index 432512b..5a1d341 100644 (file)
                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.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371D0ADBA5DE00A4554D /* WebDataProtocol.mm */; };
-               656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37360ADBA5DE00A4554D /* DocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371E0ADBA5DE00A4554D /* DocumentLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37370ADBA5DE00A4554D /* DocumentLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */; };
-               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 */; };
+               656D37380ADBA5DE00A4554D /* FormDataStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37200ADBA5DE00A4554D /* FormDataStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37390ADBA5DE00A4554D /* FormDataStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37210ADBA5DE00A4554D /* FormDataStream.m */; };
                656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37220ADBA5DE00A4554D /* WebFormState.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* FormState.cpp */; };
                656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37240ADBA5DE00A4554D /* FrameLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D373D0ADBA5DE00A4554D /* FrameLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* FrameLoaderMac.mm */; };
                656D373E0ADBA5DE00A4554D /* FrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37260ADBA5DE00A4554D /* FrameLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37270ADBA5DE00A4554D /* WebLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D373F0ADBA5DE00A4554D /* ResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37270ADBA5DE00A4554D /* ResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37400ADBA5DE00A4554D /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */; };
-               656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */; };
+               656D37410ADBA5DE00A4554D /* MainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* MainResourceLoader.h */; };
                656D37420ADBA5DE00A4554D /* MainResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */; };
-               656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37440ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */; };
                656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37480ADBA5DE00A4554D /* SubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* SubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37490ADBA5DE00A4554D /* SubresourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37310ADBA5DE00A4554D /* SubresourceLoaderMac.mm */; };
                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 */; };
-               657BD74D09AFDC54005A2056 /* StreamingTextDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657BD74909AFDC54005A2056 /* StreamingTextDecoder.cpp */; };
-               657BD74E09AFDC54005A2056 /* StreamingTextDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 657BD74A09AFDC54005A2056 /* StreamingTextDecoder.h */; };
+               657BD74D09AFDC54005A2056 /* TextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657BD74909AFDC54005A2056 /* TextCodec.cpp */; };
+               657BD74E09AFDC54005A2056 /* TextCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 657BD74A09AFDC54005A2056 /* TextCodec.h */; };
                657BD74F09AFDC54005A2056 /* TextEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657BD74B09AFDC54005A2056 /* TextEncoding.cpp */; };
                657BD75009AFDC54005A2056 /* TextEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 657BD74C09AFDC54005A2056 /* TextEncoding.h */; };
                6582A13F09999CD600BEEB6D /* DeprecatedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */; };
                93F198E608245E59001E9ABC /* HTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D23F02DE4396018635CA /* HTMLElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F198EF08245E59001E9ABC /* HTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25102DE4396018635CA /* HTMLParser.h */; };
                93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25302DE4396018635CA /* HTMLTokenizer.h */; };
-               93F198F608245E59001E9ABC /* Decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* Decoder.h */; };
+               93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* TextResourceDecoder.h */; };
                93F1991808245E59001E9ABC /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30402DE4476018635CA /* Range.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* XMLTokenizer.h */; };
                93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* DeprecatedCString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23E02DE4396018635CA /* HTMLElement.cpp */; };
                93F19A9B08245E59001E9ABC /* HTMLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25002DE4396018635CA /* HTMLParser.cpp */; };
                93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25202DE4396018635CA /* HTMLTokenizer.cpp */; };
-               93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* Decoder.cpp */; };
+               93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */; };
                93F19AB908245E59001E9ABC /* Range.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30302DE4476018635CA /* Range.cpp */; };
                93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* XMLTokenizer.cpp */; };
                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */; };
                DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = DB23C2CA0A508D29002489EB /* IndentOutdentCommand.h */; };
                DD763BB20992C2C900740B8E /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DD763BB10992C2C900740B8E /* libxml2.dylib */; };
                DD7CDF250A23CF9800069928 /* CSSUnknownRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CCE0A1989CA007FB8C5 /* CSSUnknownRule.h */; };
-               E14842DE0A674934007E4D39 /* StreamingTextDecoderICU.h in Headers */ = {isa = PBXBuildFile; fileRef = E14842DD0A674934007E4D39 /* StreamingTextDecoderICU.h */; };
-               E14842FF0A674A31007E4D39 /* StreamingTextDecoderICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14842FE0A674A31007E4D39 /* StreamingTextDecoderICU.cpp */; };
-               E148432F0A674FC2007E4D39 /* StreamingTextDecoderMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E148432E0A674FC2007E4D39 /* StreamingTextDecoderMac.h */; };
-               E14843D60A6754A6007E4D39 /* StreamingTextDecoderMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14843910A6752BF007E4D39 /* StreamingTextDecoderMac.cpp */; };
+               E14842DE0A674934007E4D39 /* TextCodecICU.h in Headers */ = {isa = PBXBuildFile; fileRef = E14842DD0A674934007E4D39 /* TextCodecICU.h */; };
+               E14842FF0A674A31007E4D39 /* TextCodecICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */; };
+               E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E148432E0A674FC2007E4D39 /* TextCodecMac.h */; };
+               E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14843910A6752BF007E4D39 /* TextCodecMac.cpp */; };
                E1EBBBD40AAC9B87001FE8E2 /* CSSCharsetRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EBBBD30AAC9B87001FE8E2 /* CSSCharsetRule.cpp */; };
                E1F0424609839389006694EA /* xmlhttprequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F0424409839389006694EA /* xmlhttprequest.cpp */; };
                E1F0424709839389006694EA /* xmlhttprequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E1F0424509839389006694EA /* xmlhttprequest.h */; };
                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.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebDataProtocol.mm; sourceTree = "<group>"; };
-               656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
+               656D371E0ADBA5DE00A4554D /* DocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DocumentLoader.h; sourceTree = "<group>"; };
                656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = DocumentLoaderMac.mm; sourceTree = "<group>"; };
-               656D37200ADBA5DE00A4554D /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
-               656D37210ADBA5DE00A4554D /* WebFormDataStream.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebFormDataStream.m; sourceTree = "<group>"; };
+               656D37200ADBA5DE00A4554D /* FormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FormDataStream.h; sourceTree = "<group>"; };
+               656D37210ADBA5DE00A4554D /* FormDataStream.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FormDataStream.m; sourceTree = "<group>"; };
                656D37220ADBA5DE00A4554D /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
                656D37230ADBA5DE00A4554D /* FormState.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FormState.cpp; sourceTree = "<group>"; };
                656D37240ADBA5DE00A4554D /* FrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameLoader.h; sourceTree = "<group>"; };
                656D37250ADBA5DE00A4554D /* FrameLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FrameLoaderMac.mm; sourceTree = "<group>"; };
                656D37260ADBA5DE00A4554D /* FrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameLoaderClient.h; sourceTree = "<group>"; };
-               656D37270ADBA5DE00A4554D /* WebLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebLoader.h; sourceTree = "<group>"; };
+               656D37270ADBA5DE00A4554D /* ResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceLoader.h; sourceTree = "<group>"; };
                656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
-               656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
+               656D37290ADBA5DE00A4554D /* MainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MainResourceLoader.h; sourceTree = "<group>"; };
                656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = MainResourceLoaderMac.mm; sourceTree = "<group>"; };
-               656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
+               656D372B0ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
                656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = NetscapePlugInStreamLoaderMac.mm; sourceTree = "<group>"; };
                656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
-               656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
+               656D37300ADBA5DE00A4554D /* SubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SubresourceLoader.h; sourceTree = "<group>"; };
                656D37310ADBA5DE00A4554D /* SubresourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = SubresourceLoaderMac.mm; 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>"; };
-               657BD74909AFDC54005A2056 /* StreamingTextDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = StreamingTextDecoder.cpp; sourceTree = "<group>"; };
-               657BD74A09AFDC54005A2056 /* StreamingTextDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StreamingTextDecoder.h; sourceTree = "<group>"; };
+               657BD74909AFDC54005A2056 /* TextCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TextCodec.cpp; sourceTree = "<group>"; };
+               657BD74A09AFDC54005A2056 /* TextCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodec.h; sourceTree = "<group>"; };
                657BD74B09AFDC54005A2056 /* TextEncoding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncoding.cpp; sourceTree = "<group>"; };
                657BD74C09AFDC54005A2056 /* TextEncoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncoding.h; sourceTree = "<group>"; };
                6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedString.cpp; sourceTree = "<group>"; };
                DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IndentOutdentCommand.cpp; sourceTree = "<group>"; };
                DB23C2CA0A508D29002489EB /* IndentOutdentCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IndentOutdentCommand.h; sourceTree = "<group>"; };
                DD763BB10992C2C900740B8E /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = "<absolute>"; };
-               E14842DD0A674934007E4D39 /* StreamingTextDecoderICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamingTextDecoderICU.h; sourceTree = "<group>"; };
-               E14842FE0A674A31007E4D39 /* StreamingTextDecoderICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamingTextDecoderICU.cpp; sourceTree = "<group>"; };
-               E148432E0A674FC2007E4D39 /* StreamingTextDecoderMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = StreamingTextDecoderMac.h; path = mac/StreamingTextDecoderMac.h; sourceTree = "<group>"; };
-               E14843910A6752BF007E4D39 /* StreamingTextDecoderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = StreamingTextDecoderMac.cpp; path = mac/StreamingTextDecoderMac.cpp; sourceTree = "<group>"; };
+               E14842DD0A674934007E4D39 /* TextCodecICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecICU.h; sourceTree = "<group>"; };
+               E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecICU.cpp; sourceTree = "<group>"; };
+               E148432E0A674FC2007E4D39 /* TextCodecMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = TextCodecMac.h; path = mac/TextCodecMac.h; sourceTree = "<group>"; };
+               E14843910A6752BF007E4D39 /* TextCodecMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = TextCodecMac.cpp; path = mac/TextCodecMac.cpp; sourceTree = "<group>"; };
                E1EBBBD30AAC9B87001FE8E2 /* CSSCharsetRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCharsetRule.cpp; sourceTree = "<group>"; };
                E1F0424409839389006694EA /* xmlhttprequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmlhttprequest.cpp; sourceTree = "<group>"; };
                E1F0424509839389006694EA /* xmlhttprequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlhttprequest.h; sourceTree = "<group>"; };
                F523D25102DE4396018635CA /* HTMLParser.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLParser.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D25202DE4396018635CA /* HTMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLTokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D25302DE4396018635CA /* HTMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D27802DE43D7018635CA /* Decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decoder.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D27902DE43D7018635CA /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextResourceDecoder.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D27902DE43D7018635CA /* TextResourceDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextResourceDecoder.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30302DE4476018635CA /* Range.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Range.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30902DE4476018635CA /* XMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */,
                                656D371D0ADBA5DE00A4554D /* WebDataProtocol.mm */,
                                656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */,
-                               656D37200ADBA5DE00A4554D /* WebFormDataStream.h */,
-                               656D37210ADBA5DE00A4554D /* WebFormDataStream.m */,
+                               656D37200ADBA5DE00A4554D /* FormDataStream.h */,
+                               656D37210ADBA5DE00A4554D /* FormDataStream.m */,
                                656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */,
                                656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */,
                                656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */,
                                BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
                                BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
                                F587864902DE3A9A01EA4122 /* CachePolicy.h */,
-                               F523D27802DE43D7018635CA /* Decoder.cpp */,
-                               F523D27902DE43D7018635CA /* Decoder.h */,
+                               F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */,
+                               F523D27902DE43D7018635CA /* TextResourceDecoder.h */,
                                BCB16C100979C3BD00467741 /* DocLoader.cpp */,
                                BCB16C110979C3BD00467741 /* DocLoader.h */,
                                93ABCE5D06E1A42E0085925B /* FormData.cpp */,
                                BCB16C160979C3BD00467741 /* Request.h */,
                                1A6937FF0A11100A00C127FE /* TextDocument.cpp */,
                                1A6938000A11100A00C127FE /* TextDocument.h */,
-                               656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */,
+                               656D371E0ADBA5DE00A4554D /* DocumentLoader.h */,
                                656D37220ADBA5DE00A4554D /* WebFormState.h */,
-                               656D37270ADBA5DE00A4554D /* WebLoader.h */,
-                               656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */,
-                               656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */,
-                               656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */,
+                               656D37270ADBA5DE00A4554D /* ResourceLoader.h */,
+                               656D37290ADBA5DE00A4554D /* MainResourceLoader.h */,
+                               656D372B0ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h */,
+                               656D37300ADBA5DE00A4554D /* SubresourceLoader.h */,
                        );
                        path = loader;
                        sourceTree = "<group>";
                                4B3043C60AE0370300A82647 /* Sound.h */,
                                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
                                9352071709BD3BA500F2038D /* StaticConstructors.h */,
-                               657BD74909AFDC54005A2056 /* StreamingTextDecoder.cpp */,
-                               657BD74A09AFDC54005A2056 /* StreamingTextDecoder.h */,
-                               E14842FE0A674A31007E4D39 /* StreamingTextDecoderICU.cpp */,
-                               E14842DD0A674934007E4D39 /* StreamingTextDecoderICU.h */,
-                               E14843910A6752BF007E4D39 /* StreamingTextDecoderMac.cpp */,
-                               E148432E0A674FC2007E4D39 /* StreamingTextDecoderMac.h */,
+                               657BD74909AFDC54005A2056 /* TextCodec.cpp */,
+                               657BD74A09AFDC54005A2056 /* TextCodec.h */,
+                               E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */,
+                               E14842DD0A674934007E4D39 /* TextCodecICU.h */,
+                               E14843910A6752BF007E4D39 /* TextCodecMac.cpp */,
+                               E148432E0A674FC2007E4D39 /* TextCodecMac.h */,
                                93CD4FDA0995F9EA007ECC97 /* String.cpp */,
                                93126F6009D7A736008D9626 /* StringHash.h */,
                                93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */,
                                93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */,
                                93F198EF08245E59001E9ABC /* HTMLParser.h in Headers */,
                                93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */,
-                               93F198F608245E59001E9ABC /* Decoder.h in Headers */,
+                               93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
                                93F1991808245E59001E9ABC /* Range.h in Headers */,
                                93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */,
                                93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */,
                                9353673F09AED79200D35CD6 /* ScrollBarMode.h in Headers */,
                                935367E509AF77DD00D35CD6 /* GraphicsContext.h in Headers */,
                                9353686B09AF78F600D35CD6 /* TextDirection.h in Headers */,
-                               657BD74E09AFDC54005A2056 /* StreamingTextDecoder.h in Headers */,
+                               657BD74E09AFDC54005A2056 /* TextCodec.h in Headers */,
                                657BD75009AFDC54005A2056 /* TextEncoding.h in Headers */,
                                BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */,
                                93B780CA09B3B7FE00690162 /* WidgetClient.h in Headers */,
                                1A0D57410A5C7867007EDD4C /* JSOverflowEvent.h in Headers */,
                                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */,
                                85217E030A5ECD4700DB8D00 /* XSLImportRule.h in Headers */,
-                               E14842DE0A674934007E4D39 /* StreamingTextDecoderICU.h in Headers */,
-                               E148432F0A674FC2007E4D39 /* StreamingTextDecoderMac.h in Headers */,
+                               E14842DE0A674934007E4D39 /* TextCodecICU.h in Headers */,
+                               E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */,
                                1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */,
                                1CAF34830A6C405200ABE06E /* WebScriptObjectPrivate.h in Headers */,
                                85EC9AFA0A71A2C600EEEAED /* FontData.h in Headers */,
                                85B499780ADB425E00925CBB /* DOMSVGPathElementInternal.h in Headers */,
                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
                                656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */,
-                               656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */,
-                               656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */,
+                               656D37360ADBA5DE00A4554D /* DocumentLoader.h in Headers */,
+                               656D37380ADBA5DE00A4554D /* FormDataStream.h in Headers */,
                                656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */,
                                656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */,
                                656D373E0ADBA5DE00A4554D /* FrameLoaderClient.h in Headers */,
-                               656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */,
-                               656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */,
-                               656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */,
+                               656D373F0ADBA5DE00A4554D /* ResourceLoader.h in Headers */,
+                               656D37410ADBA5DE00A4554D /* MainResourceLoader.h in Headers */,
+                               656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */,
                                656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */,
-                               656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */,
+                               656D37480ADBA5DE00A4554D /* SubresourceLoader.h in Headers */,
                                93B77A380ADD792500EA4B81 /* FrameLoaderTypes.h in Headers */,
                                65BAAABE0ADCA015005BB5A4 /* RetainPtr.h in Headers */,
                                93B77B1D0ADDA10700EA4B81 /* UChar.h in Headers */,
                                93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */,
                                93F19A9B08245E59001E9ABC /* HTMLParser.cpp in Sources */,
                                93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */,
-                               93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */,
+                               93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
                                93F19AB908245E59001E9ABC /* Range.cpp in Sources */,
                                93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */,
                                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */,
                                BC6D6DD209AF906600F59759 /* Font.cpp in Sources */,
                                9353676B09AED88B00D35CD6 /* ScrollViewMac.mm in Sources */,
                                935367E909AF77EF00D35CD6 /* GraphicsContextMac.mm in Sources */,
-                               657BD74D09AFDC54005A2056 /* StreamingTextDecoder.cpp in Sources */,
+                               657BD74D09AFDC54005A2056 /* TextCodec.cpp in Sources */,
                                657BD74F09AFDC54005A2056 /* TextEncoding.cpp in Sources */,
                                A82398A809B3ACF500B60641 /* PlugInInfoStoreMac.mm in Sources */,
                                A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */,
                                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */,
                                85217E020A5ECD4700DB8D00 /* XSLImportRule.cpp in Sources */,
                                93CF35AA0A6169F700543E52 /* AffineTransformCG.cpp in Sources */,
-                               E14842FF0A674A31007E4D39 /* StreamingTextDecoderICU.cpp in Sources */,
-                               E14843D60A6754A6007E4D39 /* StreamingTextDecoderMac.cpp in Sources */,
+                               E14842FF0A674A31007E4D39 /* TextCodecICU.cpp in Sources */,
+                               E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */,
                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
                                BCAA90C30A7EBA60008B1229 /* ScrollBar.cpp in Sources */,
                                93B0FD8A0A759BED0080AD44 /* StringImplMac.mm in Sources */,
                                656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */,
                                656D37350ADBA5DE00A4554D /* WebDataProtocol.mm in Sources */,
                                656D37370ADBA5DE00A4554D /* DocumentLoaderMac.mm in Sources */,
-                               656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */,
+                               656D37390ADBA5DE00A4554D /* FormDataStream.m in Sources */,
                                656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */,
                                656D373D0ADBA5DE00A4554D /* FrameLoaderMac.mm in Sources */,
                                656D37400ADBA5DE00A4554D /* ResourceLoaderMac.mm in Sources */,
index 8e3332a..454e110 100644 (file)
                loader/CachedResourceClientWalker.cpp
                loader/CachedScript.cpp
                loader/CachedXSLStyleSheet.cpp
-               loader/Decoder.cpp
+               loader/TextResourceDecoder.cpp
                loader/DocLoader.cpp
                loader/FormData.cpp
                loader/ImageDocument.cpp
                platform/Pen.cpp
                platform/RegularExpression.cpp
                platform/SegmentedString.cpp
-               platform/StreamingTextDecoder.cpp
-               platform/StreamingTextDecoderICU.cpp
+               platform/TextCodec.cpp
+               platform/TextCodecICU.cpp
                platform/String.cpp
                platform/StringImpl.cpp
                platform/TextCodecLatin1.cpp
index b80f469..84e8255 100644 (file)
@@ -191,9 +191,9 @@ ExecState *ScriptInterpreter::globalExec()
 
 void ScriptInterpreter::updateDOMNodeDocument(Node *node, Document *oldDoc, Document *newDoc)
 {
-  DOMNode *cachedObject = getDOMNodeForDocument(oldDoc, node);
-  if (cachedObject) {
-    putDOMNodeForDocument(newDoc, node, cachedObject);
+  DOMNode *cachedResource = getDOMNodeForDocument(oldDoc, node);
+  if (cachedResource) {
+    putDOMNodeForDocument(newDoc, node, cachedResource);
     forgetDOMNodeForDocument(oldDoc, node);
   }
 }
index db08858..daad9e9 100644 (file)
@@ -75,7 +75,7 @@ void JSAbstractEventListener::handleEvent(Event* ele, bool isWindowEvent)
     Frame *frame = window->frame();
     if (!frame)
         return;
-    KJSProxy* proxy = frame->jScript();
+    KJSProxy* proxy = frame->scriptProxy();
     if (!proxy)
         return;
 
@@ -270,7 +270,7 @@ void JSLazyEventListener::parseCode() const
     Frame *frame = windowObj()->frame();
     KJSProxy *proxy = 0;
     if (frame)
-        proxy = frame->jScript();
+        proxy = frame->scriptProxy();
 
     if (proxy) {
         ScriptInterpreter* interpreter = proxy->interpreter();
index 323adb2..9999be4 100644 (file)
@@ -815,7 +815,7 @@ bool JSHTMLElement::implementsCall() const
     HTMLElement* element = static_cast<HTMLElement*>(impl());
     if (element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag)) {
         Document* doc = element->document();
-        KJSProxy *proxy = doc->frame()->jScript();
+        KJSProxy *proxy = doc->frame()->scriptProxy();
         ExecState* exec = proxy->interpreter()->globalExec();
         if (JSValue *runtimeObject = getRuntimeObject(exec, element))
             return static_cast<JSObject*>(runtimeObject)->implementsCall();
index 2443022..5d86646 100644 (file)
@@ -110,7 +110,7 @@ short JSNodeFilterCondition::acceptNode(WebCore::Node* filterNode) const
 {
     WebCore::Node *node = filterNode;
     Frame *frame = node->document()->frame();
-    KJSProxy *proxy = frame->jScript();
+    KJSProxy *proxy = frame->scriptProxy();
     if (proxy && filter->implementsCall()) {
         JSLock lock;
         ExecState *exec = proxy->interpreter()->globalExec();
index eee7e22..a55e166 100644 (file)
@@ -369,14 +369,14 @@ DOMWindow* Window::impl() const
 
 ScriptInterpreter *Window::interpreter() const
 {
-    return m_frame->jScript()->interpreter();
+    return m_frame->scriptProxy()->interpreter();
 }
 
 Window *Window::retrieveWindow(Frame *f)
 {
     JSObject *o = retrieve(f)->getObject();
 
-    ASSERT(o || !f->jScriptEnabled());
+    ASSERT(o || !f->javaScriptEnabled());
     return static_cast<Window *>(o);
 }
 
@@ -390,7 +390,7 @@ Window *Window::retrieveActive(ExecState *exec)
 JSValue *Window::retrieve(Frame *p)
 {
     ASSERT(p);
-    if (KJSProxy *proxy = p->jScript())
+    if (KJSProxy *proxy = p->scriptProxy())
         return proxy->interpreter()->globalObject(); // the Global object is the "window"
   
     return jsUndefined(); // This can happen with JS disabled on the domain of that window
@@ -1817,10 +1817,10 @@ void Window::updateLayout() const
 
 void ScheduledAction::execute(Window *window)
 {
-    if (!window->m_frame || !window->m_frame->jScript())
+    if (!window->m_frame || !window->m_frame->scriptProxy())
         return;
 
-    ScriptInterpreter *interpreter = window->m_frame->jScript()->interpreter();
+    ScriptInterpreter *interpreter = window->m_frame->scriptProxy()->interpreter();
 
     interpreter->setProcessingTimerCallback(true);
   
index b9c6d9c..eecf3d3 100644 (file)
@@ -155,7 +155,7 @@ void raiseDOMException(ExceptionCode ec)
 
     // Dig up Interpreter and ExecState.
     WebCore::Frame *frame = nodeImpl->document()->frame();
-    KJS::Interpreter *interpreter = frame->jScript()->interpreter();
+    KJS::Interpreter *interpreter = frame->scriptProxy()->interpreter();
     KJS::ExecState *exec = interpreter->globalExec();
     
     // Get (or create) a cached JS object for the DOM node.
index 558e863..06ff90f 100644 (file)
@@ -37,7 +37,7 @@
 #import "Cursor.h"
 #import "DOMInternal.h"
 #import "DOMWindow.h"
-#import "Decoder.h"
+#import "TextResourceDecoder.h"
 #import "Event.h"
 #import "EventNames.h"
 #import "FloatRect.h"
@@ -79,7 +79,7 @@
 #import "WebCoreSystemInterface.h"
 #import "WebCoreViewFactory.h"
 #import "WebDashboardRegion.h"
-#import "WebDocumentLoader.h"
+#import "DocumentLoader.h"
 #import "WebScriptObjectPrivate.h"
 #import "csshelper.h"
 #import "htmlediting.h"
@@ -936,7 +936,7 @@ bool FrameMac::tabsToAllControls() const
 
 KJS::Bindings::RootObject *FrameMac::executionContextForDOM()
 {
-    if (!jScriptEnabled())
+    if (!javaScriptEnabled())
         return 0;
 
     return bindingRootObject();
@@ -944,13 +944,13 @@ KJS::Bindings::RootObject *FrameMac::executionContextForDOM()
 
 KJS::Bindings::RootObject *FrameMac::bindingRootObject()
 {
-    assert(jScriptEnabled());
+    assert(javaScriptEnabled());
     if (!_bindingRoot) {
         JSLock lock;
         _bindingRoot = new KJS::Bindings::RootObject(0);    // The root gets deleted by JavaScriptCore.
         KJS::JSObject *win = KJS::Window::retrieveWindow(this);
         _bindingRoot->setRootObjectImp (win);
-        _bindingRoot->setInterpreter(jScript()->interpreter());
+        _bindingRoot->setInterpreter(scriptProxy()->interpreter());
         addPluginRootObject (_bindingRoot);
     }
     return _bindingRoot;
@@ -958,7 +958,7 @@ KJS::Bindings::RootObject *FrameMac::bindingRootObject()
 
 WebScriptObject *FrameMac::windowScriptObject()
 {
-    if (!jScriptEnabled())
+    if (!javaScriptEnabled())
         return 0;
 
     if (!_windowScriptObject) {
@@ -973,7 +973,7 @@ WebScriptObject *FrameMac::windowScriptObject()
 NPObject *FrameMac::windowScriptNPObject()
 {
     if (!_windowScriptNPObject) {
-        if (jScriptEnabled()) {
+        if (javaScriptEnabled()) {
             // JavaScript is enabled, so there is a JavaScript window object.  Return an NPObject bound to the window
             // object.
             KJS::JSObject *win = KJS::Window::retrieveWindow(this);
@@ -1026,7 +1026,7 @@ Widget* FrameMac::createJavaAppletWidget(const IntSize& size, Element* element,
 
 void FrameMac::partClearedInBegin()
 {
-    if (jScriptEnabled())
+    if (javaScriptEnabled())
         [_bridge windowObjectCleared];
 }
 
index 420550e..037e40e 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebCoreEncodings.h"
 
-#import "Decoder.h"
+#import "TextResourceDecoder.h"
 #import "HTMLNames.h"
 
 using namespace WebCore;
@@ -36,7 +36,7 @@ using namespace WebCore;
 + (NSString *)decodeData:(NSData *)data
 {
     HTMLNames::init(); // this method is used for importing bookmarks at startup, so HTMLNames are likely to be uninitialized yet
-    RefPtr<Decoder> decoder = new Decoder("text/html"); // bookmark files are HTML
+    RefPtr<TextResourceDecoder> decoder = new TextResourceDecoder("text/html"); // bookmark files are HTML
     String result = decoder->decode(static_cast<const char*>([data bytes]), [data length]);
     result += decoder->flush();
     return result;
index 01228d2..bca70a8 100644 (file)
@@ -33,7 +33,7 @@
 #import "ClipboardMac.h"
 #import "DOMImplementation.h"
 #import "DOMInternal.h"
-#import "Decoder.h"
+#import "TextResourceDecoder.h"
 #import "DeleteSelectionCommand.h"
 #import "DocLoader.h"
 #import "DocumentFragment.h"
@@ -79,9 +79,9 @@
 #import "WebCoreSystemInterface.h"
 #import "WebCoreViewFactory.h"
 #import "WebCoreWidgetHolder.h"
-#import "WebDocumentLoader.h"
-#import "WebFormDataStream.h"
-#import "WebSubresourceLoader.h"
+#import "DocumentLoader.h"
+#import "FormDataStream.h"
+#import "SubresourceLoader.h"
 #import "XMLTokenizer.h"
 #import "csshelper.h"
 #import "htmlediting.h"
@@ -1049,7 +1049,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     if (!result) // FIXME: pass errors
         return 0;
     JSLock lock;
-    return aeDescFromJSValue(m_frame->jScript()->interpreter()->globalExec(), result);
+    return aeDescFromJSValue(m_frame->scriptProxy()->interpreter()->globalExec(), result);
 }
 
 - (NSAttributedString *)selectedAttributedString
@@ -1112,7 +1112,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document* doc = m_frame->document();
     if (!doc)
         return nil;
-    Decoder* decoder = doc->decoder();
+    TextResourceDecoder* decoder = doc->decoder();
     if (!decoder)
         return nil;
     return decoder->encoding().decode(reinterpret_cast<const char*>([data bytes]), [data length]);
@@ -2074,7 +2074,7 @@ static NSCharacterSet *_getPostSmartSet(void)
     FrameMac *frame = [self _frame];
     RootObject *root = new RootObject(aView);    // The root gets deleted by JavaScriptCore.
     root->setRootObjectImp(Window::retrieveWindow(frame));
-    root->setInterpreter(frame->jScript()->interpreter());
+    root->setInterpreter(frame->scriptProxy()->interpreter());
     frame->addPluginRootObject(root);
     return root;
 }
index ced6e3d..8c6880b 100644 (file)
@@ -28,7 +28,7 @@
 #include "FrameWin.h"
 
 #include "BrowserExtensionWin.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "Document.h"
 #include "FrameLoadRequest.h"
 #include "FramePrivate.h"
index 3bcc3ad..16dab2f 100644 (file)
@@ -31,7 +31,7 @@
 #include "CSSValueKeywords.h"
 #include "Comment.h"
 #include "DOMImplementation.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "DocLoader.h"
 #include "DocumentFragment.h"
 #include "DocumentType.h"
@@ -653,7 +653,7 @@ String Document::readyState() const
 
 String Document::inputEncoding() const
 {
-    if (Decoder* d = decoder())
+    if (TextResourceDecoder* d = decoder())
         return d->encoding().name();
     return String();
 }
@@ -669,7 +669,7 @@ void Document::setCharset(const String& charset)
 {
     if (!decoder())
         return;
-    decoder()->setEncoding(charset, Decoder::UserChosenEncoding);
+    decoder()->setEncoding(charset, TextResourceDecoder::UserChosenEncoding);
 }
 
 Element* Document::elementFromPoint(int x, int y) const
@@ -2308,7 +2308,7 @@ bool Document::hasWindowEventListener(const AtomicString &eventType)
 PassRefPtr<EventListener> Document::createHTMLEventListener(const String& functionName, const String& code, Node *node)
 {
     if (Frame* frm = frame())
-        if (KJSProxy* proxy = frm->jScript())
+        if (KJSProxy* proxy = frm->scriptProxy())
             return proxy->createHTMLEventHandler(functionName, code, node);
     return 0;
 }
@@ -2508,7 +2508,7 @@ HTMLMapElement *Document::getImageMap(const String& URL) const
     return m_imageMapsByName.get(name.impl());
 }
 
-void Document::setDecoder(Decoder *decoder)
+void Document::setDecoder(TextResourceDecoder *decoder)
 {
     m_decoder = decoder;
 }
index e67f6b7..d8ff254 100644 (file)
@@ -48,7 +48,7 @@ namespace WebCore {
     class Comment;
     class DOMImplementation;
     class DOMWindow;
-    class Decoder;
+    class TextResourceDecoder;
     class DocLoader;
     class DocumentFragment;
     class DocumentType;
@@ -729,8 +729,8 @@ public:
     void setShouldCreateRenderers(bool);
     bool shouldCreateRenderers();
     
-    void setDecoder(Decoder*);
-    Decoder* decoder() const { return m_decoder.get(); }
+    void setDecoder(TextResourceDecoder*);
+    TextResourceDecoder* decoder() const { return m_decoder.get(); }
 
     UChar backslashAsCurrencySymbol() const;
 
@@ -775,7 +775,7 @@ private:
     int m_passwordFields;
     int m_secureForms;
     
-    RefPtr<Decoder> m_decoder;
+    RefPtr<TextResourceDecoder> m_decoder;
 
     mutable HashMap<AtomicStringImpl*, Element*> m_elementsById;
     mutable HashCountedSet<AtomicStringImpl*> m_duplicateIds;
index d1cf795..ae94e39 100644 (file)
@@ -271,8 +271,8 @@ bool EventTargetNode::dispatchGenericEvent(PassRefPtr<Event> e, ExceptionCode&,
     // have a reference to it in a variable.  So there is no need for
     // the interpreter to keep the event in it's cache
     Frame *frame = document()->frame();
-    if (tempEvent && frame && frame->jScript())
-        frame->jScript()->finishedWithEvent(evt.get());
+    if (tempEvent && frame && frame->scriptProxy())
+        frame->scriptProxy()->finishedWithEvent(evt.get());
     
     return !evt->defaultPrevented(); // ### what if defaultPrevented was called before dispatchEvent?
 }
index e21ef5b..5023ba0 100644 (file)
@@ -739,7 +739,7 @@ bool HTMLParser::noframesCreateErrorCheck(Token* t, RefPtr<Node>& result)
 
 bool HTMLParser::noscriptCreateErrorCheck(Token* t, RefPtr<Node>& result)
 {
-    if (!m_fragment && document->frame() && document->frame()->jScriptEnabled())
+    if (!m_fragment && document->frame() && document->frame()->javaScriptEnabled())
         setSkipMode(noscriptTag);
     return true;
 }
@@ -753,7 +753,7 @@ bool HTMLParser::mapCreateErrorCheck(Token* t, RefPtr<Node>& result)
 
 bool HTMLParser::canvasCreateErrorCheck(Token* t, RefPtr<Node>& result)
 {
-    if (!m_fragment && document->frame() && document->frame()->jScriptEnabled())
+    if (!m_fragment && document->frame() && document->frame()->javaScriptEnabled())
         setSkipMode(canvasTag);
     return true;
 }
@@ -896,7 +896,7 @@ bool HTMLParser::isInline(Node* node) const
             e->hasLocalName(abbrTag) || e->hasLocalName(acronymTag) || e->hasLocalName(subTag) ||
             e->hasLocalName(supTag) || e->hasLocalName(spanTag) || e->hasLocalName(nobrTag) ||
             e->hasLocalName(wbrTag) || e->hasLocalName(noframesTag) || e->hasLocalName(nolayerTag) ||
-            e->hasLocalName(noembedTag) || (e->hasLocalName(noscriptTag) && !m_fragment && document->frame() && document->frame()->jScriptEnabled()))
+            e->hasLocalName(noembedTag) || (e->hasLocalName(noscriptTag) && !m_fragment && document->frame() && document->frame()->javaScriptEnabled()))
             return true;
     }
     
index 8b832d2..dfbae0b 100644 (file)
@@ -166,12 +166,12 @@ NPObject* HTMLPlugInElement::createNPObject()
 
     // Can't create NPObjects when JavaScript is disabled
     Frame* frame = document()->frame();
-    if (!frame->jScriptEnabled())
+    if (!frame->javaScriptEnabled())
         return _NPN_CreateNoScriptObject();
     
     // Create a JSObject bound to this element
     JSLock lock;
-    ExecState *exec = frame->jScript()->interpreter()->globalExec();
+    ExecState *exec = frame->scriptProxy()->interpreter()->globalExec();
     JSValue* jsElementValue = toJS(exec, this);
     if (!jsElementValue || !jsElementValue->isObject())
         return _NPN_CreateNoScriptObject();
index 662a845..751eb51 100644 (file)
@@ -163,7 +163,7 @@ void HTMLScriptElement::evaluateScript(const String& URL, const String& script)
     
     Frame* frame = document()->frame();
     if (frame) {
-        KJSProxy* proxy = frame->jScript();
+        KJSProxy* proxy = frame->scriptProxy();
         if (proxy) {
             m_evaluated = true;
             proxy->evaluate(URL, 0, script, 0);
index e2998ab..fb7de99 100644 (file)
@@ -1150,7 +1150,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 scriptSrcCharset = String();
                 if ( currToken.attrs && /* potentially have a ATTR_SRC ? */
                      m_doc->frame() &&
-                     m_doc->frame()->jScriptEnabled() && /* jscript allowed at all? */
+                     m_doc->frame()->javaScriptEnabled() && /* jscript allowed at all? */
                      !m_fragment /* are we a regular tokenizer or just for innerHTML ? */
                     ) {
                     if ((a = currToken.attrs->getAttributeItem(srcAttr)))
@@ -1589,7 +1589,7 @@ void HTMLTokenizer::finish()
 
 PassRefPtr<Node> HTMLTokenizer::processToken()
 {
-    KJSProxy* jsProxy = (!m_fragment && m_doc->frame()) ? m_doc->frame()->jScript() : 0;
+    KJSProxy* jsProxy = (!m_fragment && m_doc->frame()) ? m_doc->frame()->scriptProxy() : 0;
     if (jsProxy)
         jsProxy->setEventHandlerLineno(tagStartLineno);
     if (dest > buffer) {
index 0a384c1..f3f0b6f 100644 (file)
@@ -45,7 +45,7 @@ SVGDocumentExtensions::~SVGDocumentExtensions()
 PassRefPtr<EventListener> SVGDocumentExtensions::createSVGEventListener(const String& functionName, const String& code, Node *node)
 {
     if (Frame* frame = m_doc->frame())
-        if (KJSProxy* proxy = frame->jScript())
+        if (KJSProxy* proxy = frame->scriptProxy())
             return proxy->createSVGEventHandler(functionName, code, node);
     return 0;
 }
index ca2d1e3..d2472d5 100644 (file)
@@ -32,7 +32,7 @@
 #include "Cache.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "DeprecatedString.h"
 #include "LoaderFunctions.h"
 #include "loader.h"
@@ -42,7 +42,7 @@ namespace WebCore {
 
 CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String& url, CachePolicy cachePolicy, time_t _expireDate, const String& charset)
     : CachedResource(url, CSSStyleSheet, cachePolicy, _expireDate)
-    , m_decoder(new Decoder("text/css", charset))
+    , m_decoder(new TextResourceDecoder("text/css", charset))
 {
     // It's css we want.
     setAccept("text/css");
@@ -65,7 +65,7 @@ void CachedCSSStyleSheet::ref(CachedResourceClient *c)
 
 void CachedCSSStyleSheet::setEncoding(const String& chs)
 {
-    m_decoder->setEncoding(chs, Decoder::EncodingFromHTTPHeader);
+    m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader);
 }
 
 void CachedCSSStyleSheet::data(Vector<char>& data, bool allDataReceived)
index f15bb59..d53f1d9 100644 (file)
@@ -35,7 +35,7 @@
 namespace WebCore {
 
     class DocLoader;
-    class Decoder;
+    class TextResourceDecoder;
 
     class CachedCSSStyleSheet : public CachedResource {
     public:
@@ -56,7 +56,7 @@ namespace WebCore {
 
     protected:
         String m_sheet;
-        RefPtr<Decoder> m_decoder;
+        RefPtr<TextResourceDecoder> m_decoder;
     };
 
 }
index a98939b..6912b8f 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "Cache.h"
 #include "CachedResourceClientWalker.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "loader.h"
 #include <wtf/Vector.h>
 
@@ -49,7 +49,7 @@ CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const String &url, CachePoli
     // Load the file
     Cache::loader()->load(dl, this, false);
     m_loading = true;
-    m_decoder = new Decoder("application/xml");
+    m_decoder = new TextResourceDecoder("application/xml");
 }
 
 CachedXBLDocument::~CachedXBLDocument()
@@ -67,7 +67,7 @@ void CachedXBLDocument::ref(CachedResourceClient *c)
 
 void CachedXBLDocument::setEncoding(const String& chs)
 {
-    m_decoder->setEncoding(chs, Decoder::EncodingFromHTTPHeader);
+    m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader);
 }
 
 void CachedXBLDocument::data(Vector<char>& data, bool )
index 6c5ac5d..255608b 100644 (file)
@@ -35,7 +35,7 @@ namespace WebCore {
     class CachedResource;
     class Request;
     class DocLoader;
-    class Decoder;
+    class TextResourceDecoder;
     class CachedResourceClient;
     
 #ifdef XBL_SUPPORT
@@ -58,7 +58,7 @@ namespace WebCore {
         
     protected:
         XBL::XBLDocument* m_document;
-        RefPtr<Decoder> m_decoder;
+        RefPtr<TextResourceDecoder> m_decoder;
     };
 
 #endif
index e2d81a2..f2fbf00 100644 (file)
@@ -32,7 +32,7 @@
 #include "Cache.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "loader.h"
 #include <wtf/Vector.h>
 
@@ -42,7 +42,7 @@ namespace WebCore {
 
 CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
     : CachedResource(url, XSLStyleSheet, cachePolicy, _expireDate)
-    , m_decoder(new Decoder("text/xsl"))
+    , m_decoder(new TextResourceDecoder("text/xsl"))
 {
     // It's XML we want.
     // FIXME: This should accept more general xml formats */*+xml, image/svg+xml for example.
@@ -63,7 +63,7 @@ void CachedXSLStyleSheet::ref(CachedResourceClient *c)
 
 void CachedXSLStyleSheet::setEncoding(const String& chs)
 {
-    m_decoder->setEncoding(chs, Decoder::EncodingFromHTTPHeader);
+    m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader);
 }
 
 void CachedXSLStyleSheet::data(Vector<char>& data, bool allDataReceived)
index 37253b7..b4bc8d3 100644 (file)
@@ -34,7 +34,7 @@
 namespace WebCore {
 
     class DocLoader;
-    class Decoder;
+    class TextResourceDecoder;
 
 #ifdef XSLT_SUPPORT
     class CachedXSLStyleSheet : public CachedResource {
@@ -55,7 +55,7 @@ namespace WebCore {
         
     protected:
         String m_sheet;
-        RefPtr<Decoder> m_decoder;
+        RefPtr<TextResourceDecoder> m_decoder;
     };
 
 #endif
index eabf685..8d8e2ec 100644 (file)
@@ -32,9 +32,9 @@
 #import "Element.h"
 #import "Frame.h"
 #import "FrameLoaderClient.h"
-#import "WebDocumentLoader.h"
+#import "DocumentLoader.h"
 #import "WebFormState.h"
-#import "WebMainResourceLoader.h"
+#import "MainResourceLoader.h"
 
 namespace WebCore {
 
index d1e5f25..4b1d3fa 100644 (file)
@@ -93,9 +93,9 @@ namespace WebCore {
     class ResourceRequest;
     class String;
     class SubresourceLoader;
-    class WebResourceLoader;
+    class ResourceLoader;
 
-    typedef HashSet<RefPtr<WebResourceLoader> > ResourceLoaderSet;
+    typedef HashSet<RefPtr<ResourceLoader> > ResourceLoaderSet;
 
     bool isBackForwardLoadType(FrameLoadType);
 
@@ -178,15 +178,15 @@ namespace WebCore {
 #endif
         void stopLoading();
         void cancelMainResourceLoad();
-        void cancelPendingArchiveLoad(WebResourceLoader*);
+        void cancelPendingArchiveLoad(ResourceLoader*);
 
-        void addPlugInStreamLoader(WebResourceLoader*);
-        void removePlugInStreamLoader(WebResourceLoader*);
+        void addPlugInStreamLoader(ResourceLoader*);
+        void removePlugInStreamLoader(ResourceLoader*);
         bool isLoadingMainResource() const;
         bool isLoadingSubresources() const;
         bool isLoading() const;
-        void addSubresourceLoader(WebResourceLoader*);
-        void removeSubresourceLoader(WebResourceLoader*);
+        void addSubresourceLoader(ResourceLoader*);
+        void removeSubresourceLoader(ResourceLoader*);
 #if PLATFORM(MAC)
         NSData *mainResourceData() const;
 #endif
@@ -205,13 +205,13 @@ namespace WebCore {
 
 #if PLATFORM(MAC)
         id identifierForInitialRequest(NSURLRequest *);
-        NSURLRequest *willSendRequest(WebResourceLoader*, NSMutableURLRequest *, NSURLResponse *redirectResponse);
-        void didReceiveAuthenticationChallenge(WebResourceLoader*, NSURLAuthenticationChallenge *);
-        void didCancelAuthenticationChallenge(WebResourceLoader*, NSURLAuthenticationChallenge *);
-        void didReceiveResponse(WebResourceLoader*, NSURLResponse *);
-        void didReceiveData(WebResourceLoader*, NSData *, int lengthReceived);
-        void didFinishLoad(WebResourceLoader*);
-        void didFailToLoad(WebResourceLoader*, NSError *);
+        NSURLRequest *willSendRequest(ResourceLoader*, NSMutableURLRequest *, NSURLResponse *redirectResponse);
+        void didReceiveAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *);
+        void didCancelAuthenticationChallenge(ResourceLoader*, NSURLAuthenticationChallenge *);
+        void didReceiveResponse(ResourceLoader*, NSURLResponse *);
+        void didReceiveData(ResourceLoader*, NSData *, int lengthReceived);
+        void didFinishLoad(ResourceLoader*);
+        void didFailToLoad(ResourceLoader*, NSError *);
 #endif
         bool privateBrowsingEnabled() const;
 #if PLATFORM(MAC)
@@ -236,8 +236,8 @@ namespace WebCore {
 #if PLATFORM(MAC)
         NSError *cancelledError(NSURLRequest *) const;
         NSError *fileDoesNotExistError(NSURLResponse *) const;
-        bool willUseArchive(WebResourceLoader*, NSURLRequest *, NSURL *) const;
-        bool isArchiveLoadPending(WebResourceLoader*) const;
+        bool willUseArchive(ResourceLoader*, NSURLRequest *, NSURL *) const;
+        bool isArchiveLoadPending(ResourceLoader*) const;
         void cannotShowMIMEType(NSURLResponse *);
         NSError *interruptionForPolicyChangeError(NSURLRequest *);
 #endif
index ae6186c..0945aa9 100644 (file)
@@ -44,7 +44,7 @@ namespace WebCore {
     class Frame;
     class FrameLoader;
     class String;
-    class WebResourceLoader;
+    class ResourceLoader;
 
     struct LoadErrorResetToken;
 
@@ -174,9 +174,9 @@ namespace WebCore {
         virtual void setDefersLoading(bool) = 0;
 
 #if PLATFORM(MAC)
-        virtual bool willUseArchive(WebResourceLoader*, NSURLRequest *, NSURL *originalURL) const = 0;
-        virtual bool isArchiveLoadPending(WebResourceLoader*) const = 0;
-        virtual void cancelPendingArchiveLoad(WebResourceLoader*) = 0;
+        virtual bool willUseArchive(ResourceLoader*, NSURLRequest *, NSURL *originalURL) const = 0;
+        virtual bool isArchiveLoadPending(ResourceLoader*) const = 0;
+        virtual void cancelPendingArchiveLoad(ResourceLoader*) = 0;
         virtual void clearArchivedResources() = 0;
 
         virtual bool canHandleRequest(NSURLRequest *) const = 0;
similarity index 97%
rename from WebCore/loader/WebMainResourceLoader.h
rename to WebCore/loader/MainResourceLoader.h
index 258ff68..4bdf795 100644 (file)
  */
 
 #import "FrameLoaderTypes.h"
-#import "WebLoader.h"
+#import "ResourceLoader.h"
 #import <wtf/Forward.h>
 
 namespace WebCore {
 
     class FormState;
 
-    class MainResourceLoader : public WebResourceLoader {
+    class MainResourceLoader : public ResourceLoader {
     public:
         static PassRefPtr<MainResourceLoader> create(Frame*);
         virtual ~MainResourceLoader();
similarity index 96%
rename from WebCore/loader/WebNetscapePlugInStreamLoader.h
rename to WebCore/loader/NetscapePlugInStreamLoader.h
index b316558..61d8b5a 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebLoader.h"
+#import "ResourceLoader.h"
 #import "WebPlugInStreamLoaderDelegate.h"
 #import <wtf/Forward.h>
 
 namespace WebCore {
 
-    class NetscapePlugInStreamLoader : public WebResourceLoader {
+    class NetscapePlugInStreamLoader : public ResourceLoader {
     public:
         static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, id <WebPlugInStreamLoaderDelegate>);
         virtual ~NetscapePlugInStreamLoader();
index 4eea32e..e91eece 100644 (file)
@@ -41,7 +41,7 @@ namespace WebCore {
         ~Request();
         
         Vector<char>& buffer() { return m_buffer; }
-        CachedResource* cachedObject() { return m_object; }
+        CachedResource* cachedResource() { return m_object; }
         DocLoader* docLoader() { return m_docLoader; }
 
         bool isIncremental() { return m_incremental; }
similarity index 97%
rename from WebCore/loader/WebLoader.h
rename to WebCore/loader/ResourceLoader.h
index 58a5cbf..78500a3 100644 (file)
@@ -63,9 +63,9 @@ namespace WebCore {
     class FrameLoader;
 
     // FIXME: Rename to ResourceHandle after resolving conflict with existing class of that name.
-    class WebResourceLoader : public Shared<WebResourceLoader> {
+    class ResourceLoader : public Shared<ResourceLoader> {
     public:
-        virtual ~WebResourceLoader();
+        virtual ~ResourceLoader();
 
 #if PLATFORM(MAC)
         virtual bool load(NSURLRequest *);
@@ -108,7 +108,7 @@ namespace WebCore {
 #endif
 
     protected:
-        WebResourceLoader(Frame*);
+        ResourceLoader(Frame*);
 
 #if PLATFORM(MAC)
         WebCoreResourceLoaderAsDelegate *delegate();
similarity index 97%
rename from WebCore/loader/WebSubresourceLoader.h
rename to WebCore/loader/SubresourceLoader.h
index 88f0cf9..7eae24c 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SubresourceLoader_H_
 #define SubresourceLoader_H_
  
-#import "WebLoader.h"
+#import "ResourceLoader.h"
 #include <wtf/PassRefPtr.h>
  
 #ifndef __OBJC__
@@ -45,7 +45,7 @@ namespace WebCore {
     class ResourceHandle;
     class ResourceRequest;
     
-    class SubresourceLoader : public WebResourceLoader {
+    class SubresourceLoader : public ResourceLoader {
     public:
         static PassRefPtr<SubresourceLoader> create(Frame*, ResourceHandle*, ResourceRequest&);
 
similarity index 95%
rename from WebCore/loader/Decoder.cpp
rename to WebCore/loader/TextResourceDecoder.cpp
index 49fadaf..2a33b62 100644 (file)
 
 
 #include "config.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 
 #include "CString.h"
 #include "DOMImplementation.h"
 #include "DeprecatedCString.h"
 #include "DeprecatedString.h"
 #include "HTMLNames.h"
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 
 namespace WebCore {
 
@@ -245,7 +245,7 @@ breakBreak:
     return (code);
 }
 
-Decoder::ContentType Decoder::determineContentType(const String& mimeType)
+TextResourceDecoder::ContentType TextResourceDecoder::determineContentType(const String& mimeType)
 {
     if (equalIgnoringCase(mimeType, "text/css"))
         return CSS;
@@ -256,7 +256,7 @@ Decoder::ContentType Decoder::determineContentType(const String& mimeType)
     return PlainText;
 }
 
-const TextEncoding& Decoder::defaultEncoding(ContentType contentType, const TextEncoding& specifiedDefaultEncoding)
+const TextEncoding& TextResourceDecoder::defaultEncoding(ContentType contentType, const TextEncoding& specifiedDefaultEncoding)
 {
     // Despite 8.5 "Text/xml with Omitted Charset" of RFC 3023, we assume UTF-8 instead of US-ASCII 
     // for text/xml. This matches Firefox.
@@ -267,7 +267,7 @@ const TextEncoding& Decoder::defaultEncoding(ContentType contentType, const Text
     return specifiedDefaultEncoding;
 }
 
-Decoder::Decoder(const String& mimeType, const TextEncoding& specifiedDefaultEncoding)
+TextResourceDecoder::TextResourceDecoder(const String& mimeType, const TextEncoding& specifiedDefaultEncoding)
     : m_contentType(determineContentType(mimeType))
     , m_decoder(defaultEncoding(m_contentType, specifiedDefaultEncoding))
     , m_source(DefaultEncoding)
@@ -277,11 +277,11 @@ Decoder::Decoder(const String& mimeType, const TextEncoding& specifiedDefaultEnc
 {
 }
 
-Decoder::~Decoder()
+TextResourceDecoder::~TextResourceDecoder()
 {
 }
 
-void Decoder::setEncoding(const TextEncoding& encoding, EncodingSource source)
+void TextResourceDecoder::setEncoding(const TextEncoding& encoding, EncodingSource source)
 {
     // In case the encoding didn't exist, we keep the old one (helps some sites specifying invalid encodings).
     if (!encoding.isValid())
@@ -344,7 +344,7 @@ static inline bool skipWhitespace(const char*& pos, const char* dataEnd)
     return pos != dataEnd;
 }
 
-void Decoder::checkForBOM(const char* data, size_t len)
+void TextResourceDecoder::checkForBOM(const char* data, size_t len)
 {
     // Check for UTF-16 or UTF-8 BOM mark at the beginning, which is a sure sign of a Unicode encoding.
 
@@ -379,7 +379,7 @@ void Decoder::checkForBOM(const char* data, size_t len)
         setEncoding(UTF8Encoding(), AutoDetectedEncoding);
 }
 
-bool Decoder::checkForCSSCharset(const char* data, size_t len, bool& movedDataToBuffer)
+bool TextResourceDecoder::checkForCSSCharset(const char* data, size_t len, bool& movedDataToBuffer)
 {
     if (m_source != DefaultEncoding) {
         m_checkedForCSSCharset = true;
@@ -458,7 +458,7 @@ static inline void skipComment(const char*& ptr, const char* pEnd)
     ptr = p;
 }
 
-bool Decoder::checkForHeadCharset(const char* data, size_t len, bool& movedDataToBuffer)
+bool TextResourceDecoder::checkForHeadCharset(const char* data, size_t len, bool& movedDataToBuffer)
 {
     if (m_source != DefaultEncoding) {
         m_checkedForHeadCharset = true;
@@ -605,7 +605,7 @@ bool Decoder::checkForHeadCharset(const char* data, size_t len, bool& movedDataT
     return false;
 }
 
-void Decoder::detectJapaneseEncoding(const char* data, size_t len)
+void TextResourceDecoder::detectJapaneseEncoding(const char* data, size_t len)
 {
     switch (KanjiCode::judge(data, len)) {
         case KanjiCode::JIS:
@@ -624,7 +624,7 @@ void Decoder::detectJapaneseEncoding(const char* data, size_t len)
     }
 }
 
-String Decoder::decode(const char* data, size_t len)
+String TextResourceDecoder::decode(const char* data, size_t len)
 {
     if (!m_checkedForBOM)
         checkForBOM(data, len);
@@ -660,7 +660,7 @@ String Decoder::decode(const char* data, size_t len)
     return result;
 }
 
-String Decoder::flush()
+String TextResourceDecoder::flush()
 {
     String result = m_decoder.decode(m_buffer.data(), m_buffer.size(), true);
     m_buffer.resize(0);
similarity index 90%
rename from WebCore/loader/Decoder.h
rename to WebCore/loader/TextResourceDecoder.h
index 59d6244..e5232cd 100644 (file)
@@ -22,8 +22,8 @@
 
 */
 
-#ifndef Decoder_h
-#define Decoder_h
+#ifndef TextResourceDecoder_h
+#define TextResourceDecoder_h
 
 #include "PlatformString.h"
 #include "Shared.h"
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-class Decoder : public Shared<Decoder> {
+class TextResourceDecoder : public Shared<TextResourceDecoder> {
 public:
     enum EncodingSource {
         DefaultEncoding,
@@ -44,8 +44,8 @@ public:
         UserChosenEncoding
     };
 
-    Decoder(const String& mimeType, const TextEncoding& defaultEncoding = TextEncoding());
-    ~Decoder();
+    TextResourceDecoder(const String& mimeType, const TextEncoding& defaultEncoding = TextEncoding());
+    ~TextResourceDecoder();
 
     void setEncoding(const TextEncoding&, EncodingSource);
     const TextEncoding& encoding() const { return m_decoder.encoding(); }
index 975a082..9cbac40 100644 (file)
@@ -68,10 +68,10 @@ void Loader::servePendingRequests()
     // get the first pending request
     Request* req = m_requestsPending.take(0);
 
-    ResourceRequest request(req->cachedObject()->url());
+    ResourceRequest request(req->cachedResource()->url());
 
-    if (!req->cachedObject()->accept().isEmpty())
-        request.setHTTPAccept(req->cachedObject()->accept());
+    if (!req->cachedResource()->accept().isEmpty())
+        request.setHTTPAccept(req->cachedResource()->accept());
     if (req->docLoader())  {
         KURL r = req->docLoader()->doc()->URL();
         if (r.protocol().startsWith("http") && r.path().isEmpty())
@@ -97,7 +97,7 @@ void Loader::receivedAllData(ResourceHandle* job, PlatformData allData)
     Request* req = i->second;
     m_requestsLoading.remove(i);
 
-    CachedResource* object = req->cachedObject();
+    CachedResource* object = req->cachedResource();
     DocLoader* docLoader = req->docLoader();
 
     if (job->error() || job->isErrorPage()) {
@@ -126,21 +126,21 @@ void Loader::receivedResponse(ResourceHandle* job, PlatformResponse response)
     // FIXME: the win32 platform does not have PlatformResponse yet.
     ASSERT(response);
 #endif
-    req->cachedObject()->setResponse(response);
-    req->cachedObject()->setExpireDate(CacheObjectExpiresTime(req->docLoader(), response), false);
+    req->cachedResource()->setResponse(response);
+    req->cachedResource()->setExpireDate(CacheObjectExpiresTime(req->docLoader(), response), false);
     
     String encoding = job->responseEncoding();
     if (!encoding.isNull())
-        req->cachedObject()->setEncoding(encoding);
+        req->cachedResource()->setEncoding(encoding);
     
     if (req->isMultipart()) {
-        ASSERT(req->cachedObject()->isImage());
-        static_cast<CachedImage*>(req->cachedObject())->clear();
+        ASSERT(req->cachedResource()->isImage());
+        static_cast<CachedImage*>(req->cachedResource())->clear();
         if (req->docLoader()->frame())
             req->docLoader()->frame()->checkCompleted();
     } else if (ResponseIsMultipart(response)) {
         req->setIsMultipart(true);
-        if (!req->cachedObject()->isImage())
+        if (!req->cachedResource()->isImage())
             job->cancel();
     }
 }
@@ -151,7 +151,7 @@ void Loader::didReceiveData(ResourceHandle* job, const char* data, int size)
     if (!request)
         return;
 
-    CachedResource* object = request->cachedObject();    
+    CachedResource* object = request->cachedResource();    
     Vector<char>& buffer = object->bufferData(data, size, request);
 
     // Set the data.
@@ -196,7 +196,7 @@ void Loader::cancelRequests(DocLoader* dl)
     DeprecatedPtrListIterator<Request> pIt(m_requestsPending);
     while (pIt.current()) {
         if (pIt.current()->docLoader() == dl) {
-            cache()->remove(pIt.current()->cachedObject());
+            cache()->remove(pIt.current()->cachedResource());
             m_requestsPending.remove(pIt);
         } else
             ++pIt;
@@ -215,14 +215,14 @@ void Loader::cancelRequests(DocLoader* dl)
         ResourceHandle* job = jobsToCancel[i];
         Request* r = m_requestsLoading.get(job);
         m_requestsLoading.remove(job);
-        cache()->remove(r->cachedObject());
+        cache()->remove(r->cachedResource());
         job->kill();
     }
 
     DeprecatedPtrListIterator<Request> bdIt(m_requestsBackgroundDecoding);
     while (bdIt.current()) {
         if (bdIt.current()->docLoader() == dl) {
-            cache()->remove(bdIt.current()->cachedObject());
+            cache()->remove(bdIt.current()->cachedResource());
             m_requestsBackgroundDecoding.remove(bdIt);
         } else
             ++bdIt;
@@ -239,7 +239,7 @@ ResourceHandle* Loader::jobForRequest(const String& URL) const
 {
     RequestMap::const_iterator end = m_requestsLoading.end();
     for (RequestMap::const_iterator i = m_requestsLoading.begin(); i != end; ++i) {
-        CachedResource* obj = i->second->cachedObject();
+        CachedResource* obj = i->second->cachedResource();
         if (obj && obj->url() == URL)
             return i->first;
     }
index 5b71f22..a32f1c9 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebDocumentLoader.h"
+#import "DocumentLoader.h"
 
 #import "Document.h"
 #import "FrameLoader.h"
similarity index 99%
rename from WebCore/loader/mac/WebFormDataStream.m
rename to WebCore/loader/mac/FormDataStream.m
index b97eea9..b295e03 100644 (file)
@@ -29,7 +29,7 @@
 /* originally written by Becky Willrich, additional code by Darin Adler */
 
 #import "config.h"
-#import "WebFormDataStream.h"
+#import "FormDataStream.h"
 
 #import "CString.h"
 #import "FormData.h"
index a4c42c4..af36d33 100644 (file)
 #import "WebCorePageState.h"
 #import "WebCoreSystemInterface.h"
 #import "WebDataProtocol.h"
-#import "WebDocumentLoader.h"
-#import "WebFormDataStream.h"
+#import "DocumentLoader.h"
+#import "FormDataStream.h"
 #import "WebFormState.h"
-#import "WebMainResourceLoader.h"
-#import "WebSubresourceLoader.h"
+#import "MainResourceLoader.h"
+#import "SubresourceLoader.h"
 #import <kjs/JSLock.h>
 #import <wtf/Assertions.h>
 
@@ -459,7 +459,7 @@ void FrameLoader::cancelMainResourceLoad()
         m_mainResourceLoader->cancel();
 }
 
-void FrameLoader::cancelPendingArchiveLoad(WebResourceLoader* loader)
+void FrameLoader::cancelPendingArchiveLoad(ResourceLoader* loader)
 {
     m_client->cancelPendingArchiveLoad(loader);
 }
@@ -471,13 +471,13 @@ DocumentLoader* FrameLoader::activeDocumentLoader() const
     return m_documentLoader.get();
 }
 
-void FrameLoader::addPlugInStreamLoader(WebResourceLoader* loader)
+void FrameLoader::addPlugInStreamLoader(ResourceLoader* loader)
 {
     m_plugInStreamLoaders.add(loader);
     activeDocumentLoader()->setLoading(true);
 }
 
-void FrameLoader::removePlugInStreamLoader(WebResourceLoader* loader)
+void FrameLoader::removePlugInStreamLoader(ResourceLoader* loader)
 {
     m_plugInStreamLoaders.remove(loader);
     activeDocumentLoader()->updateLoading();
@@ -503,14 +503,14 @@ bool FrameLoader::isLoading() const
     return isLoadingMainResource() || isLoadingSubresources() || isLoadingPlugIns();
 }
 
-void FrameLoader::addSubresourceLoader(WebResourceLoader* loader)
+void FrameLoader::addSubresourceLoader(ResourceLoader* loader)
 {
     ASSERT(!m_provisionalDocumentLoader);
     m_subresourceLoaders.add(loader);
     activeDocumentLoader()->setLoading(true);
 }
 
-void FrameLoader::removeSubresourceLoader(WebResourceLoader* loader)
+void FrameLoader::removeSubresourceLoader(ResourceLoader* loader)
 {
     m_subresourceLoaders.remove(loader);
     activeDocumentLoader()->updateLoading();
@@ -639,23 +639,23 @@ id FrameLoader::identifierForInitialRequest(NSURLRequest *clientRequest)
     return m_client->dispatchIdentifierForInitialRequest(activeDocumentLoader(), clientRequest);
 }
 
-NSURLRequest *FrameLoader::willSendRequest(WebResourceLoader* loader, NSMutableURLRequest *clientRequest, NSURLResponse *redirectResponse)
+NSURLRequest *FrameLoader::willSendRequest(ResourceLoader* loader, NSMutableURLRequest *clientRequest, NSURLResponse *redirectResponse)
 {
     [clientRequest setValue:client()->userAgent([clientRequest URL]) forHTTPHeaderField:@"User-Agent"];
     return m_client->dispatchWillSendRequest(activeDocumentLoader(), loader->identifier(), clientRequest, redirectResponse);
 }
 
-void FrameLoader::didReceiveAuthenticationChallenge(WebResourceLoader* loader, NSURLAuthenticationChallenge *currentWebChallenge)
+void FrameLoader::didReceiveAuthenticationChallenge(ResourceLoader* loader, NSURLAuthenticationChallenge *currentWebChallenge)
 {
     m_client->dispatchDidReceiveAuthenticationChallenge(activeDocumentLoader(), loader->identifier(), currentWebChallenge);
 }
 
-void FrameLoader::didCancelAuthenticationChallenge(WebResourceLoader* loader, NSURLAuthenticationChallenge *currentWebChallenge)
+void FrameLoader::didCancelAuthenticationChallenge(ResourceLoader* loader, NSURLAuthenticationChallenge *currentWebChallenge)
 {
     m_client->dispatchDidCancelAuthenticationChallenge(activeDocumentLoader(), loader->identifier(), currentWebChallenge);
 }
 
-void FrameLoader::didReceiveResponse(WebResourceLoader* loader, NSURLResponse *r)
+void FrameLoader::didReceiveResponse(ResourceLoader* loader, NSURLResponse *r)
 {
     activeDocumentLoader()->addResponse(r);
     
@@ -663,19 +663,19 @@ void FrameLoader::didReceiveResponse(WebResourceLoader* loader, NSURLResponse *r
     m_client->dispatchDidReceiveResponse(activeDocumentLoader(), loader->identifier(), r);
 }
 
-void FrameLoader::didReceiveData(WebResourceLoader* loader, NSData *data, int lengthReceived)
+void FrameLoader::didReceiveData(ResourceLoader* loader, NSData *data, int lengthReceived)
 {
     m_client->incrementProgress(loader->identifier(), data);
     m_client->dispatchDidReceiveContentLength(activeDocumentLoader(), loader->identifier(), lengthReceived);
 }
 
-void FrameLoader::didFinishLoad(WebResourceLoader* loader)
+void FrameLoader::didFinishLoad(ResourceLoader* loader)
 {    
     m_client->completeProgress(loader->identifier());
     m_client->dispatchDidFinishLoading(activeDocumentLoader(), loader->identifier());
 }
 
-void FrameLoader::didFailToLoad(WebResourceLoader* loader, NSError *error)
+void FrameLoader::didFailToLoad(ResourceLoader* loader, NSError *error)
 {
     m_client->completeProgress(loader->identifier());
     if (error)
@@ -867,7 +867,7 @@ void FrameLoader::open(WebCorePageState *state)
     d->m_bLoadEventEmitted = true;
     
     // Delete old status bar messages (if it _was_ activated on last URL).
-    if (m_frame->jScriptEnabled()) {
+    if (m_frame->javaScriptEnabled()) {
         d->m_kjsStatusBarText = String();
         d->m_kjsDefaultStatusBarText = String();
     }
@@ -1056,12 +1056,12 @@ NSError *FrameLoader::fileDoesNotExistError(NSURLResponse *response) const
     return m_client->fileDoesNotExistError(response);    
 }
 
-bool FrameLoader::willUseArchive(WebResourceLoader* loader, NSURLRequest *request, NSURL *originalURL) const
+bool FrameLoader::willUseArchive(ResourceLoader* loader, NSURLRequest *request, NSURL *originalURL) const
 {
     return m_client->willUseArchive(loader, request, originalURL);
 }
 
-bool FrameLoader::isArchiveLoadPending(WebResourceLoader* loader) const
+bool FrameLoader::isArchiveLoadPending(ResourceLoader* loader) const
 {
     return m_client->isArchiveLoadPending(loader);
 }
index 6d8cc72..657b7b1 100644 (file)
@@ -30,7 +30,7 @@
 #include "FrameLoader.h"
 #include "FrameMac.h"
 #include "WebCoreFrameBridge.h"
-#include "WebDocumentLoader.h"
+#include "DocumentLoader.h"
 
 namespace WebCore {
     
index c2e2e65..d5413dc 100644 (file)
@@ -119,12 +119,12 @@ bool CheckIfReloading(DocLoader *loader)
     return false;
 }
 
-void CheckCacheObjectStatus(DocLoader *loader, CachedResource *cachedObject)
+void CheckCacheObjectStatus(DocLoader *loader, CachedResource *cachedResource)
 {
     // Return from the function for objects that we didn't load from the cache.
-    if (!cachedObject)
+    if (!cachedResource)
         return;
-    switch (cachedObject->status()) {
+    switch (cachedResource->status()) {
     case CachedResource::Cached:
         break;
     case CachedResource::NotCached:
@@ -134,22 +134,22 @@ void CheckCacheObjectStatus(DocLoader *loader, CachedResource *cachedObject)
         return;
     }
     
-    ASSERT(cachedObject->response());
+    ASSERT(cachedResource->response());
     
     // Notify the caller that we "loaded".
     FrameMac *frame = static_cast<FrameMac *>(loader->frame());
 
-    if (!frame || frame->haveToldBridgeAboutLoad(cachedObject->url()))
+    if (!frame || frame->haveToldBridgeAboutLoad(cachedResource->url()))
         return;
         
-    NSURLRequest *request = cachedObject->getNSURLRequest();
-    NSURLResponse *response = cachedObject->response();
-    NSData *data = cachedObject->allData();
+    NSURLRequest *request = cachedResource->getNSURLRequest();
+    NSURLResponse *response = cachedResource->response();
+    NSData *data = cachedResource->allData();
     
     // FIXME: If the WebKit client changes or cancels the request, WebCore does not respect this and continues the load.
     frame->loader()->loadedResourceFromMemoryCache(request, response, [data length]);
     
-    frame->didTellBridgeAboutLoad(cachedObject->url());
+    frame->didTellBridgeAboutLoad(cachedResource->url());
 }
 
 bool IsResponseURLEqualToURL(PlatformResponse response, const String& m_url)
index 714fb61..3cb4f9a 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebMainResourceLoader.h"
+#import "MainResourceLoader.h"
 
 #import "FrameLoader.h"
 #import "PlatformString.h"
@@ -41,7 +41,7 @@
 #import <wtf/PassRefPtr.h>
 #import <wtf/Vector.h>
 
-// FIXME: More that is in common with SubresourceLoader should move up into WebResourceLoader.
+// FIXME: More that is in common with SubresourceLoader should move up into ResourceLoader.
 
 using namespace WebCore;
 
@@ -50,7 +50,7 @@ namespace WebCore {
 const size_t URLBufferLength = 2048;
 
 MainResourceLoader::MainResourceLoader(Frame* frame)
-    : WebResourceLoader(frame)
+    : ResourceLoader(frame)
     , m_proxy(wkCreateNSURLConnectionDelegateProxy())
     , m_loadingMultipartContent(false)
     , m_waitingForContentPolicy(false)
@@ -66,7 +66,7 @@ MainResourceLoader::~MainResourceLoader()
 void MainResourceLoader::releaseDelegate()
 {
     [m_proxy.get() setDelegate:nil];
-    WebResourceLoader::releaseDelegate();
+    ResourceLoader::releaseDelegate();
 }
 
 PassRefPtr<MainResourceLoader> MainResourceLoader::create(Frame* frame)
@@ -104,7 +104,7 @@ void MainResourceLoader::didCancel(NSError *error)
         deref(); // balances ref in didReceiveResponse
     }
     frameLoader()->receivedMainResourceError(error, true);
-    WebResourceLoader::didCancel(error);
+    ResourceLoader::didCancel(error);
 }
 
 NSError *MainResourceLoader::interruptionForPolicyChangeError() const
@@ -146,7 +146,7 @@ bool MainResourceLoader::isPostOrRedirectAfterPost(NSURLRequest *newRequest, NSU
 
 void MainResourceLoader::addData(NSData *data, bool allAtOnce)
 {
-    WebResourceLoader::addData(data, allAtOnce);
+    ResourceLoader::addData(data, allAtOnce);
     frameLoader()->receivedData(data);
 }
 
@@ -187,7 +187,7 @@ NSURLRequest *MainResourceLoader::willSendRequest(NSURLRequest *newRequest, NSUR
     // Note super will make a copy for us, so reassigning newRequest is important. Since we are returning this value, but
     // it's only guaranteed to be retained by self, and self might be dealloc'ed in this method, we have to autorelease.
     // See 3777253 for an example.
-    newRequest = [[WebResourceLoader::willSendRequest(newRequest, redirectResponse) retain] autorelease];
+    newRequest = [[ResourceLoader::willSendRequest(newRequest, redirectResponse) retain] autorelease];
 
     // Don't set this on the first request. It is set when the main load was started.
     frameLoader()->setRequest(newRequest);
@@ -265,7 +265,7 @@ void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy,
 
     // we may have cancelled this load as part of switching to fallback content
     if (!reachedTerminalState())
-        WebResourceLoader::didReceiveResponse(r);
+        ResourceLoader::didReceiveResponse(r);
 
     if (frameLoader() && !frameLoader()->isStopping() && (shouldLoadAsEmptyDocument(URL) || frameLoader()->representationExistsForURLScheme([URL scheme])))
         didFinishLoading();
@@ -321,7 +321,7 @@ void MainResourceLoader::didReceiveData(NSData *data, long long lengthReceived,
     // reference to this object; one example of this is 3266216.
     RefPtr<MainResourceLoader> protect(this);
 
-    WebResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
+    ResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
 }
 
 void MainResourceLoader::didFinishLoading()
@@ -333,7 +333,7 @@ void MainResourceLoader::didFinishLoading()
     RefPtr<MainResourceLoader> protect(this);
 
     frameLoader()->finishedLoading();
-    WebResourceLoader::didFinishLoading();
+    ResourceLoader::didFinishLoading();
 }
 
 void MainResourceLoader::didFail(NSError *error)
@@ -409,7 +409,7 @@ bool MainResourceLoader::load(NSURLRequest *r)
 
 void MainResourceLoader::setDefersLoading(bool defers)
 {
-    WebResourceLoader::setDefersLoading(defers);
+    ResourceLoader::setDefersLoading(defers);
     if (!defers) {
         RetainPtr<NSURLRequest> r = m_initialRequest;
         if (r) {
index 2c7338d..8407e1a 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebNetscapePlugInStreamLoader.h"
+#import "NetscapePlugInStreamLoader.h"
 
 #import "FrameLoader.h"
 #import <wtf/PassRefPtr.h>
@@ -35,7 +35,7 @@
 namespace WebCore {
 
 NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, id <WebPlugInStreamLoaderDelegate> stream)
-    : WebResourceLoader(frame)
+    : ResourceLoader(frame)
     , m_stream(stream)
 {
 }
@@ -57,7 +57,7 @@ bool NetscapePlugInStreamLoader::isDone() const
 void NetscapePlugInStreamLoader::releaseResources()
 {
     m_stream = nil;
-    WebResourceLoader::releaseResources();
+    ResourceLoader::releaseResources();
 }
 
 void NetscapePlugInStreamLoader::didReceiveResponse(NSURLResponse *theResponse)
@@ -72,7 +72,7 @@ void NetscapePlugInStreamLoader::didReceiveResponse(NSURLResponse *theResponse)
     // Don't continue if the stream is cancelled in startStreamWithResponse or didReceiveResponse.
     if (!m_stream)
         return;
-    WebResourceLoader::didReceiveResponse(theResponse);
+    ResourceLoader::didReceiveResponse(theResponse);
     if (!m_stream)
         return;
     if ([theResponse isKindOfClass:[NSHTTPURLResponse class]] &&
@@ -90,7 +90,7 @@ void NetscapePlugInStreamLoader::didReceiveData(NSData *data, long long lengthRe
     RefPtr<NetscapePlugInStreamLoader> protect(this);
 
     [m_stream.get() receivedData:data];
-    WebResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
+    ResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
 }
 
 void NetscapePlugInStreamLoader::didFinishLoading()
@@ -100,7 +100,7 @@ void NetscapePlugInStreamLoader::didFinishLoading()
 
     frameLoader()->removePlugInStreamLoader(this);
     [m_stream.get() finishedLoadingWithData:resourceData()];
-    WebResourceLoader::didFinishLoading();
+    ResourceLoader::didFinishLoading();
 }
 
 void NetscapePlugInStreamLoader::didFail(NSError *error)
@@ -112,7 +112,7 @@ void NetscapePlugInStreamLoader::didFail(NSError *error)
 
     frameLoader()->removePlugInStreamLoader(this);
     [m_stream.get() destroyStreamWithError:error];
-    WebResourceLoader::didFail(error);
+    ResourceLoader::didFail(error);
 }
 
 void NetscapePlugInStreamLoader::didCancel(NSError *error)
@@ -122,7 +122,7 @@ void NetscapePlugInStreamLoader::didCancel(NSError *error)
 
     frameLoader()->removePlugInStreamLoader(this);
     [m_stream.get() destroyStreamWithError:error];
-    WebResourceLoader::didCancel(error);
+    ResourceLoader::didCancel(error);
 }
 
 }
index 986bb1d..47ddd02 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebLoader.h"
+#import "ResourceLoader.h"
 
 #import "FrameLoader.h"
 #import "FrameMac.h"
@@ -46,9 +46,9 @@ using namespace WebCore;
 
 @interface WebCoreResourceLoaderAsDelegate : NSObject <NSURLAuthenticationChallengeSender>
 {
-    WebResourceLoader* m_loader;
+    ResourceLoader* m_loader;
 }
-- (id)initWithLoader:(WebResourceLoader*)loader;
+- (id)initWithLoader:(ResourceLoader*)loader;
 - (void)detachLoader;
 @end
 
@@ -69,7 +69,7 @@ static bool NSURLConnectionSupportsBufferedData;
 static bool isInitializingConnection;
 #endif
 
-WebResourceLoader::WebResourceLoader(Frame* frame)
+ResourceLoader::ResourceLoader(Frame* frame)
     : m_reachedTerminalState(false)
     , m_cancelled(false)
     , m_calledDidFinishLoad(false)
@@ -84,13 +84,13 @@ WebResourceLoader::WebResourceLoader(Frame* frame)
     }
 }
 
-WebResourceLoader::~WebResourceLoader()
+ResourceLoader::~ResourceLoader()
 {
     ASSERT(m_reachedTerminalState);
     releaseDelegate();
 }
 
-void WebResourceLoader::releaseResources()
+void ResourceLoader::releaseResources()
 {
     ASSERT(!m_reachedTerminalState);
     
@@ -98,7 +98,7 @@ void WebResourceLoader::releaseResources()
     // deallocated and release the last reference to this object.
     // We need to retain to avoid accessing the object after it
     // has been deallocated and also to avoid reentering this method.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     m_frame = 0;
 
@@ -113,7 +113,7 @@ void WebResourceLoader::releaseResources()
     releaseDelegate();
 }
 
-bool WebResourceLoader::load(NSURLRequest *r)
+bool ResourceLoader::load(NSURLRequest *r)
 {
     ASSERT(m_connection == nil);
     ASSERT(!frameLoader()->isArchiveLoadPending(this));
@@ -145,20 +145,20 @@ bool WebResourceLoader::load(NSURLRequest *r)
     return true;
 }
 
-void WebResourceLoader::setDefersLoading(bool defers)
+void ResourceLoader::setDefersLoading(bool defers)
 {
     m_defersLoading = defers;
     wkSetNSURLConnectionDefersCallbacks(m_connection.get(), defers);
 }
 
-FrameLoader* WebResourceLoader::frameLoader() const
+FrameLoader* ResourceLoader::frameLoader() const
 {
     if (!m_frame)
         return 0;
     return m_frame->loader();
 }
 
-void WebResourceLoader::addData(NSData *data, bool allAtOnce)
+void ResourceLoader::addData(NSData *data, bool allAtOnce)
 {
     if (allAtOnce) {
         NSMutableData *dataCopy = [data mutableCopy];
@@ -181,7 +181,7 @@ void WebResourceLoader::addData(NSData *data, bool allAtOnce)
     }
 }
 
-NSData *WebResourceLoader::resourceData()
+NSData *ResourceLoader::resourceData()
 {
     if (m_resourceData)
         // Retain and autorelease resourceData since releaseResources (which releases resourceData) may be called 
@@ -194,16 +194,16 @@ NSData *WebResourceLoader::resourceData()
     return nil;
 }
 
-void WebResourceLoader::clearResourceData()
+void ResourceLoader::clearResourceData()
 {
     [m_resourceData.get() setLength:0];
 }
 
-NSURLRequest *WebResourceLoader::willSendRequest(NSURLRequest *newRequest, NSURLResponse *redirectResponse)
+NSURLRequest *ResourceLoader::willSendRequest(NSURLRequest *newRequest, NSURLResponse *redirectResponse)
 {
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     ASSERT(!m_reachedTerminalState);
     NSMutableURLRequest *mutableRequest = [[newRequest mutableCopy] autorelease];
@@ -254,7 +254,7 @@ NSURLRequest *WebResourceLoader::willSendRequest(NSURLRequest *newRequest, NSURL
     return copy;
 }
 
-void WebResourceLoader::didReceiveAuthenticationChallenge(NSURLAuthenticationChallenge *challenge)
+void ResourceLoader::didReceiveAuthenticationChallenge(NSURLAuthenticationChallenge *challenge)
 {
     ASSERT(!m_reachedTerminalState);
     ASSERT(!m_currentConnectionChallenge);
@@ -262,7 +262,7 @@ void WebResourceLoader::didReceiveAuthenticationChallenge(NSURLAuthenticationCha
 
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     m_currentConnectionChallenge = challenge;
     NSURLAuthenticationChallenge *webChallenge = [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:challenge sender:delegate()];
@@ -273,7 +273,7 @@ void WebResourceLoader::didReceiveAuthenticationChallenge(NSURLAuthenticationCha
     [webChallenge release];
 }
 
-void WebResourceLoader::didCancelAuthenticationChallenge(NSURLAuthenticationChallenge *challenge)
+void ResourceLoader::didCancelAuthenticationChallenge(NSURLAuthenticationChallenge *challenge)
 {
     ASSERT(!m_reachedTerminalState);
     ASSERT(m_currentConnectionChallenge);
@@ -282,18 +282,18 @@ void WebResourceLoader::didCancelAuthenticationChallenge(NSURLAuthenticationChal
 
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     frameLoader()->didCancelAuthenticationChallenge(this, m_currentWebChallenge.get());
 }
 
-void WebResourceLoader::didReceiveResponse(NSURLResponse *r)
+void ResourceLoader::didReceiveResponse(NSURLResponse *r)
 {
     ASSERT(!m_reachedTerminalState);
 
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     // If the URL is one of our whacky applewebdata URLs then
     // fake up a substitute URL to present to the delegate.
@@ -306,7 +306,7 @@ void WebResourceLoader::didReceiveResponse(NSURLResponse *r)
     frameLoader()->didReceiveResponse(this, r);
 }
 
-void WebResourceLoader::didReceiveData(NSData *data, long long lengthReceived, bool allAtOnce)
+void ResourceLoader::didReceiveData(NSData *data, long long lengthReceived, bool allAtOnce)
 {
     // The following assertions are not quite valid here, since a subclass
     // might override didReceiveData: in a way that invalidates them. This
@@ -316,14 +316,14 @@ void WebResourceLoader::didReceiveData(NSData *data, long long lengthReceived, b
 
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     addData(data, allAtOnce);
     if (m_frame)
         frameLoader()->didReceiveData(this, data, lengthReceived);
 }
 
-void WebResourceLoader::willStopBufferingData(NSData *data)
+void ResourceLoader::willStopBufferingData(NSData *data)
 {
     ASSERT(!m_resourceData);
     NSMutableData *copy = [data mutableCopy];
@@ -331,7 +331,7 @@ void WebResourceLoader::willStopBufferingData(NSData *data)
     [copy release];
 }
 
-void WebResourceLoader::didFinishLoading()
+void ResourceLoader::didFinishLoading()
 {
     // If load has been cancelled after finishing (which could happen with a 
     // JavaScript that changes the window location), do nothing.
@@ -343,7 +343,7 @@ void WebResourceLoader::didFinishLoading()
     releaseResources();
 }
 
-void WebResourceLoader::didFinishLoadingOnePart()
+void ResourceLoader::didFinishLoadingOnePart()
 {
     if (m_cancelled)
         return;
@@ -355,7 +355,7 @@ void WebResourceLoader::didFinishLoadingOnePart()
     frameLoader()->didFinishLoad(this);
 }
 
-void WebResourceLoader::didFail(NSError *error)
+void ResourceLoader::didFail(NSError *error)
 {
     if (m_cancelled)
         return;
@@ -363,14 +363,14 @@ void WebResourceLoader::didFail(NSError *error)
 
     // Protect this in this delegate method since the additional processing can do
     // anything including possibly derefing this; one example of this is Radar 3266216.
-    RefPtr<WebResourceLoader> protector(this);
+    RefPtr<ResourceLoader> protector(this);
 
     frameLoader()->didFailToLoad(this, error);
 
     releaseResources();
 }
 
-NSCachedURLResponse *WebResourceLoader::willCacheResponse(NSCachedURLResponse *cachedResponse)
+NSCachedURLResponse *ResourceLoader::willCacheResponse(NSCachedURLResponse *cachedResponse)
 {
     // When in private browsing mode, prevent caching to disk
     if ([cachedResponse storagePolicy] == NSURLCacheStorageAllowed && frameLoader()->privateBrowsingEnabled())
@@ -381,7 +381,7 @@ NSCachedURLResponse *WebResourceLoader::willCacheResponse(NSCachedURLResponse *c
     return cachedResponse;
 }
 
-void WebResourceLoader::didCancel(NSError *error)
+void ResourceLoader::didCancel(NSError *error)
 {
     ASSERT(!m_cancelled);
     ASSERT(!m_reachedTerminalState);
@@ -404,7 +404,7 @@ void WebResourceLoader::didCancel(NSError *error)
     releaseResources();
 }
 
-void WebResourceLoader::cancel(NSError *error)
+void ResourceLoader::cancel(NSError *error)
 {
     if (m_reachedTerminalState)
         return;
@@ -414,27 +414,27 @@ void WebResourceLoader::cancel(NSError *error)
         didCancel(cancelledError());
 }
 
-void WebResourceLoader::setIdentifier(id identifier)
+void ResourceLoader::setIdentifier(id identifier)
 {
     m_identifier = identifier;
 }
 
-NSURLResponse *WebResourceLoader::response() const
+NSURLResponse *ResourceLoader::response() const
 {
     return m_response.get();
 }
 
-bool WebResourceLoader::inConnectionCallback()
+bool ResourceLoader::inConnectionCallback()
 {
     return inNSURLConnectionCallback != 0;
 }
 
-NSError *WebResourceLoader::cancelledError()
+NSError *ResourceLoader::cancelledError()
 {
     return frameLoader()->cancelledError(m_request.get());
 }
 
-void WebResourceLoader::receivedCredential(NSURLAuthenticationChallenge *challenge, NSURLCredential *credential)
+void ResourceLoader::receivedCredential(NSURLAuthenticationChallenge *challenge, NSURLCredential *credential)
 {
     ASSERT(challenge);
     if (challenge != m_currentWebChallenge)
@@ -446,7 +446,7 @@ void WebResourceLoader::receivedCredential(NSURLAuthenticationChallenge *challen
     m_currentWebChallenge = nil;
 }
 
-void WebResourceLoader::receivedRequestToContinueWithoutCredential(NSURLAuthenticationChallenge *challenge)
+void ResourceLoader::receivedRequestToContinueWithoutCredential(NSURLAuthenticationChallenge *challenge)
 {
     ASSERT(challenge);
     if (challenge != m_currentWebChallenge)
@@ -458,7 +458,7 @@ void WebResourceLoader::receivedRequestToContinueWithoutCredential(NSURLAuthenti
     m_currentWebChallenge = nil;
 }
 
-void WebResourceLoader::receivedCancellation(NSURLAuthenticationChallenge *challenge)
+void ResourceLoader::receivedCancellation(NSURLAuthenticationChallenge *challenge)
 {
     if (challenge != m_currentWebChallenge)
         return;
@@ -466,7 +466,7 @@ void WebResourceLoader::receivedCancellation(NSURLAuthenticationChallenge *chall
     cancel();
 }
 
-WebCoreResourceLoaderAsDelegate *WebResourceLoader::delegate()
+WebCoreResourceLoaderAsDelegate *ResourceLoader::delegate()
 {
     if (!m_delegate) {
         WebCoreResourceLoaderAsDelegate *d = [[WebCoreResourceLoaderAsDelegate alloc] initWithLoader:this];
@@ -476,7 +476,7 @@ WebCoreResourceLoaderAsDelegate *WebResourceLoader::delegate()
     return m_delegate.get();
 }
 
-void WebResourceLoader::releaseDelegate()
+void ResourceLoader::releaseDelegate()
 {
     if (!m_delegate)
         return;
@@ -488,7 +488,7 @@ void WebResourceLoader::releaseDelegate()
 
 @implementation WebCoreResourceLoaderAsDelegate
 
-- (id)initWithLoader:(WebResourceLoader*)loader
+- (id)initWithLoader:(ResourceLoader*)loader
 {
     self = [self init];
     if (!self)
index 92844cf..83ab969 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebSubresourceLoader.h"
+#import "SubresourceLoader.h"
 
 #import "FrameLoader.h"
 #import "FrameMac.h"
 #import "ResourceHandle.h"
 #import "WebCoreFrameBridge.h"
 #import "WebCoreSystemInterface.h"
-#import "WebFormDataStream.h"
+#import "FormDataStream.h"
 #import <Foundation/NSURLResponse.h>
 #import <wtf/Assertions.h>
 
 namespace WebCore {
 
 SubresourceLoader::SubresourceLoader(Frame* frame, ResourceHandle* handle)
-    : WebResourceLoader(frame)
+    : ResourceLoader(frame)
     , m_handle(handle)
     , m_loadingMultipartContent(false)
 {
@@ -107,7 +107,7 @@ PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, ResourceHa
 NSURLRequest *SubresourceLoader::willSendRequest(NSURLRequest *newRequest, NSURLResponse *redirectResponse)
 {
     NSURL *oldURL = [request() URL];
-    NSURLRequest *clientRequest = WebResourceLoader::willSendRequest(newRequest, redirectResponse);
+    NSURLRequest *clientRequest = ResourceLoader::willSendRequest(newRequest, redirectResponse);
     if (clientRequest && oldURL != [clientRequest URL] && ![oldURL isEqual:[clientRequest URL]])
         m_handle->redirectedToURL([clientRequest URL]);
     return clientRequest;
@@ -128,7 +128,7 @@ void SubresourceLoader::didReceiveResponse(NSURLResponse *r)
     // The loader can cancel a load if it receives a multipart response for a non-image
     if (reachedTerminalState())
         return;
-    WebResourceLoader::didReceiveResponse(r);
+    ResourceLoader::didReceiveResponse(r);
     
     if (m_loadingMultipartContent && [resourceData() length]) {
         // Since a subresource loader does not load multipart sections progressively,
@@ -152,7 +152,7 @@ void SubresourceLoader::didReceiveData(NSData *data, long long lengthReceived, b
     // So don't deliver any data to the loader yet.
     if (!m_loadingMultipartContent)
         m_handle->addData(data);
-    WebResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
+    ResourceLoader::didReceiveData(data, lengthReceived, allAtOnce);
 }
 
 void SubresourceLoader::didFinishLoading()
@@ -170,7 +170,7 @@ void SubresourceLoader::didFinishLoading()
     if (cancelled())
         return;
     frameLoader()->removeSubresourceLoader(this);
-    WebResourceLoader::didFinishLoading();
+    ResourceLoader::didFinishLoading();
 }
 
 void SubresourceLoader::didFail(NSError *error)
@@ -188,7 +188,7 @@ void SubresourceLoader::didFail(NSError *error)
     if (cancelled())
         return;
     frameLoader()->removeSubresourceLoader(this);
-    WebResourceLoader::didFail(error);
+    ResourceLoader::didFail(error);
 }
 
 void SubresourceLoader::didCancel(NSError *error)
@@ -204,7 +204,7 @@ void SubresourceLoader::didCancel(NSError *error)
     if (cancelled())
         return;
     frameLoader()->removeSubresourceLoader(this);
-    WebResourceLoader::didCancel(error);
+    ResourceLoader::didCancel(error);
 }
 
 }
index 5f8b2c1..00e4f07 100644 (file)
@@ -37,7 +37,7 @@
 #include "CachedCSSStyleSheet.h"
 #include "DOMImplementation.h"
 #include "DOMWindow.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "DocLoader.h"
 #include "DocumentType.h"
 #include "EditingText.h"
@@ -630,12 +630,12 @@ void Frame::setView(FrameView* view)
     d->m_view = view;
 }
 
-bool Frame::jScriptEnabled() const
+bool Frame::javaScriptEnabled() const
 {
     return d->m_bJScriptEnabled;
 }
 
-KJSProxy *Frame::jScript()
+KJSProxy *Frame::scriptProxy()
 {
     if (!d->m_bJScriptEnabled)
         return 0;
@@ -659,7 +659,7 @@ void Frame::replaceContentsWithScriptResult(const KURL& url)
 
 JSValue* Frame::executeScript(Node* n, const String& script, bool forceUserGesture)
 {
-  KJSProxy *proxy = jScript();
+  KJSProxy *proxy = scriptProxy();
 
   if (!proxy)
     return 0;
@@ -939,10 +939,10 @@ void Frame::write(const char* str, int len)
     }
     
     if (!d->m_decoder) {
-        d->m_decoder = new Decoder(d->m_responseMIMEType, settings()->encoding());
+        d->m_decoder = new TextResourceDecoder(d->m_responseMIMEType, settings()->encoding());
         if (!d->m_encoding.isNull())
             d->m_decoder->setEncoding(d->m_encoding,
-                d->m_haveEncoding ? Decoder::UserChosenEncoding : Decoder::EncodingFromHTTPHeader);
+                d->m_haveEncoding ? TextResourceDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader);
         if (d->m_doc)
             d->m_doc->setDecoder(d->m_decoder.get());
     }
@@ -2221,7 +2221,7 @@ JSValue* Frame::executeScript(const String& filename, int baseLine, Node* n, con
     // FIXME: This is missing stuff that the other executeScript has.
     // --> d->m_runningScripts and submitFormAgain.
     // Why is that OK?
-    KJSProxy* proxy = jScript();
+    KJSProxy* proxy = scriptProxy();
     if (!proxy)
         return 0;
     JSValue* ret = proxy->evaluate(filename, baseLine, script, n);
@@ -2714,8 +2714,8 @@ bool Frame::userGestureHint()
     while (rootFrame->tree()->parent())
         rootFrame = rootFrame->tree()->parent();
 
-    if (rootFrame->jScript())
-        return rootFrame->jScript()->interpreter()->wasRunByUserGesture();
+    if (rootFrame->scriptProxy())
+        return rootFrame->scriptProxy()->interpreter()->wasRunByUserGesture();
 
     return true; // If JavaScript is disabled, a user gesture must have initiated the navigation
 }
@@ -3129,14 +3129,14 @@ void Frame::restoreLocationProperties(SavedProperties *locationProperties)
 
 void Frame::saveInterpreterBuiltins(SavedBuiltins& interpreterBuiltins)
 {
-    if (jScript())
-        jScript()->interpreter()->saveBuiltins(interpreterBuiltins);
+    if (scriptProxy())
+        scriptProxy()->interpreter()->saveBuiltins(interpreterBuiltins);
 }
 
 void Frame::restoreInterpreterBuiltins(const SavedBuiltins& interpreterBuiltins)
 {
-    if (jScript())
-        jScript()->interpreter()->restoreBuiltins(interpreterBuiltins);
+    if (scriptProxy())
+        scriptProxy()->interpreter()->restoreBuiltins(interpreterBuiltins);
 }
 
 Frame *Frame::frameForWidget(const Widget *widget)
@@ -3448,7 +3448,7 @@ UChar Frame::backslashAsCurrencySymbol() const
     Document *doc = document();
     if (!doc)
         return '\\';
-    Decoder *decoder = doc->decoder();
+    TextResourceDecoder *decoder = doc->decoder();
     if (!decoder)
         return '\\';
 
index 09c0c0a..60fc0d6 100644 (file)
@@ -154,7 +154,7 @@ public:
   /**
    * Returns @p true if Javascript is enabled, @p false otherwise.
    */
-  bool jScriptEnabled() const;
+  bool javaScriptEnabled() const;
 
   /**
    * Returns true if Java is enabled, false otherwise.
@@ -658,7 +658,7 @@ public:
 
  public:
   KJS::JSValue* executeScript(const String& filename, int baseLine, Node*, const String& script);
-  KJSProxy* jScript();
+  KJSProxy* scriptProxy();
   Frame* opener();
   void setOpener(Frame* _opener);
   bool openedByJS();
index 8d7716a..af6c3d6 100644 (file)
@@ -32,7 +32,7 @@
 #include "CachePolicy.h"
 #include "CommandByName.h"
 #include "DOMWindow.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "EditCommand.h"
 #include "Editor.h"
 #include "EditorClient.h"
@@ -48,7 +48,7 @@
 
 namespace WebCore {
 
-    class Decoder;
+    class TextResourceDecoder;
     class UserStyleSheetLoader;
 
     enum RedirectionScheduled {
@@ -136,7 +136,7 @@ namespace WebCore {
         RefPtr<FrameView> m_view;
         BrowserExtension* m_extension;
         RefPtr<Document> m_doc;
-        RefPtr<Decoder> m_decoder;
+        RefPtr<TextResourceDecoder> m_decoder;
         String m_encoding;
         String scheduledScript;
         RefPtr<Node> scheduledScriptNode;
similarity index 98%
rename from WebCore/platform/StreamingTextDecoder.cpp
rename to WebCore/platform/TextCodec.cpp
index 2a551f6..1985c49 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 
 #include "PlatformString.h"
 
similarity index 96%
rename from WebCore/platform/StreamingTextDecoder.h
rename to WebCore/platform/TextCodec.h
index 8e4dd73..d235e18 100644 (file)
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef StreamingTextDecoder_h
-#define StreamingTextDecoder_h
+#ifndef TextCodec_h
+#define TextCodec_h
 
 #include "UChar.h"
 #include <memory>
@@ -56,4 +56,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // StreamingTextDecoder_h
+#endif // TextCodec_h
similarity index 99%
rename from WebCore/platform/StreamingTextDecoderICU.cpp
rename to WebCore/platform/TextCodecICU.cpp
index 6f4e37b..5382b46 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "StreamingTextDecoderICU.h"
+#include "TextCodecICU.h"
 
 #include "CString.h"
 #include "PlatformString.h"
similarity index 94%
rename from WebCore/platform/StreamingTextDecoderICU.h
rename to WebCore/platform/TextCodecICU.h
index dc260ce..448f8eb 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef StreamingTextDecoderICU_H
-#define StreamingTextDecoderICU_H
+#ifndef TextCodecICU_h
+#define TextCodecICU_h
 
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 #include "TextEncoding.h"
 
 typedef struct UConverter UConverter;
@@ -57,4 +57,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // StreamingTextDecoderICU_H
+#endif // TextCodecICU_h
index 25cabf7..46d6e66 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef TextCodecLatin1_h
 #define TextCodecLatin1_h
 
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 
 namespace WebCore {
 
index 692f227..2bde221 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef TextCodecUTF16_h
 #define TextCodecUTF16_h
 
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 
 namespace WebCore {
 
index 5c94489..2464ac9 100644 (file)
@@ -27,7 +27,7 @@
 #define TextDecoder_h
 
 #include "PlatformString.h"
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 #include "TextEncoding.h"
 #include <wtf/OwnPtr.h>
 
index d4897bb..cfa17b4 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "CString.h"
 #include "PlatformString.h"
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 #include "TextDecoder.h"
 #include "TextEncodingRegistry.h"
 #include <unicode/unorm.h>
index a8e252f..85c2256 100644 (file)
 #include <wtf/HashMap.h>
 
 #if USE(ICU_UNICODE)
-#include "StreamingTextDecoderICU.h"
+#include "TextCodecICU.h"
 #endif
 #if PLATFORM(MAC)
-#include "StreamingTextDecoderMac.h"
+#include "TextCodecMac.h"
 #endif
 
 namespace WebCore {
index b725c16..afb5bb4 100644 (file)
@@ -322,7 +322,7 @@ typedef unsigned char boolean;
  */
 #undef  INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
 
-/* Decoder capability options: */
+/* TextResourceDecoder capability options: */
 
 #undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
 #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
similarity index 99%
rename from WebCore/platform/mac/StreamingTextDecoderMac.cpp
rename to WebCore/platform/mac/TextCodecMac.cpp
index 2cee9ae..7ca3145 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "StreamingTextDecoderMac.h"
+#include "TextCodecMac.h"
 
 #include "CharsetData.h"
 #include "CString.h"
similarity index 95%
rename from WebCore/platform/mac/StreamingTextDecoderMac.h
rename to WebCore/platform/mac/TextCodecMac.h
index d4284d5..639e214 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef StreamingTextDecoderMac_H
-#define StreamingTextDecoderMac_H
+#ifndef TextCodecMac_h
+#define TextCodecMac_h
 
-#include "StreamingTextDecoder.h"
+#include "TextCodec.h"
 #include <CoreServices/CoreServices.h>
 
 namespace WebCore {
@@ -63,4 +63,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // StreamingTextDecoderMac_H
+#endif // TextCodecMac_h
index 41c4d8b..dd28b5c 100644 (file)
@@ -50,7 +50,7 @@ typedef void CURL;
 #endif
 
 #if PLATFORM(MAC)
-#include "WebSubresourceLoader.h"
+#include "SubresourceLoader.h"
 #endif
 
 // The allocations and releases in ResourceHandleInternal are
index c84e51c..962e793 100644 (file)
@@ -36,7 +36,7 @@
 #import "LoaderFunctions.h"
 #import "Logging.h"
 #import "WebCoreFrameBridge.h"
-#import "WebSubresourceLoader.h"
+#import "SubresourceLoader.h"
 
 namespace WebCore {
     
index 8af801c..55a4e54 100644 (file)
@@ -357,7 +357,7 @@ KJS::Bindings::Instance* FrameQt::getAppletInstanceForWidget(Widget*)
 
 KJS::Bindings::RootObject* FrameQt::bindingRootObject()
 {
-    ASSERT(jScriptEnabled());
+    ASSERT(javaScriptEnabled());
 
     if (!m_bindingRoot) {
         KJS::JSLock lock;
@@ -365,7 +365,7 @@ KJS::Bindings::RootObject* FrameQt::bindingRootObject()
 
         KJS::JSObject* win = KJS::Window::retrieveWindow(this);
         m_bindingRoot->setRootObjectImp(win);
-        m_bindingRoot->setInterpreter(jScript()->interpreter());
+        m_bindingRoot->setInterpreter(scriptProxy()->interpreter());
         addPluginRootObject(m_bindingRoot);
     }
 
index 086240a..e8d625f 100644 (file)
@@ -82,13 +82,13 @@ bool CheckIfReloading(WebCore::DocLoader* docLoader)
     return false;
 }
 
-void CheckCacheObjectStatus(DocLoader* docLoader, CachedResource* cachedObject)
+void CheckCacheObjectStatus(DocLoader* docLoader, CachedResource* cachedResource)
 {
     // Return from the function for objects that we didn't load from the cache.
-    if (!cachedObject)
+    if (!cachedResource)
         return;
 
-    switch (cachedObject->status()) {
+    switch (cachedResource->status()) {
         case CachedResource::Cached:
             break;
         case CachedResource::NotCached:
@@ -98,7 +98,7 @@ void CheckCacheObjectStatus(DocLoader* docLoader, CachedResource* cachedObject)
             return;
     }
 
-    // FIXME: Doesn't work at the moment! ASSERT(cachedObject->response());
+    // FIXME: Doesn't work at the moment! ASSERT(cachedResource->response());
 
     // FIXME: Notify the caller that we "loaded".
 }
index 1e884e5..7704d3c 100644 (file)
@@ -32,7 +32,7 @@
 #include "CachedImage.h"
 #include "CounterNode.h"
 #include "CounterResetNode.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "Document.h"
 #include "Element.h"
 #include "EventNames.h"
@@ -3055,7 +3055,7 @@ CounterNode* RenderObject::findCounter(const String& counterName, bool willNeedL
 UChar RenderObject::backslashAsCurrencySymbol() const
 {
     if (Node *node = element())
-        if (Decoder *decoder = node->document()->decoder())
+        if (TextResourceDecoder *decoder = node->document()->decoder())
             return decoder->encoding().backslashAsCurrencySymbol();
     return '\\';
 }
index b2f62fe..354aa87 100644 (file)
@@ -28,7 +28,7 @@
 #include "Cache.h"
 #include "CString.h"
 #include "DOMImplementation.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "DocLoader.h"
 #include "DocumentFragment.h"
 #include "Frame.h"
@@ -214,8 +214,8 @@ RefPtr<Document> XSLTProcessor::createDocumentFromSource(const DeprecatedString&
     }
     result->determineParseMode(documentSource); // Make sure we parse in the correct mode.
     
-    RefPtr<Decoder> decoder = new Decoder(sourceMIMEType);
-    decoder->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : TextEncoding(sourceEncoding), Decoder::EncodingFromXMLHeader);
+    RefPtr<TextResourceDecoder> decoder = new TextResourceDecoder(sourceMIMEType);
+    decoder->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : TextEncoding(sourceEncoding), TextResourceDecoder::EncodingFromXMLHeader);
     result->setDecoder(decoder.get());
     
     result->write(documentSource);
index b6560b3..02264b8 100644 (file)
@@ -24,7 +24,7 @@
 #include "CString.h"
 #include "Cache.h"
 #include "DOMImplementation.h"
-#include "Decoder.h"
+#include "TextResourceDecoder.h"
 #include "Event.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -569,12 +569,12 @@ void XMLHttpRequest::didReceiveData(ResourceHandle*, const char* data, int len)
             m_encoding = m_loader->responseEncoding();
     
         if (!m_encoding.isEmpty())
-            m_decoder = new Decoder("text/plain", m_encoding);
+            m_decoder = new TextResourceDecoder("text/plain", m_encoding);
         else if (responseIsXML())
-            // allow Decoder to look inside the m_response if it's XML
-            m_decoder = new Decoder("application/xml");
+            // allow TextResourceDecoder to look inside the m_response if it's XML
+            m_decoder = new TextResourceDecoder("application/xml");
         else
-            m_decoder = new Decoder("text/plain", "UTF-8");
+            m_decoder = new TextResourceDecoder("text/plain", "UTF-8");
     }
     if (len == 0)
         return;
index 7afd20b..fceb14e 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-class Decoder;
+class TextResourceDecoder;
 class Document;
 class EventListener;
 class String;
@@ -108,7 +108,7 @@ private:
 
     XMLHttpRequestState m_state;
 
-    RefPtr<Decoder> m_decoder;
+    RefPtr<TextResourceDecoder> m_decoder;
     String m_encoding;
     String m_responseHeaders;
     String m_mimeTypeOverride;
index 69ffac7..c3b225d 100644 (file)
@@ -1,5 +1,25 @@
 2006-10-29  Darin Adler  <darin@apple.com>
 
+        - update for the WebCore renames
+
+        * Plugins/WebNetscapePluginStream.mm:
+        * Plugins/WebPluginController.mm:
+        * WebCoreSupport/WebFrameBridge.mm:
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::willUseArchive):
+        (WebFrameLoaderClient::isArchiveLoadPending):
+        (WebFrameLoaderClient::cancelPendingArchiveLoad):
+        (WebFrameLoaderClient::deliverArchivedResources):
+        * WebCoreSupport/WebPageBridge.mm:
+        (-[WebPageBridge canRunModalNow]):
+        * WebView/WebDocumentLoaderMac.h:
+        * WebView/WebFrame.mm:
+        * WebView/WebHTMLRepresentation.m:
+        * WebView/WebView.mm:
+
+2006-10-29  Darin Adler  <darin@apple.com>
+
         Rubber stamped by Adam Roben.
 
         - renamed WebCore's WebFrameLoaderClient to match the class name inside it
index 7abae1b..d1ee1a9 100644 (file)
@@ -31,7 +31,7 @@
 #import <Foundation/NSURLConnection.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameMac.h>
-#import <WebCore/WebNetscapePlugInStreamLoader.h>
+#import <WebCore/NetscapePlugInStreamLoader.h>
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebFrameInternal.h>
index fafc8c9..c755529 100644 (file)
@@ -33,7 +33,7 @@
 #import <WebCore/FrameLoader.h>
 #import <WebCore/PlatformString.h>
 #import <WebCore/WebCoreFrameBridge.h>
-#import <WebCore/WebDocumentLoader.h>
+#import <WebCore/DocumentLoader.h>
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebFrameInternal.h>
index 5a44d2c..87aada3 100644 (file)
 #import <WebCore/Page.h>
 #import <WebCore/WebCoreFrameNamespaces.h>
 #import <WebCore/WebCoreSettings.h>
-#import <WebCore/WebDocumentLoader.h>
-#import <WebCore/WebFormDataStream.h>
-#import <WebCore/WebLoader.h>
-#import <WebCore/WebSubresourceLoader.h>
+#import <WebCore/DocumentLoader.h>
+#import <WebCore/FormDataStream.h>
+#import <WebCore/ResourceLoader.h>
+#import <WebCore/SubresourceLoader.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/RefPtr.h>
 
index 9b04ebb..2cb7db4 100644 (file)
 
 namespace WebCore {
     class String;
-    class WebResourceLoader;
+    class ResourceLoader;
 }
 
-typedef HashMap<RefPtr<WebCore::WebResourceLoader>, WebCore::RetainPtr<WebResource> > ResourceMap;
+typedef HashMap<RefPtr<WebCore::ResourceLoader>, WebCore::RetainPtr<WebResource> > ResourceMap;
 
 class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
 public:
@@ -175,9 +175,9 @@ private:
 
     virtual WebCore::String userAgent(NSURL *);
 
-    virtual bool willUseArchive(WebCore::WebResourceLoader*, NSURLRequest *, NSURL *originalURL) const;
-    virtual bool isArchiveLoadPending(WebCore::WebResourceLoader*) const;
-    virtual void cancelPendingArchiveLoad(WebCore::WebResourceLoader*);
+    virtual bool willUseArchive(WebCore::ResourceLoader*, NSURLRequest *, NSURL *originalURL) const;
+    virtual bool isArchiveLoadPending(WebCore::ResourceLoader*) const;
+    virtual void cancelPendingArchiveLoad(WebCore::ResourceLoader*);
     virtual void clearArchivedResources();
 
     virtual bool canHandleRequest(NSURLRequest *) const;
index ade0f64..59f2d66 100644 (file)
@@ -66,9 +66,9 @@
 #import <WebCore/PlatformString.h>
 #import <WebCore/WebCoreFrameBridge.h>
 #import <WebCore/WebDataProtocol.h>
-#import <WebCore/WebDocumentLoader.h>
+#import <WebCore/DocumentLoader.h>
 #import <WebCore/WebFormState.h>
-#import <WebCore/WebLoader.h>
+#import <WebCore/ResourceLoader.h>
 #import <WebKit/DOMElement.h>
 #import <WebKit/WebDefaultResourceLoadDelegate.h>
 #import <WebKit/WebDocumentLoaderMac.h>
@@ -836,7 +836,7 @@ void WebFrameLoaderClient::setDefersLoading(bool defers)
         deliverArchivedResourcesAfterDelay();
 }
 
-bool WebFrameLoaderClient::willUseArchive(WebResourceLoader* loader, NSURLRequest *request, NSURL *originalURL) const
+bool WebFrameLoaderClient::willUseArchive(ResourceLoader* loader, NSURLRequest *request, NSURL *originalURL) const
 {
     if (![[request URL] isEqual:originalURL])
         return false;
@@ -853,12 +853,12 @@ bool WebFrameLoaderClient::willUseArchive(WebResourceLoader* loader, NSURLReques
     return true;
 }
 
-bool WebFrameLoaderClient::isArchiveLoadPending(WebResourceLoader* loader) const
+bool WebFrameLoaderClient::isArchiveLoadPending(ResourceLoader* loader) const
 {
     return m_pendingArchivedResources.contains(loader);
 }
 
-void WebFrameLoaderClient::cancelPendingArchiveLoad(WebResourceLoader* loader)
+void WebFrameLoaderClient::cancelPendingArchiveLoad(ResourceLoader* loader)
 {
     if (m_pendingArchivedResources.isEmpty())
         return;
@@ -1112,7 +1112,7 @@ void WebFrameLoaderClient::deliverArchivedResources(Timer<WebFrameLoaderClient>*
 
     ResourceMap::const_iterator end = copy.end();
     for (ResourceMap::const_iterator it = copy.begin(); it != end; ++it) {
-        RefPtr<WebResourceLoader> loader = it->first;
+        RefPtr<ResourceLoader> loader = it->first;
         WebResource *resource = it->second.get();
         NSData *data = [[resource data] retain];
         loader->didReceiveResponse([resource _response]);
index 2d4f2b3..63600db 100644 (file)
@@ -39,7 +39,7 @@
 #import <JavaScriptCore/Assertions.h>
 #import <WebCore/Page.h>
 #import <WebCore/WebCoreFrameNamespaces.h>
-#import <WebCore/WebLoader.h>
+#import <WebCore/ResourceLoader.h>
 
 using namespace WebCore;
 
@@ -110,7 +110,7 @@ using namespace WebCore;
 
 - (BOOL)canRunModalNow
 {
-    return [self canRunModal] && !WebResourceLoader::inConnectionCallback();
+    return [self canRunModal] && !ResourceLoader::inConnectionCallback();
 }
 
 - (void)runModal
index aea3205..c3af978 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebCore/WebDocumentLoader.h>
+#import <WebCore/DocumentLoader.h>
 
 @class WebDataSource;
 
index 5d9f640..d7dc9b3 100644 (file)
@@ -66,7 +66,7 @@
 #import <WebCore/Page.h>
 #import <WebCore/SelectionController.h>
 #import <WebCore/WebDataProtocol.h>
-#import <WebCore/WebFormDataStream.h>
+#import <WebCore/FormDataStream.h>
 #import <WebCore/WebFormState.h>
 #import <WebKit/DOMDocument.h>
 #import <WebKit/DOMElement.h>
index 21d453f..7de5c54 100644 (file)
@@ -42,7 +42,7 @@
 #import <Foundation/NSURLResponse.h>
 #import <JavaScriptCore/Assertions.h>
 #import <WebCore/FrameMac.h>
-#import <WebCore/WebDocumentLoader.h>
+#import <WebCore/DocumentLoader.h>
 
 @interface WebHTMLRepresentationPrivate : NSObject
 {
index 4c025a9..92ee4d4 100644 (file)
@@ -95,7 +95,7 @@
 #import <WebCore/WebCoreTextRenderer.h>
 #import <WebCore/WebCoreView.h>
 #import <WebCore/WebDataProtocol.h>
-#import <WebCore/WebDocumentLoader.h>
+#import <WebCore/DocumentLoader.h>
 #import <WebKit/DOM.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>