Commit 5b2cbe11 authored by darin's avatar darin

WebCore:

        - 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: http://svn.webkit.org/repository/webkit/trunk@17431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fa8a3a46
......@@ -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
......
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).
......@@ -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
......
......@@ -1035,11 +1035,11 @@
>
</File>
<File
RelativePath="..\..\loader\Decoder.cpp"
RelativePath="..\..\loader\TextResourceDecoder.cpp"
>
</File>
<File
RelativePath="..\..\loader\Decoder.h"
RelativePath="..\..\loader\TextResourceDecoder.h"
>
</File>
<File
......@@ -1491,19 +1491,19 @@
>
</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
......
This diff is collapsed.
......@@ -129,7 +129,7 @@
loader/CachedResourceClientWalker.cpp
loader/CachedScript.cpp
loader/CachedXSLStyleSheet.cpp
loader/Decoder.cpp
loader/TextResourceDecoder.cpp
loader/DocLoader.cpp
loader/FormData.cpp
loader/ImageDocument.cpp
......@@ -170,8 +170,8 @@
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
......
......@@ -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);
}
}
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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);
......
......@@ -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.
......
......@@ -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];
}
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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"
......
......@@ -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)
{