Commit c5002665 authored by weinig@apple.com's avatar weinig@apple.com

WebCore:

        Reviewed by Darin Adler.

        Scrub URL out of the tree in preparation for renaming KURL to URL.
            - Renames Document::URL() -> Document::url()
            - Renames DocumentLoader::URL() -> DocumentLoader::url()
            - Renames KURL::url() to KURL::string() and KURL::deprecatedString()
            - Remove FrameLoader::URL()
            - Various variable renames.

        The change from Document::URL() to Document::url() required changes
        to the bindings scripts as well, because URL() is the name of a DOM
        method.  The code generation scripts now have code to special case URL()
        to url().

        * WebCore.base.exp:
        * bindings/js/kjs_events.cpp:
        (WebCore::JSLazyEventListener::parseCode):
        * bindings/js/kjs_navigator.cpp:
        (KJS::Navigator::getValueProperty):
        * bindings/js/kjs_proxy.cpp:
        (WebCore::KJSProxy::initScript):
        * bindings/js/kjs_window.cpp:
        (KJS::Window::put):
        (KJS::Window::allowsAccessFrom):
        (KJS::Location::put):
        (KJS::LocationProtoFuncReplace::callAsFunction):
        (KJS::LocationProtoFuncReload::callAsFunction):
        (KJS::LocationProtoFuncAssign::callAsFunction):
        * bindings/scripts/CodeGenerator.pm:
        * bindings/scripts/CodeGeneratorCOM.pm:
        * bindings/scripts/CodeGeneratorJS.pm:
        * bindings/scripts/CodeGeneratorObjC.pm:
        * css/CSSImportRule.cpp:
        (WebCore::CSSImportRule::insertedIntoParent):
        * css/CSSParser.cpp:
        (WebCore::CSSParser::parseValue):
        (WebCore::CSSParser::parseContent):
        (WebCore::CSSParser::parseBackgroundImage):
        (WebCore::CSSParser::parseFontFaceSrc):
        (WebCore::CSSParser::parseBorderImage):
        (WebCore::CSSParser::createImportRule):
        * css/CSSStyleSelector.cpp:
        (WebCore::CSSStyleSelector::setEncodedURL):
        * dom/Document.cpp:
        (WebCore::Document::processHttpEquiv):
        (WebCore::Document::cookie):
        (WebCore::Document::setCookie):
        (WebCore::Document::domain):
        (WebCore::Document::setDomain):
        (WebCore::Document::getImageMap):
        (WebCore::Document::completeURL):
        * dom/Document.h:
        (WebCore::Document::url):
        (WebCore::Document::baseURL):
        * dom/Element.cpp:
        (WebCore::Element::baseURI):
        * dom/ProcessingInstruction.h:
        * dom/StyledElement.cpp:
        (WebCore::StyledElement::addCSSImageProperty):
        * dom/StyledElement.h:
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::endElementNs):
        (WebCore::XMLTokenizer::end):
        (WebCore::):
        * dom/XMLTokenizer.h:
        * editing/Editor.cpp:
        (WebCore::Editor::copy):
        * editing/markup.cpp:
        (WebCore::completeURLs):
        * history/CachedPage.h:
        (WebCore::CachedPage::url):
        * history/HistoryItem.cpp:
        (WebCore::HistoryItem::HistoryItem):
        (WebCore::HistoryItem::setURL):
        (WebCore::HistoryItem::isCurrentDocument):
        * html/HTMLBaseElement.cpp:
        (WebCore::HTMLBaseElement::process):
        * html/HTMLParser.cpp:
        (WebCore::HTMLParser::reportErrorToConsole):
        * html/HTMLScriptElement.cpp:
        (WebCore::HTMLScriptElement::childrenChanged):
        (WebCore::HTMLScriptElement::insertedIntoDocument):
        (WebCore::HTMLScriptElement::evaluateScript):
        * html/HTMLScriptElement.h:
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::scriptExecution):
        * loader/Cache.cpp:
        (WebCore::createResource):
        (WebCore::Cache::requestResource):
        * loader/CachedCSSStyleSheet.cpp:
        (WebCore::CachedCSSStyleSheet::checkNotify):
        * loader/CachedResource.cpp:
        (WebCore::CachedResource::CachedResource):
        * loader/CachedResource.h:
        (WebCore::CachedResource::):
        * loader/CachedScript.h:
        * loader/DocLoader.cpp:
        (WebCore::DocLoader::checkForReload):
        (WebCore::DocLoader::requestResource):
        * loader/DocumentLoader.cpp:
        (WebCore::DocumentLoader::url):
        (WebCore::DocumentLoader::replaceRequestURLForAnchorScroll):
        (WebCore::DocumentLoader::setRequest):
        (WebCore::DocumentLoader::startLoadingMainResource):
        * loader/DocumentLoader.h:
        * loader/FrameLoader.cpp:
        (WebCore::FormSubmission::FormSubmission):
        (WebCore::ScheduledRedirection::ScheduledRedirection):
        (WebCore::FrameLoader::changeLocation):
        (WebCore::FrameLoader::urlSelected):
        (WebCore::FrameLoader::requestFrame):
        (WebCore::FrameLoader::loadSubframe):
        (WebCore::FrameLoader::submitFormAgain):
        (WebCore::FrameLoader::submitForm):
        (WebCore::FrameLoader::didExplicitOpen):
        (WebCore::FrameLoader::replaceContentsWithScriptResult):
        (WebCore::FrameLoader::executeScript):
        (WebCore::FrameLoader::receivedFirstData):
        (WebCore::FrameLoader::begin):
        (WebCore::FrameLoader::startIconLoader):
        (WebCore::FrameLoader::commitIconURLToIconDatabase):
        (WebCore::FrameLoader::scheduleRefresh):
        (WebCore::FrameLoader::redirectionTimerFired):
        (WebCore::FrameLoader::loadPlugin):
        (WebCore::FrameLoader::didNotOpenURL):
        (WebCore::FrameLoader::updatePolicyBaseURL):
        (WebCore::FrameLoader::scrollToAnchor):
        (WebCore::FrameLoader::startRedirectionTimer):
        (WebCore::FrameLoader::load):
        (WebCore::FrameLoader::canLoad):
        (WebCore::FrameLoader::shouldHideReferrer):
        (WebCore::FrameLoader::shouldAllowNavigation):
        (WebCore::FrameLoader::commitProvisionalLoad):
        (WebCore::FrameLoader::clientRedirected):
        (WebCore::FrameLoader::open):
        (WebCore::FrameLoader::didTellBridgeAboutLoad):
        (WebCore::FrameLoader::haveToldBridgeAboutLoad):
        (WebCore::FrameLoader::post):
        (WebCore::FrameLoader::loadResourceSynchronously):
        (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
        (WebCore::FrameLoader::shouldTreatURLAsSameAsCurrent):
        (WebCore::FrameLoader::createHistoryItem):
        (WebCore::FrameLoader::addBackForwardItemClippedAtTarget):
        (WebCore::FrameLoader::loadItem):
        (WebCore::FrameLoader::urlsMatchItem):
        (WebCore::FrameLoader::recursiveGoToItem):
        (WebCore::FrameLoader::updateHistoryForStandardLoad):
        (WebCore::FrameLoader::updateHistoryForRedirectWithLockedHistory):
        * loader/FrameLoader.h:
        (WebCore::FrameLoader::url):
        * loader/ImageDocument.cpp:
        (WebCore::ImageDocument::createDocumentStructure):
        * loader/MainResourceLoader.cpp:
        (WebCore::shouldLoadAsEmptyDocument):
        (WebCore::MainResourceLoader::didFinishLoading):
        * loader/NavigationAction.cpp:
        (WebCore::NavigationAction::NavigationAction):
        * loader/NavigationAction.h:
        (WebCore::NavigationAction::url):
        * loader/PluginDocument.cpp:
        (WebCore::PluginTokenizer::createDocumentStructure):
        * loader/SubresourceLoader.cpp:
        (WebCore::SubresourceLoader::load):
        (WebCore::SubresourceLoader::create):
        * loader/icon/IconLoader.cpp:
        (WebCore::IconLoader::startLoading):
        (WebCore::IconLoader::finishLoading):
        * loader/loader.cpp:
        (WebCore::Loader::servePendingRequests):
        * loader/mac/LoaderNSURLExtras.m:
        (urlOriginalData):
        * page/Chrome.cpp:
        (WebCore::Chrome::setToolTip):
        * page/ContextMenuController.cpp:
        (WebCore::ContextMenuController::contextMenuItemSelected):
        * page/Frame.cpp:
        (WebCore::Frame::setUserStyleSheetLocation):
        * page/InspectorController.cpp:
        (WebCore::InspectorResource::type):
        (WebCore::addSourceToFrame):
        (WebCore::InspectorController::addScriptResource):
        (WebCore::InspectorController::updateScriptResourceRequest):
        (WebCore::InspectorController::didCommitLoad):
        * page/mac/WebCoreFrameBridge.mm:
        (-[WebCoreFrameBridge getData:andResponse:forURL:]):
        * platform/KURL.h:
        (WebCore::KURL::string):
        (WebCore::KURL::deprecatedString):
        * platform/mac/ClipboardMac.mm:
        (WebCore::ClipboardMac::getData):
        * platform/mac/CookieJar.mm:
        (WebCore::cookies):
        (WebCore::setCookies):
        * platform/mac/PasteboardMac.mm:
        (WebCore::Pasteboard::writeURL):
        (WebCore::fileWrapperForImage):
        (WebCore::Pasteboard::writeImage):
        (WebCore::Pasteboard::plainText):
        * platform/network/ResourceHandle.cpp:
        (WebCore::ResourceHandle::portAllowed):
        * platform/network/ResourceRequestBase.cpp:
        (WebCore::ResourceRequestBase::isNull):
        * platform/network/cf/ResourceHandleCFNet.cpp:
        (WebCore::willSendRequest):
        (WebCore::didReceiveResponse):
        (WebCore::didReceiveData):
        (WebCore::didFinishLoading):
        (WebCore::didFail):
        (WebCore::didReceiveChallenge):
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::start):
        * platform/win/ClipboardUtilitiesWin.cpp:
        (WebCore::createGlobalData):
        (WebCore::urlToMarkup):
        * platform/win/ClipboardWin.cpp:
        (WebCore::writeURL):
        (WebCore::writeImageToDataObject):
        (WebCore::ClipboardWin::writeURL):
        (WebCore::ClipboardWin::writeRange):
        * platform/win/PasteboardWin.cpp:
        (WebCore::Pasteboard::writeSelection):
        (WebCore::Pasteboard::writeURL):
        * plugins/win/PluginDatabaseWin.cpp:
        (WebCore::PluginDatabaseWin::findPlugin):
        * plugins/win/PluginStreamWin.cpp:
        (WebCore::PluginStreamWin::startStream):
        (WebCore::PluginStreamWin::destroyStream):
        * plugins/win/PluginViewWin.cpp:
        (WebCore::scriptStringIfJavaScriptURL):
        (WebCore::PluginViewWin::performRequest):
        * svg/SVGImageLoader.cpp:
        (WebCore::SVGImageLoader::updateFromElement):
        * xml/XMLHttpRequest.cpp:
        (WebCore::XMLHttpRequest::getResponseXML):
        (WebCore::XMLHttpRequest::urlMatchesDocumentDomain):
        * xml/XSLImportRule.cpp:
        (WebCore::XSLImportRule::loadSheet):
        * xml/XSLTProcessor.cpp:
        (WebCore::XSLTProcessor::createDocumentFromSource):
        (WebCore::xsltStylesheetPointer):
        (WebCore::xmlDocPtrFromNode):

WebKit/mac:

        Reviewed by Darin Adler.

        Scrub URL out of the tree in preparation for renaming KURL to URL.

        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::actionDictionary):
        * WebView/WebDataSource.mm:
        (-[WebDataSource _URL]):
        * WebView/WebView.mm:
        (-[WebView _dispatchDidReceiveIconFromWebFrame:]):

WebKit/win:

        Reviewed by Darin Adler.

        Scrub URL out of the tree in preparation for renaming KURL to URL.

        * WebFrame.cpp:
        (WebFrame::url):
        (WebFrame::dispatchWillPerformClientRedirect):
        (WebFrame::setTitle):
        (WebFrame::updateGlobalHistoryForStandardLoad):
        (WebFrame::updateGlobalHistoryForReload):
        (WebFrame::cancelledError):
        (WebFrame::blockedError):
        (WebFrame::interruptForPolicyChangeError):
        (WebFrame::createPlugin):
        * WebView.cpp:
        (WebView::notifyDidAddIcon):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@28639 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2895fb6c
2007-12-11 Sam Weinig <sam@webkit.org>
Reviewed by Darin Adler.
Scrub URL out of the tree in preparation for renaming KURL to URL.
- Renames Document::URL() -> Document::url()
- Renames DocumentLoader::URL() -> DocumentLoader::url()
- Renames KURL::url() to KURL::string() and KURL::deprecatedString()
- Remove FrameLoader::URL()
- Various variable renames.
The change from Document::URL() to Document::url() required changes
to the bindings scripts as well, because URL() is the name of a DOM
method. The code generation scripts now have code to special case URL()
to url().
* WebCore.base.exp:
* bindings/js/kjs_events.cpp:
(WebCore::JSLazyEventListener::parseCode):
* bindings/js/kjs_navigator.cpp:
(KJS::Navigator::getValueProperty):
* bindings/js/kjs_proxy.cpp:
(WebCore::KJSProxy::initScript):
* bindings/js/kjs_window.cpp:
(KJS::Window::put):
(KJS::Window::allowsAccessFrom):
(KJS::Location::put):
(KJS::LocationProtoFuncReplace::callAsFunction):
(KJS::LocationProtoFuncReload::callAsFunction):
(KJS::LocationProtoFuncAssign::callAsFunction):
* bindings/scripts/CodeGenerator.pm:
* bindings/scripts/CodeGeneratorCOM.pm:
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/CodeGeneratorObjC.pm:
* css/CSSImportRule.cpp:
(WebCore::CSSImportRule::insertedIntoParent):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseBackgroundImage):
(WebCore::CSSParser::parseFontFaceSrc):
(WebCore::CSSParser::parseBorderImage):
(WebCore::CSSParser::createImportRule):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::setEncodedURL):
* dom/Document.cpp:
(WebCore::Document::processHttpEquiv):
(WebCore::Document::cookie):
(WebCore::Document::setCookie):
(WebCore::Document::domain):
(WebCore::Document::setDomain):
(WebCore::Document::getImageMap):
(WebCore::Document::completeURL):
* dom/Document.h:
(WebCore::Document::url):
(WebCore::Document::baseURL):
* dom/Element.cpp:
(WebCore::Element::baseURI):
* dom/ProcessingInstruction.h:
* dom/StyledElement.cpp:
(WebCore::StyledElement::addCSSImageProperty):
* dom/StyledElement.h:
* dom/XMLTokenizer.cpp:
(WebCore::XMLTokenizer::endElementNs):
(WebCore::XMLTokenizer::end):
(WebCore::):
* dom/XMLTokenizer.h:
* editing/Editor.cpp:
(WebCore::Editor::copy):
* editing/markup.cpp:
(WebCore::completeURLs):
* history/CachedPage.h:
(WebCore::CachedPage::url):
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
(WebCore::HistoryItem::setURL):
(WebCore::HistoryItem::isCurrentDocument):
* html/HTMLBaseElement.cpp:
(WebCore::HTMLBaseElement::process):
* html/HTMLParser.cpp:
(WebCore::HTMLParser::reportErrorToConsole):
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::childrenChanged):
(WebCore::HTMLScriptElement::insertedIntoDocument):
(WebCore::HTMLScriptElement::evaluateScript):
* html/HTMLScriptElement.h:
* html/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::scriptExecution):
* loader/Cache.cpp:
(WebCore::createResource):
(WebCore::Cache::requestResource):
* loader/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::checkNotify):
* loader/CachedResource.cpp:
(WebCore::CachedResource::CachedResource):
* loader/CachedResource.h:
(WebCore::CachedResource::):
* loader/CachedScript.h:
* loader/DocLoader.cpp:
(WebCore::DocLoader::checkForReload):
(WebCore::DocLoader::requestResource):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::url):
(WebCore::DocumentLoader::replaceRequestURLForAnchorScroll):
(WebCore::DocumentLoader::setRequest):
(WebCore::DocumentLoader::startLoadingMainResource):
* loader/DocumentLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FormSubmission::FormSubmission):
(WebCore::ScheduledRedirection::ScheduledRedirection):
(WebCore::FrameLoader::changeLocation):
(WebCore::FrameLoader::urlSelected):
(WebCore::FrameLoader::requestFrame):
(WebCore::FrameLoader::loadSubframe):
(WebCore::FrameLoader::submitFormAgain):
(WebCore::FrameLoader::submitForm):
(WebCore::FrameLoader::didExplicitOpen):
(WebCore::FrameLoader::replaceContentsWithScriptResult):
(WebCore::FrameLoader::executeScript):
(WebCore::FrameLoader::receivedFirstData):
(WebCore::FrameLoader::begin):
(WebCore::FrameLoader::startIconLoader):
(WebCore::FrameLoader::commitIconURLToIconDatabase):
(WebCore::FrameLoader::scheduleRefresh):
(WebCore::FrameLoader::redirectionTimerFired):
(WebCore::FrameLoader::loadPlugin):
(WebCore::FrameLoader::didNotOpenURL):
(WebCore::FrameLoader::updatePolicyBaseURL):
(WebCore::FrameLoader::scrollToAnchor):
(WebCore::FrameLoader::startRedirectionTimer):
(WebCore::FrameLoader::load):
(WebCore::FrameLoader::canLoad):
(WebCore::FrameLoader::shouldHideReferrer):
(WebCore::FrameLoader::shouldAllowNavigation):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::clientRedirected):
(WebCore::FrameLoader::open):
(WebCore::FrameLoader::didTellBridgeAboutLoad):
(WebCore::FrameLoader::haveToldBridgeAboutLoad):
(WebCore::FrameLoader::post):
(WebCore::FrameLoader::loadResourceSynchronously):
(WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
(WebCore::FrameLoader::shouldTreatURLAsSameAsCurrent):
(WebCore::FrameLoader::createHistoryItem):
(WebCore::FrameLoader::addBackForwardItemClippedAtTarget):
(WebCore::FrameLoader::loadItem):
(WebCore::FrameLoader::urlsMatchItem):
(WebCore::FrameLoader::recursiveGoToItem):
(WebCore::FrameLoader::updateHistoryForStandardLoad):
(WebCore::FrameLoader::updateHistoryForRedirectWithLockedHistory):
* loader/FrameLoader.h:
(WebCore::FrameLoader::url):
* loader/ImageDocument.cpp:
(WebCore::ImageDocument::createDocumentStructure):
* loader/MainResourceLoader.cpp:
(WebCore::shouldLoadAsEmptyDocument):
(WebCore::MainResourceLoader::didFinishLoading):
* loader/NavigationAction.cpp:
(WebCore::NavigationAction::NavigationAction):
* loader/NavigationAction.h:
(WebCore::NavigationAction::url):
* loader/PluginDocument.cpp:
(WebCore::PluginTokenizer::createDocumentStructure):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::load):
(WebCore::SubresourceLoader::create):
* loader/icon/IconLoader.cpp:
(WebCore::IconLoader::startLoading):
(WebCore::IconLoader::finishLoading):
* loader/loader.cpp:
(WebCore::Loader::servePendingRequests):
* loader/mac/LoaderNSURLExtras.m:
(urlOriginalData):
* page/Chrome.cpp:
(WebCore::Chrome::setToolTip):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
* page/Frame.cpp:
(WebCore::Frame::setUserStyleSheetLocation):
* page/InspectorController.cpp:
(WebCore::InspectorResource::type):
(WebCore::addSourceToFrame):
(WebCore::InspectorController::addScriptResource):
(WebCore::InspectorController::updateScriptResourceRequest):
(WebCore::InspectorController::didCommitLoad):
* page/mac/WebCoreFrameBridge.mm:
(-[WebCoreFrameBridge getData:andResponse:forURL:]):
* platform/KURL.h:
(WebCore::KURL::string):
(WebCore::KURL::deprecatedString):
* platform/mac/ClipboardMac.mm:
(WebCore::ClipboardMac::getData):
* platform/mac/CookieJar.mm:
(WebCore::cookies):
(WebCore::setCookies):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::writeURL):
(WebCore::fileWrapperForImage):
(WebCore::Pasteboard::writeImage):
(WebCore::Pasteboard::plainText):
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::portAllowed):
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::isNull):
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::willSendRequest):
(WebCore::didReceiveResponse):
(WebCore::didReceiveData):
(WebCore::didFinishLoading):
(WebCore::didFail):
(WebCore::didReceiveChallenge):
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::start):
* platform/win/ClipboardUtilitiesWin.cpp:
(WebCore::createGlobalData):
(WebCore::urlToMarkup):
* platform/win/ClipboardWin.cpp:
(WebCore::writeURL):
(WebCore::writeImageToDataObject):
(WebCore::ClipboardWin::writeURL):
(WebCore::ClipboardWin::writeRange):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeSelection):
(WebCore::Pasteboard::writeURL):
* plugins/win/PluginDatabaseWin.cpp:
(WebCore::PluginDatabaseWin::findPlugin):
* plugins/win/PluginStreamWin.cpp:
(WebCore::PluginStreamWin::startStream):
(WebCore::PluginStreamWin::destroyStream):
* plugins/win/PluginViewWin.cpp:
(WebCore::scriptStringIfJavaScriptURL):
(WebCore::PluginViewWin::performRequest):
* svg/SVGImageLoader.cpp:
(WebCore::SVGImageLoader::updateFromElement):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::getResponseXML):
(WebCore::XMLHttpRequest::urlMatchesDocumentDomain):
* xml/XSLImportRule.cpp:
(WebCore::XSLImportRule::loadSheet):
* xml/XSLTProcessor.cpp:
(WebCore::XSLTProcessor::createDocumentFromSource):
(WebCore::xsltStylesheetPointer):
(WebCore::xmlDocPtrFromNode):
2007-12-11 Beth Dakin <bdakin@apple.com>
Reviewed by Darin.
......
......@@ -612,7 +612,7 @@ __ZNK7WebCore14DocumentLoader17mainDocumentErrorEv
__ZNK7WebCore14DocumentLoader19isLoadingInAPISenseEv
__ZNK7WebCore14DocumentLoader19originalRequestCopyEv
__ZNK7WebCore14DocumentLoader21isLoadingMainResourceEv
__ZNK7WebCore14DocumentLoader3URLEv
__ZNK7WebCore14DocumentLoader3urlEv
__ZNK7WebCore14DocumentLoader5titleEv
__ZNK7WebCore14DocumentLoader8responseEv
__ZNK7WebCore14DocumentLoader9isLoadingEv
......
......@@ -300,7 +300,7 @@ void JSLazyEventListener::parseCode() const
JSObject* constr = proxy->globalObject()->functionConstructor();
List args;
UString sourceURL(frame->loader()->url().url());
UString sourceURL(frame->loader()->url().string());
args.append(eventParameterName());
args.append(jsString(m_code));
m_listener = constr->construct(exec, args, m_functionName, sourceURL, m_lineNumber); // FIXME: is globalExec ok ?
......
......@@ -195,7 +195,7 @@ JSValue* Navigator::getValueProperty(ExecState* exec, int token) const
return jsString("Netscape");
case AppVersion: {
// Version is everything in the user agent string past the "Mozilla/" prefix.
const String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL());
const String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL());
return jsString(userAgent.substring(userAgent.find('/') + 1));
}
case Product:
......@@ -209,7 +209,7 @@ JSValue* Navigator::getValueProperty(ExecState* exec, int token) const
case Language:
return jsString(defaultLanguage());
case UserAgent:
return jsString(m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL()));
return jsString(m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL()));
case Platform:
return jsString(WEBCORE_NAVIGATOR_PLATFORM);
case _Plugins:
......
......@@ -151,7 +151,7 @@ void KJSProxy::initScript()
m_globalObject = new JSDOMWindow(m_frame->domWindow());
// FIXME: We can get rid of this (and eliminate compatMode entirely).
String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL());
String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL());
if (userAgent.find("Microsoft") >= 0 || userAgent.find("MSIE") >= 0)
m_globalObject->setCompatMode(IECompat);
else {
......
......@@ -684,7 +684,7 @@ void Window::put(ExecState* exec, const Identifier& propertyName, JSValue* value
if (p) {
if (!p->loader()->shouldAllowNavigation(impl()->frame()))
return;
DeprecatedString dstUrl = p->loader()->completeURL(DeprecatedString(value->toString(exec))).url();
String dstUrl = p->loader()->completeURL(value->toString(exec)).string();
if (!dstUrl.startsWith("javascript:", false) || allowsAccessFrom(exec)) {
bool userGesture = p->scriptProxy()->processingUserGesture();
// We want a new history item if this JS was called via a user gesture
......@@ -833,7 +833,7 @@ bool Window::allowsAccessFrom(const JSGlobalObject* other) const
if (!targetFrame->settings()->privateBrowsingEnabled()) {
// FIXME: this error message should contain more specifics of why the same origin check has failed.
String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains, protocols and ports must match.\n",
targetDocument->URL().utf8().data(), originDocument->URL().utf8().data());
targetDocument->url().utf8().data(), originDocument->url().utf8().data());
if (Interpreter::shouldPrintExceptions())
printf("%s", message.utf8().data());
......@@ -1528,7 +1528,7 @@ void Location::put(ExecState* exec, const Identifier& propertyName, JSValue* val
return;
if (!frame->loader()->shouldAllowNavigation(m_frame))
return;
url = frame->loader()->completeURL(str).url();
url = frame->loader()->completeURL(str);
break;
}
case Hash: {
......@@ -1570,9 +1570,9 @@ void Location::put(ExecState* exec, const Identifier& propertyName, JSValue* val
}
Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
if (!url.url().startsWith("javascript:", false) || sameDomainAccess) {
if (!url.deprecatedString().startsWith("javascript:", false) || sameDomainAccess) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
m_frame->loader()->scheduleLocationChange(url.url(), activeFrame->loader()->outgoingReferrer(), false, userGesture);
m_frame->loader()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), false, userGesture);
}
}
......@@ -1593,7 +1593,7 @@ JSValue* LocationProtoFuncReplace::callAsFunction(ExecState* exec, JSObject* thi
const Window* window = Window::retrieveWindow(frame);
if (!str.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
frame->loader()->scheduleLocationChange(activeFrame->loader()->completeURL(str).url(), activeFrame->loader()->outgoingReferrer(), true, userGesture);
frame->loader()->scheduleLocationChange(activeFrame->loader()->completeURL(str).string(), activeFrame->loader()->outgoingReferrer(), true, userGesture);
}
}
......@@ -1613,9 +1613,9 @@ JSValue* LocationProtoFuncReload::callAsFunction(ExecState* exec, JSObject* this
if (!window->allowsAccessFrom(exec))
return jsUndefined();
if (!frame->loader()->url().url().startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
bool userGesture = Window::retrieveActive(exec)->impl()->frame()->scriptProxy()->processingUserGesture();
frame->loader()->scheduleRefresh(userGesture);
if (!frame->loader()->url().deprecatedString().startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
bool userGesture = Window::retrieveActive(exec)->impl()->frame()->scriptProxy()->processingUserGesture();
frame->loader()->scheduleRefresh(userGesture);
}
return jsUndefined();
}
......@@ -1634,7 +1634,7 @@ JSValue* LocationProtoFuncAssign::callAsFunction(ExecState* exec, JSObject* this
if (!activeFrame->loader()->shouldAllowNavigation(frame))
return jsUndefined();
const Window* window = Window::retrieveWindow(frame);
DeprecatedString dstUrl = activeFrame->loader()->completeURL(DeprecatedString(args[0]->toString(exec))).url();
String dstUrl = activeFrame->loader()->completeURL(args[0]->toString(exec)).string();
if (!dstUrl.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
// We want a new history item if this JS was called via a user gesture
......
#
# KDOM IDL parser
# WebKit IDL parser
#
# Copyright (C) 2005 Nikolas Zimmermann <wildfox@kde.org>
# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
#
# This file is part of the KDE project
# Copyright (C) 2007 Apple Inc. All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
......@@ -359,4 +358,24 @@ sub ScanDirectory
}
}
# Uppercase the first letter while respecting WebKit style guidelines.
# E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.
sub WK_ucfirst
{
my ($object, $param) = @_;
my $ret = ucfirst($param);
$ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
return $ret;
}
# Lowercase the first letter while respecting WebKit style guidelines.
# URL becomes url, but SetURL becomes setURL.
sub WK_lcfirst
{
my ($object, $param) = @_;
my $ret = lcfirst($param);
$ret =~ s/uRL/url/;
return $ret;
}
1;
......@@ -616,7 +616,7 @@ sub GenerateCPPAttribute
push(@getterImplementation, " if (!result)\n");
push(@getterImplementation, " return E_POINTER;\n\n");
my $implementationGetter = "impl${implementationClassWithoutNamespace}()->${attributeName}(" . ($hasGetterException ? "ec" : ""). ")";
my $implementationGetter = "impl${implementationClassWithoutNamespace}()->" . $codeGenerator->WK_lcfirst($attributeName) . "(" . ($hasGetterException ? "ec" : ""). ")";
push(@getterImplementation, " WebCore::ExceptionCode ec = 0;\n") if $hasGetterException;
......@@ -763,7 +763,7 @@ sub GenerateCPPFunction
}
my $callSigBegin = " ";
my $callSigMiddle = "${implementationGetter}->${functionName}(" . join(", ", @parameterList) . ")";
my $callSigMiddle = "${implementationGetter}->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterList) . ")";
my $callSigEnd = ";\n";
if (defined $needsCustom{"NodeToReturn"}) {
......@@ -1218,7 +1218,7 @@ sub WriteData
print OUTPUTIDL @IDLHeader;
# Add forward declarations and imorts
delete $IDLForwardDeclarations{keys(%IDLDontForwardDeclare)};
delete $IDLForwardDeclarations{keys(%IDLDontForwardDeclare)};
delete $IDLImports{keys(%IDLDontImport)};
print OUTPUTIDL map { "cpp_quote(\"interface $_;\")\n" } sort keys(%IDLForwardDeclarations);
......
......@@ -81,16 +81,6 @@ sub leftShift($$) {
return (($value << $distance) & 0xFFFFFFFF);
}
# Uppercase the first letter, while respecting WebKit style guidelines.
# E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.
sub WK_ucfirst
{
my $param = shift;
my $ret = ucfirst($param);
$ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
return $ret;
}
# Params: 'domClass' struct
sub GenerateInterface
{
......@@ -410,9 +400,9 @@ sub GenerateHeader
push(@headerContent, "\n ");
}
my $value = $attribute->signature->type =~ /Constructor$/
? $attribute->signature->name . "ConstructorAttrNum"
: WK_ucfirst($attribute->signature->name) . "AttrNum";
my $value = $codeGenerator->WK_ucfirst($attribute->signature->name)
. ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
. "AttrNum";
$value .= ", " if (($i < $numAttributes - 1) or (($i eq $numAttributes - 1) and (($numFunctions ne 0) or $dataNode->extendedAttributes->{"GenerateConstructor"})));
push(@headerContent, $value);
}
......@@ -431,15 +421,15 @@ sub GenerateHeader
foreach my $attribute (@{$dataNode->attributes}) {
if ($attribute->signature->extendedAttributes->{"Custom"}) {
push(@headerContent, " KJS::JSValue* " . $attribute->signature->name . "(KJS::ExecState*) const;\n");
push(@headerContent, " KJS::JSValue* " . $codeGenerator->WK_lcfirst($attribute->signature->name) . "(KJS::ExecState*) const;\n");
if ($attribute->type !~ /^readonly/) {
push(@headerContent, " void set" . WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
push(@headerContent, " void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
}
} elsif ($attribute->signature->extendedAttributes->{"CustomGetter"}) {
push(@headerContent, " KJS::JSValue* " . $attribute->signature->name . "(KJS::ExecState*) const;\n");
push(@headerContent, " KJS::JSValue* " . $codeGenerator->WK_lcfirst($attribute->signature->name) . "(KJS::ExecState*) const;\n");
} elsif ($attribute->signature->extendedAttributes->{"CustomSetter"}) {
if ($attribute->type !~ /^readonly/) {
push(@headerContent, " void set" . WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
push(@headerContent, " void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
}
}
}
......@@ -453,7 +443,7 @@ sub GenerateHeader
push(@headerContent, "\n // Custom functions\n");
foreach my $function (@{$dataNode->functions}) {
if ($function->signature->extendedAttributes->{"Custom"}) {
push(@headerContent, " KJS::JSValue* " . $function->signature->name . "(KJS::ExecState*, const KJS::List&);\n");
push(@headerContent, " KJS::JSValue* " . $codeGenerator->WK_lcfirst($function->signature->name) . "(KJS::ExecState*, const KJS::List&);\n");
}
}
}
......@@ -551,7 +541,7 @@ sub GenerateHeader
if ($numFunctions > 0) {
push(@headerContent,"// Functions\n\n");
foreach my $function (@{$dataNode->functions}) {
push(@headerContent, prototypeFunctionFor($className, WK_ucfirst($function->signature->name)));
push(@headerContent, prototypeFunctionFor($className, $codeGenerator->WK_ucfirst($function->signature->name)));
}
}
......@@ -622,9 +612,9 @@ sub GenerateImplementation
my $name = $attribute->signature->name;
push(@hashKeys, $name);
my $value = $className . "::" . ($attribute->signature->type =~ /Constructor$/
? $attribute->signature->name . "ConstructorAttrNum"
: WK_ucfirst($attribute->signature->name) . "AttrNum");
my $value = $className . "::" . $codeGenerator->WK_ucfirst($attribute->signature->name)
. ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
. "AttrNum";
push(@hashValues, $value);
my @specials = ();
......@@ -714,7 +704,7 @@ sub GenerateImplementation
my $name = $function->signature->name;
push(@hashKeys, $name);
my $value = "&" . $className . "PrototypeFunction" . WK_ucfirst($name) . "::create";
my $value = "&" . $className . "PrototypeFunction" . $codeGenerator->WK_ucfirst($name) . "::create";
push(@hashValues, $value);
my @specials = ();
......@@ -907,18 +897,16 @@ sub GenerateImplementation
push(@implContent, " switch (token) {\n");
foreach my $attribute (@{$dataNode->attributes}) {
my $name = $attribute->signature->name;
my $getterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->name);
my $implClassNameForValueConversion = "";
if (!$podType and ($codeGenerator->IsSVGAnimatedType($implClassName) or $attribute->type !~ /^readonly/)) {
$implClassNameForValueConversion = $implClassName;
}
if ($attribute->signature->type =~ /Constructor$/) {
push(@implContent, " case " . $name . "ConstructorAttrNum: {\n");
} else {
push(@implContent, " case " . WK_ucfirst($name) . "AttrNum: {\n");
}
push(@implContent, " case " . $codeGenerator->WK_ucfirst($attribute->signature->name)
. ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
. "AttrNum: {\n");
if ($dataNode->extendedAttributes->{"CheckDomainSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurity"}) {
push(@implContent, " if (!allowsAccessFrom(exec))\n");
......@@ -926,33 +914,32 @@ sub GenerateImplementation
}
if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"CustomGetter"}) {
push(@implContent, " return $name(exec);\n");
push(@implContent, " return $getterFunctionName(exec);\n");
} elsif ($attribute->signature->extendedAttributes->{"CheckNodeSecurity"}) {
$implIncludes{"kjs_dom.h"} = 1;
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
push(@implContent, " return checkNodeSecurity(exec, imp->$name()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name()") . " : jsUndefined();\n");
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n");
push(@implContent, " return checkNodeSecurity(exec, imp->$getterFunctionName()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
} elsif ($attribute->signature->extendedAttributes->{"CheckFrameSecurity"}) {
$implIncludes{"Document.h"} = 1;
$implIncludes{"kjs_dom.h"} = 1;
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
push(@implContent, " return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name()") . " : jsUndefined();\n");
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n");
push(@implContent, " return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
} elsif ($attribute->signature->type =~ /Constructor$/) {
my $constructorType = $codeGenerator->StripModule($attribute->signature->type);
$constructorType =~ s/Constructor$//;
push(@implContent, " return JS" . $constructorType . "::getConstructor(exec);\n");
} elsif (!@{$attribute->getterExceptions}) {
if ($podType) {
push(@implContent, " $podType imp(*impl());\n\n");
push(@implContent, " $podType imp(*impl());\n");
if ($podType eq "float") { # Special case for JSSVGNumber
push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp") . ";\n");
} else {
push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$name()") . ";\n");
push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$getterFunctionName()") . ";\n");
}
} else {
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(impl());\n");
my $type = $codeGenerator->StripModule($attribute->signature->type);
my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name()");
my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()");
if ($codeGenerator->IsSVGAnimatedType($type)) {
push(@implContent, " RefPtr<$type> obj = $jsType;\n");