WebCore:
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 07:26:19 +0000 (07:26 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 07:26:19 +0000 (07:26 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@28639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

86 files changed:
WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/bindings/js/kjs_events.cpp
WebCore/bindings/js/kjs_navigator.cpp
WebCore/bindings/js/kjs_proxy.cpp
WebCore/bindings/js/kjs_window.cpp
WebCore/bindings/scripts/CodeGenerator.pm
WebCore/bindings/scripts/CodeGeneratorCOM.pm
WebCore/bindings/scripts/CodeGeneratorJS.pm
WebCore/bindings/scripts/CodeGeneratorObjC.pm
WebCore/css/CSSImportRule.cpp
WebCore/css/CSSParser.cpp
WebCore/css/CSSStyleSelector.cpp
WebCore/dom/Document.cpp
WebCore/dom/Document.h
WebCore/dom/Element.cpp
WebCore/dom/ProcessingInstruction.h
WebCore/dom/StyledElement.cpp
WebCore/dom/StyledElement.h
WebCore/dom/XMLTokenizer.cpp
WebCore/dom/XMLTokenizer.h
WebCore/editing/Editor.cpp
WebCore/editing/markup.cpp
WebCore/history/CachedPage.h
WebCore/history/HistoryItem.cpp
WebCore/html/HTMLBaseElement.cpp
WebCore/html/HTMLParser.cpp
WebCore/html/HTMLScriptElement.cpp
WebCore/html/HTMLScriptElement.h
WebCore/html/HTMLTokenizer.cpp
WebCore/loader/Cache.cpp
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedResource.cpp
WebCore/loader/CachedResource.h
WebCore/loader/CachedScript.h
WebCore/loader/DocLoader.cpp
WebCore/loader/DocumentLoader.cpp
WebCore/loader/DocumentLoader.h
WebCore/loader/FrameLoader.cpp
WebCore/loader/FrameLoader.h
WebCore/loader/ImageDocument.cpp
WebCore/loader/MainResourceLoader.cpp
WebCore/loader/NavigationAction.cpp
WebCore/loader/NavigationAction.h
WebCore/loader/PluginDocument.cpp
WebCore/loader/SubresourceLoader.cpp
WebCore/loader/icon/IconLoader.cpp
WebCore/loader/loader.cpp
WebCore/loader/mac/LoaderNSURLExtras.m
WebCore/page/Chrome.cpp
WebCore/page/ContextMenuController.cpp
WebCore/page/Frame.cpp
WebCore/page/InspectorController.cpp
WebCore/page/mac/WebCoreFrameBridge.mm
WebCore/platform/KURL.h
WebCore/platform/mac/ClipboardMac.mm
WebCore/platform/mac/CookieJar.mm
WebCore/platform/mac/PasteboardMac.mm
WebCore/platform/network/ResourceHandle.cpp
WebCore/platform/network/ResourceRequestBase.cpp
WebCore/platform/network/cf/ResourceHandleCFNet.cpp
WebCore/platform/win/ClipboardUtilitiesWin.cpp
WebCore/platform/win/ClipboardWin.cpp
WebCore/platform/win/PasteboardWin.cpp
WebCore/plugins/win/PluginDatabaseWin.cpp
WebCore/plugins/win/PluginStreamWin.cpp
WebCore/plugins/win/PluginViewWin.cpp
WebCore/svg/SVGImageLoader.cpp
WebCore/xml/XMLHttpRequest.cpp
WebCore/xml/XSLImportRule.cpp
WebCore/xml/XSLTProcessor.cpp
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
WebKit/mac/WebView/WebDataSource.mm
WebKit/mac/WebView/WebView.mm
WebKit/win/ChangeLog
WebKit/win/MarshallingHelpers.cpp
WebKit/win/WebActionPropertyBag.cpp
WebKit/win/WebDataSource.cpp
WebKit/win/WebDownload.cpp
WebKit/win/WebDragClient.cpp
WebKit/win/WebElementPropertyBag.cpp
WebKit/win/WebFrame.cpp
WebKit/win/WebResource.cpp
WebKit/win/WebURLResponse.cpp
WebKit/win/WebView.cpp

index 642c8dc..388f2ab 100644 (file)
@@ -1,3 +1,248 @@
+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.
index 6731022..0eb39cf 100644 (file)
@@ -612,7 +612,7 @@ __ZNK7WebCore14DocumentLoader17mainDocumentErrorEv
 __ZNK7WebCore14DocumentLoader19isLoadingInAPISenseEv
 __ZNK7WebCore14DocumentLoader19originalRequestCopyEv
 __ZNK7WebCore14DocumentLoader21isLoadingMainResourceEv
-__ZNK7WebCore14DocumentLoader3URLEv
+__ZNK7WebCore14DocumentLoader3urlEv
 __ZNK7WebCore14DocumentLoader5titleEv
 __ZNK7WebCore14DocumentLoader8responseEv
 __ZNK7WebCore14DocumentLoader9isLoadingEv
index 8fded9d..e29bd87 100644 (file)
@@ -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 ?
index 2d9c60a..253fbf6 100644 (file)
@@ -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:
index dc466c7..af55973 100644 (file)
@@ -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 {
index c719280..6a6254b 100644 (file)
@@ -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
index 31f4a6d..3704bcd 100644 (file)
@@ -1,10 +1,9 @@
 # 
-# 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;
index d5a25b7..ebaec67 100644 (file)
@@ -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)};\r
+    delete $IDLForwardDeclarations{keys(%IDLDontForwardDeclare)};
     delete $IDLImports{keys(%IDLDontImport)};
 
     print OUTPUTIDL map { "cpp_quote(\"interface $_;\")\n" } sort keys(%IDLForwardDeclarations);
index 7ec5626..0f62af7 100644 (file)
@@ -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");
                         push(@implContent, "        return toJS(exec, obj.get(), imp);\n");
@@ -964,11 +951,11 @@ sub GenerateImplementation
                 push(@implContent, "        ExceptionCode ec = 0;\n");
 
                 if ($podType) {
-                    push(@implContent, "        $podType imp(*impl());\n\n");
-                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$name(ec)") . ";\n");
+                    push(@implContent, "        $podType imp(*impl());\n");
+                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$getterFunctionName(ec)") . ";\n");
                 } else {
-                    push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
-                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name(ec)") . ";\n");
+                    push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
+                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName(ec)") . ";\n");
                 }
 
                 push(@implContent, "        setDOMException(exec, ec);\n");
@@ -1017,12 +1004,11 @@ sub GenerateImplementation
             foreach my $attribute (@{$dataNode->attributes}) {
                 if ($attribute->type !~ /^readonly/) {
                     my $name = $attribute->signature->name;
+                    my $setterFunctionName = $codeGenerator->WK_ucfirst($name);
 
-                    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");
@@ -1030,7 +1016,7 @@ sub GenerateImplementation
                     }
 
                     if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"CustomSetter"}) {
-                        push(@implContent, "        set" . WK_ucfirst($name) . "(exec, value);\n");
+                        push(@implContent, "        set$setterFunctionName(exec, value);\n");
                     } elsif ($attribute->signature->type =~ /Constructor$/) {
                         my $constructorType = $attribute->signature->type;
                         $constructorType =~ s/Constructor$//;
@@ -1041,17 +1027,17 @@ sub GenerateImplementation
                         push(@implContent, "        JSObject::put(exec, \"$name\", value);\n");
                     } else {
                         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, "        imp = " . JSValueToNative($attribute->signature, "value") . ";\n");
                             } else {
-                                push(@implContent, "        imp.set" . WK_ucfirst($name) . "(" . JSValueToNative($attribute->signature, "value") . ");\n");
+                                push(@implContent, "        imp.set$setterFunctionName(" . JSValueToNative($attribute->signature, "value") . ");\n");
                             }
                             push(@implContent, "        m_impl->commitChange(exec, imp);\n");
                         } else {
-                            push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
+                            push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
                             push(@implContent, "        ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
-                            push(@implContent, "        imp->set" . WK_ucfirst($name) . "(" . JSValueToNative($attribute->signature, "value"));
+                            push(@implContent, "        imp->set$setterFunctionName(" . JSValueToNative($attribute->signature, "value"));
                             push(@implContent, ", ec") if @{$attribute->setterExceptions};
                             push(@implContent, ");\n");
                             push(@implContent, "        setDOMException(exec, ec);\n") if @{$attribute->setterExceptions};
@@ -1081,22 +1067,22 @@ sub GenerateImplementation
     # Functions
     if ($numFunctions > 0) {
         foreach my $function (@{$dataNode->functions}) {
-            my $functionClassName = $className . "PrototypeFunction" . WK_ucfirst($function->signature->name);
+            my $functionClassName = $className . "PrototypeFunction" . $codeGenerator->WK_ucfirst($function->signature->name);
             push(@implContent, "JSValue* ${functionClassName}::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)\n");
             push(@implContent, "{\n");
             push(@implContent, "    if (!thisObj->inherits(&${className}::info))\n");
-            push(@implContent, "      return throwError(exec, TypeError);\n\n");
+            push(@implContent, "        return throwError(exec, TypeError);\n");
 
             AddIncludesForType($function->signature->type);
 
             push(@implContent, "    $className* castedThisObj = static_cast<$className*>(thisObj);\n");
 
             if ($function->signature->extendedAttributes->{"Custom"}) {
-                push(@implContent, "        return castedThisObj->" . $function->signature->name . "(exec, args);\n");
+                push(@implContent, "        return castedThisObj->" . $codeGenerator->WK_lcfirst($function->signature->name) . "(exec, args);\n");
             } else {
                 if ($podType) {
                     push(@implContent, "    JSSVGPODTypeWrapper<$podType>* wrapper = castedThisObj->impl();\n");
-                    push(@implContent, "    $podType imp(*wrapper);\n\n");
+                    push(@implContent, "    $podType imp(*wrapper);\n");
                 } else {
                     push(@implContent, "    $implClassName* imp = static_cast<$implClassName*>(castedThisObj->impl());\n");
                 }
@@ -1119,7 +1105,7 @@ sub GenerateImplementation
                 }
 
                 my $paramIndex = 0;
-                my $functionString = "imp" . ($podType ? "." : "->") . $function->signature->name . "(";
+                my $functionString = "imp" . ($podType ? "." : "->") . $codeGenerator->WK_lcfirst($function->signature->name) . "(";
 
                 my $hasOptionalArguments = 0;
 
@@ -1266,7 +1252,7 @@ sub GenerateImplementationFunctionCall()
         push(@implContent, $indent . "setDOMException(exec, ec);\n") if @{$function->raisesExceptions};
 
         if ($podType) {
-            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n\n");
+            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n");
             push(@implContent, $indent . "if (castedThisObj->context())\n");
             push(@implContent, $indent . "    castedThisObj->context()->notifyAttributeChange();\n");
         }
@@ -1277,7 +1263,7 @@ sub GenerateImplementationFunctionCall()
         push(@implContent, $indent . "setDOMException(exec, ec);\n") if @{$function->raisesExceptions};
 
         if ($podType) {
-            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n\n");
+            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n");
             push(@implContent, $indent . "if (castedThisObj->context())\n");
             push(@implContent, $indent . "    castedThisObj->context()->notifyAttributeChange();\n");
         }
@@ -1461,7 +1447,7 @@ sub NativeToJSValue
         $getter =~ s/imp->//;
         $getter =~ s/\(\)//;
 
-        my $setter = "set" . WK_ucfirst($getter);
+        my $setter = "set" . $codeGenerator->WK_ucfirst($getter);
 
         if ($implClassNameForValueConversion eq "") {
             if (IsSVGTypeNeedingContextParameter($implClassName)) {
index f72732e..ac1f7d3 100644 (file)
@@ -203,16 +203,6 @@ sub finish
     my $object = shift;
 }
 
-# Uppercase the first letter, while respecting WebKit style guidelines. 
-# E.g., xmlEncoding becomes XMLEncoding, but xmllang becomes Xmllang.
-sub WK_ucfirst
-{
-    my $param = shift;
-    my $ret = ucfirst($param);
-    $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
-    return $ret;
-}
-
 sub ReadPublicInterfaces
 {
     my $class = shift;
@@ -1065,7 +1055,7 @@ sub GenerateImplementation
             # - GETTER
             my $getterSig = "- ($attributeType)$attributeInterfaceName\n";
             my $hasGetterException = @{$attribute->getterExceptions};
-            my $getterContentHead = "IMPL->$attributeName(";
+            my $getterContentHead = "IMPL->" . $codeGenerator->WK_lcfirst($attributeName) . "(";
             my $getterContentTail = ")";
 
             # Special case for DOMSVGNumber
@@ -1163,7 +1153,7 @@ sub GenerateImplementation
                 # Exception handling
                 my $hasSetterException = @{$attribute->setterExceptions};
 
-                $attributeName = "set" . WK_ucfirst($attributeName);
+                $attributeName = "set" . $codeGenerator->WK_ucfirst($attributeName);
                 my $setterName = "set" . ucfirst($attributeInterfaceName);
                 my $argName = "new" . ucfirst($attributeInterfaceName);
                 my $arg = GetObjCTypeGetter($argName, $idlType);
@@ -1295,7 +1285,7 @@ sub GenerateImplementation
             my $svgMatrixInverse = ($podType and $podType eq "AffineTransform" and $functionName eq "inverse");
 
             push(@parameterNames, "ec") if $raisesExceptions and !($svgMatrixRotateFromVector || $svgMatrixInverse);
-            my $content = $caller . "->" . $functionName . "(" . join(", ", @parameterNames) . ")"; 
+            my $content = $caller . "->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")"; 
 
             if ($svgMatrixRotateFromVector) {
                 # Special case with rotateFromVector & SVGMatrix        
index 55b610b..5dddf3e 100644 (file)
@@ -90,7 +90,7 @@ void CSSImportRule::insertedIntoParent()
     CSSStyleSheet* parentSheet = parentStyleSheet();
     if (!parentSheet->href().isNull())
         // use parent styleheet's URL as the base URL
-        absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).url();
+        absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).string();
 
     // Check for a cycle in our import chain.  If we encounter a stylesheet
     // in our parent chain with the same URL, then just bail.
index 6660a27..b0a844c 100644 (file)
@@ -821,7 +821,7 @@ bool CSSParser::parseValue(int propId, bool important)
 #endif
                 if (!uri.isEmpty()) {
                     list->append(new CSSCursorImageValue(
-                                 String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
+                                 KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
                                  hotspot, styleElement));
                 }
             }
@@ -884,7 +884,7 @@ bool CSSParser::parseValue(int propId, bool important)
             String uri = parseURL(domString(value->string));
             if (!uri.isEmpty()) {
                 parsedValue = new CSSImageValue(
-                    String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
+                    KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
                     styleElement);
                 valueList->next();
             }
@@ -1849,7 +1849,7 @@ bool CSSParser::parseContent(int propId, bool important)
             // url
             String value = parseURL(domString(val->string));
             parsedValue = new CSSImageValue(
-                String(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).url()), styleElement);
+                KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).string(), styleElement);
         } else if (val->unit == Value::Function) {
             // attr(X) | counter(X [,Y]) | counters(X, Y, [,Z])
             ValueList *args = val->function->args;
@@ -1915,7 +1915,7 @@ bool CSSParser::parseBackgroundImage(CSSValue*& value)
     if (valueList->current()->unit == CSSPrimitiveValue::CSS_URI) {
         String uri = parseURL(domString(valueList->current()->string));
         if (!uri.isEmpty())
-            value = new CSSImageValue(String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()), 
+            value = new CSSImageValue(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
                                          styleElement);
         return true;
     }
@@ -2761,7 +2761,7 @@ bool CSSParser::parseFontFaceSrc()
         parsedValue = 0;
         if (val->unit == CSSPrimitiveValue::CSS_URI && !expectComma) {
             String value = parseURL(domString(val->string));
-            parsedValue = new CSSFontFaceSrcValue(String(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).url()), false);
+            parsedValue = new CSSFontFaceSrcValue(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).string(), false);
             uriValue = parsedValue;
             allowFormat = true;
             expectComma = true;
@@ -3216,7 +3216,7 @@ bool CSSParser::parseBorderImage(int propId, bool important)
     if (uri.isEmpty())
         return false;
     
-    context.commitImage(new CSSImageValue(String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
+    context.commitImage(new CSSImageValue(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
                                                              styleElement));
     while ((val = valueList->next())) {
         if (context.allowNumber() && validUnit(val, FInteger|FNonNeg|FPercent, true)) {
@@ -3778,7 +3778,7 @@ CSSRule* CSSParser::createCharsetRule(const ParseString& charset)
     return rule;
 }
 
-CSSRule* CSSParser::createImportRule(const ParseString& URL, MediaList* media)
+CSSRule* CSSParser::createImportRule(const ParseString& url, MediaList* media)
 {
     if (!media)
         return 0;
@@ -3786,7 +3786,7 @@ CSSRule* CSSParser::createImportRule(const ParseString& URL, MediaList* media)
         return 0;
     if (!styleElement->isCSSStyleSheet())
         return 0;
-    CSSImportRule* rule = new CSSImportRule(styleElement, domString(URL), media);
+    CSSImportRule* rule = new CSSImportRule(styleElement, domString(url), media);
     m_parsedStyleObjects.append(rule);
     return rule;
 }
index f6ec859..777b7a4 100644 (file)
@@ -323,7 +323,7 @@ void CSSStyleSelector::setEncodedURL(const KURL& url)
 
     u.setQuery(DeprecatedString::null);
     u.setRef(DeprecatedString::null);
-    encodedurl.file = u.url();
+    encodedurl.file = u.deprecatedString();
     int pos = encodedurl.file.findRev('/');
     encodedurl.path = encodedurl.file;
     if (pos > 0) {
@@ -331,7 +331,7 @@ void CSSStyleSelector::setEncodedURL(const KURL& url)
         encodedurl.path += '/';
     }
     u.setPath(DeprecatedString::null);
-    encodedurl.host = u.url();
+    encodedurl.host = u.deprecatedString();
 }
 
 CSSStyleSelector::~CSSStyleSelector()
index 1062738..a84c895 100644 (file)
@@ -1819,7 +1819,7 @@ void Document::processHttpEquiv(const String &equiv, const String &content)
         String url;
         if (frame && parseHTTPRefresh(content, true, delay, url)) {
             if (url.isEmpty())
-                url = frame->loader()->url().url();
+                url = frame->loader()->url().string();
             else
                 url = completeURL(url);
             frame->loader()->scheduleHTTPRedirection(delay, url);
@@ -2560,12 +2560,12 @@ Element* Document::ownerElement() const
 
 String Document::cookie() const
 {
-    return cookies(URL());
+    return cookies(url());
 }
 
 void Document::setCookie(const String& value)
 {
-    setCookies(URL(), policyBaseURL().deprecatedString(), value);
+    setCookies(url(), policyBaseURL().deprecatedString(), value);
 }
 
 String Document::referrer() const
@@ -2578,7 +2578,7 @@ String Document::referrer() const
 String Document::domain() const
 {
     if (m_domain.isEmpty()) // not set yet (we set it on demand to save time and space)
-        m_domain = KURL(URL()).host(); // Initially set to the host
+        m_domain = KURL(url()).host(); // Initially set to the host
     return m_domain;
 }
 
@@ -2587,7 +2587,7 @@ void Document::setDomain(const String& newDomain)
     // Not set yet (we set it on demand to save time and space)
     // Initially set to the host
     if (m_domain.isEmpty())
-        m_domain = KURL(URL()).host();
+        m_domain = KURL(url()).host();
 
     // Both NS and IE specify that changing the domain is only allowed when
     // the new domain is a suffix of the old domain.
@@ -2734,12 +2734,12 @@ void Document::removeImageMap(HTMLMapElement* imageMap)
         m_imageMapsByName.remove(it);
 }
 
-HTMLMapElement *Document::getImageMap(const String& URL) const
+HTMLMapElement *Document::getImageMap(const String& url) const
 {
-    if (URL.isNull())
+    if (url.isNull())
         return 0;
-    int hashPos = URL.find('#');
-    String name = (hashPos < 0 ? URL : URL.substring(hashPos + 1)).impl();
+    int hashPos = url.find('#');
+    String name = (hashPos < 0 ? url : url.substring(hashPos + 1)).impl();
     AtomicString mapName = hMode == XHtml ? name : name.lower();
     return m_imageMapsByName.get(mapName.impl());
 }
@@ -2756,26 +2756,26 @@ UChar Document::backslashAsCurrencySymbol() const
     return m_decoder->encoding().backslashAsCurrencySymbol();
 }
 
-DeprecatedString Document::completeURL(const DeprecatedString& URL)
+DeprecatedString Document::completeURL(const DeprecatedString& url)
 {
     // FIXME: This treats null URLs the same as empty URLs, unlike the String function below.
 
     // If both the URL and base URL are empty, like they are for documents
     // created using DOMImplementation::createDocument, just return the passed in URL.
-    // (We do this because URL() returns "about:blank" for empty URLs.
+    // (We do this because url() returns "about:blank" for empty URLs.
     if (m_url.isEmpty() && m_baseURL.isEmpty())
-        return URL;
+        return url;
     if (!m_decoder)
-        return KURL(baseURL(), URL).url();
-    return KURL(baseURL(), URL, m_decoder->encoding()).url();
+        return KURL(baseURL(), url).deprecatedString();
+    return KURL(baseURL(), url, m_decoder->encoding()).deprecatedString();
 }
 
-String Document::completeURL(const String &URL)
+String Document::completeURL(const String& url)
 {
     // FIXME: This always returns null when passed a null URL, unlike the String function above.
-    if (URL.isNull())
-        return URL;
-    return completeURL(URL.deprecatedString());
+    if (url.isNull())
+        return url;
+    return completeURL(url.deprecatedString());
 }
 
 bool Document::inPageCache()
index 097195a..376355e 100644 (file)
@@ -361,10 +361,10 @@ public:
 
     bool wellFormed() const { return m_wellFormed; }
 
-    DeprecatedString URL() const { return m_url.isEmpty() ? "about:blank" : m_url; }
+    DeprecatedString url() const { return m_url.isEmpty() ? "about:blank" : m_url; }
     void setURL(const DeprecatedString& url);
 
-    DeprecatedString baseURL() const { return m_baseURL.isEmpty() ? URL() : m_baseURL; }
+    DeprecatedString baseURL() const { return m_baseURL.isEmpty() ? url() : m_baseURL; }
     void setBaseURL(const DeprecatedString& baseURL);
 
     String baseTarget() const { return m_baseTarget; }
@@ -576,7 +576,7 @@ public:
 
     void addImageMap(HTMLMapElement*);
     void removeImageMap(HTMLMapElement*);
-    HTMLMapElement* getImageMap(const String& URL) const;
+    HTMLMapElement* getImageMap(const String& url) const;
 
     HTMLElement* body();
     void setBody(PassRefPtr<HTMLElement>, ExceptionCode&);
index 3df69f0..5797717 100644 (file)
@@ -563,13 +563,13 @@ String Element::baseURI() const
     KURL xmlbase(getAttribute(baseAttr).deprecatedString());
 
     if (!xmlbase.protocol().isEmpty())
-        return xmlbase.url();
+        return xmlbase.string();
 
     Node* parent = parentNode();
     if (parent)
-        return KURL(parent->baseURI().deprecatedString(), xmlbase.url()).url();
+        return KURL(parent->baseURI().deprecatedString(), xmlbase.deprecatedString()).string();
 
-    return xmlbase.url();
+    return xmlbase.string();
 }
 
 Node* Element::insertAdjacentElement(const String& where, Node* newChild, int& exception)
index 8df21f7..f4ee819 100644 (file)
@@ -57,9 +57,9 @@ public:
     String localHref() const { return m_localHref; }
     StyleSheet* sheet() const { return m_sheet.get(); }
     bool checkStyleSheet();
-    virtual void setCSSStyleSheet(const String& URL, const String& charset, const String& sheet);
+    virtual void setCSSStyleSheet(const String& url, const String& charset, const String& sheet);
 #if ENABLE(XSLT)
-    virtual void setXSLStyleSheet(const String& URL, const String& sheet);
+    virtual void setXSLStyleSheet(const String& url, const String& sheet);
 #endif
     void setCSSStyleSheet(CSSStyleSheet*);
     bool isLoading() const;
index 00d98d4..f499bd7 100644 (file)
@@ -293,10 +293,10 @@ void StyledElement::addCSSStringProperty(MappedAttribute* attr, int id, const St
     attr->decl()->setStringProperty(id, value, type, false);
 }
 
-void StyledElement::addCSSImageProperty(MappedAttribute* attr, int id, const String &URL)
+void StyledElement::addCSSImageProperty(MappedAttribute* attr, int id, const String& url)
 {
     if (!attr->decl()) createMappedDecl(attr);
-    attr->decl()->setImageProperty(id, URL, false);
+    attr->decl()->setImageProperty(id, url, false);
 }
 
 void StyledElement::addCSSLength(MappedAttribute* attr, int id, const String &value)
index 1cf8ebc..57c9f59 100644 (file)
@@ -49,7 +49,7 @@ public:
     void addCSSProperty(MappedAttribute* attr, int id, const String &value);
     void addCSSProperty(MappedAttribute* attr, int id, int value);
     void addCSSStringProperty(MappedAttribute* attr, int id, const String &value, CSSPrimitiveValue::UnitTypes = CSSPrimitiveValue::CSS_STRING);
-    void addCSSImageProperty(MappedAttribute* attr, int id, const String &URL);
+    void addCSSImageProperty(MappedAttribute*, int propertyID, const String& url);
     void addCSSColor(MappedAttribute* attr, int id, const String &c);
     void createMappedDecl(MappedAttribute* attr);
     
index 6e64a11..dbd42fa 100644 (file)
@@ -845,7 +845,7 @@ void XMLTokenizer::endElementNs()
                 if (child->isTextNode() || child->nodeType() == Node::CDATA_SECTION_NODE)
                     scriptCode += static_cast<CharacterData*>(child)->data();
             }
-            m_view->frame()->loader()->executeScript(m_doc->URL(), m_scriptStartLine - 1, scriptCode);
+            m_view->frame()->loader()->executeScript(m_doc->url(), m_scriptStartLine - 1, scriptCode);
         }
         
         m_requestingScript = false;
@@ -1274,7 +1274,7 @@ void XMLTokenizer::end()
 {
 #if ENABLE(XSLT)
     if (m_sawXSLTransform) {
-        m_doc->setTransformSource(xmlDocPtrForString(m_doc->docLoader(), m_originalSourceForTransform, m_doc->URL()));
+        m_doc->setTransformSource(xmlDocPtrForString(m_doc->docLoader(), m_originalSourceForTransform, m_doc->url()));
         
         m_doc->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets.
         m_doc->updateStyleSelector();
@@ -1917,7 +1917,7 @@ void XMLTokenizer::parseEndElement()
                 if (child->isTextNode() || child->nodeType() == Node::CDATA_SECTION_NODE)
                     scriptCode += static_cast<CharacterData*>(child)->data();
             }
-            m_view->frame()->loader()->executeScript(m_doc->URL(), m_scriptStartLine - 1, scriptCode);
+            m_view->frame()->loader()->executeScript(m_doc->url(), m_scriptStartLine - 1, scriptCode);
         }
         m_requestingScript = false;
     }
index 4164d7a..848d133 100644 (file)
@@ -170,7 +170,7 @@ namespace WebCore {
     };
 
 #if ENABLE(XSLT)
-void* xmlDocPtrForString(DocLoader*, const String& source, const DeprecatedString& URL);
+void* xmlDocPtrForString(DocLoader*, const String& source, const DeprecatedString& url);
 void setLoaderForLibXMLCallbacks(DocLoader*);
 #endif
 
index c287442..6c5ba30 100644 (file)
@@ -937,7 +937,7 @@ void Editor::copy()
     
     Document* document = m_frame->document();
     if (HTMLImageElement* imageElement = imageElementFromImageDocument(document))
-        Pasteboard::generalPasteboard()->writeImage(imageElement, document->URL(), document->title());
+        Pasteboard::generalPasteboard()->writeImage(imageElement, document->url(), document->title());
     else
         Pasteboard::generalPasteboard()->writeSelection(selectedRange().get(), canSmartCopyOrDelete(), m_frame);
     
index 36c0392..f7f15b5 100644 (file)
@@ -551,7 +551,7 @@ static void completeURLs(Node* node, const String& baseURL)
             for (unsigned i = 0; i < length; i++) {
                 Attribute* attr = attrs->attributeItem(i);
                 if (e->isURLAttribute(attr)) {
-                    String completedURL = KURL(baseURLAsKURL, attr->value().deprecatedString()).url();
+                    String completedURL = KURL(baseURLAsKURL, attr->value().deprecatedString()).string();
                     changes.append(AttributeChange(e, attr->name(), completedURL));
                 }
             }
index 14db22d..e27b259 100644 (file)
@@ -60,7 +60,7 @@ public:
     Document* document() const { return m_document.get(); }
     FrameView* view() const { return m_view.get(); }
     Node* mousePressNode() const { return m_mousePressNode.get(); }
-    const KURL& URL() const { return m_URL; }
+    const KURL& url() const { return m_URL; }
     void restore(Page*);
     
     void close();
index 6cc3cea..d299522 100644 (file)
@@ -74,8 +74,8 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, const Str
 }
 
 HistoryItem::HistoryItem(const KURL& url, const String& title)
-    : m_urlString(url.url())
-    , m_originalURLString(url.url())
+    : m_urlString(url.string())
+    , m_originalURLString(url.string())
     , m_title(title)
     , m_lastVisitedTime(0)
     , m_isInPageCache(false)
@@ -86,8 +86,8 @@ HistoryItem::HistoryItem(const KURL& url, const String& title)
 }
 
 HistoryItem::HistoryItem(const KURL& url, const String& target, const String& parent, const String& title)
-    : m_urlString(url.url())
-    , m_originalURLString(url.url())
+    : m_urlString(url.string())
+    , m_originalURLString(url.string())
     , m_target(target)
     , m_parent(parent)
     , m_title(title)
@@ -209,7 +209,7 @@ void HistoryItem::setURLString(const String& urlString)
 void HistoryItem::setURL(const KURL& url)
 {
     pageCache()->remove(this);
-    setURLString(url.url());
+    setURLString(url.string());
     clearDocumentState();
 }
 
@@ -388,7 +388,7 @@ FormData* HistoryItem::formData()
 bool HistoryItem::isCurrentDocument(Document* doc) const
 {
     // FIXME: We should find a better way to check if this is the current document.
-    return urlString() == doc->URL();
+    return urlString() == doc->url();
 }
 
 void HistoryItem::mergeAutoCompleteHints(HistoryItem* otherItem)
index 91516a4..7a94c7b 100644 (file)
@@ -79,7 +79,7 @@ void HTMLBaseElement::process()
         return;
 
     if (!m_href.isEmpty() && document()->frame())
-        document()->setBaseURL(KURL(document()->frame()->loader()->url(), m_href.deprecatedString()).url());
+        document()->setBaseURL(KURL(document()->frame()->loader()->url(), m_href.deprecatedString()).deprecatedString());
 
     if (!m_target.isEmpty())
         document()->setBaseTarget(m_target);
index 87fcef6..b218c46 100644 (file)
@@ -1478,7 +1478,7 @@ void HTMLParser::reportErrorToConsole(HTMLParserErrorCode errorCode, const Atomi
     message.replace("%tag1", tag1);
     message.replace("%tag2", tag2);
 
-    page->chrome()->addMessageToConsole(HTMLMessageSource, isWarning(errorCode) ? WarningMessageLevel: ErrorMessageLevel, message, lineNumber, document->URL());
+    page->chrome()->addMessageToConsole(HTMLMessageSource, isWarning(errorCode) ? WarningMessageLevel: ErrorMessageLevel, message, lineNumber, document->url());
 }
 
 }
index 778a36b..5df2bbe 100644 (file)
@@ -64,7 +64,7 @@ void HTMLScriptElement::childrenChanged()
     // and the script element has been inserted in the document
     // we evaluate the script.
     if (!m_createdByParser && inDocument() && firstChild())
-        evaluateScript(document()->URL(), text());
+        evaluateScript(document()->url(), text());
 }
 
 void HTMLScriptElement::parseMappedAttribute(MappedAttribute *attr)
@@ -137,7 +137,7 @@ void HTMLScriptElement::insertedIntoDocument()
     // it should be evaluated, and evaluateScript only evaluates a script once.
     String scriptString = text();    
     if (!scriptString.isEmpty())
-        evaluateScript(document()->URL(), scriptString);
+        evaluateScript(document()->url(), scriptString);
 }
 
 void HTMLScriptElement::removedFromDocument()
@@ -245,7 +245,7 @@ bool HTMLScriptElement::shouldExecuteAsJavaScript()
     return true;
 }
 
-void HTMLScriptElement::evaluateScript(const String& URL, const String& script)
+void HTMLScriptElement::evaluateScript(const String& url, const String& script)
 {
     if (m_evaluated)
         return;
@@ -258,7 +258,7 @@ void HTMLScriptElement::evaluateScript(const String& URL, const String& script)
         KJSProxy* proxy = frame->scriptProxy();
         if (proxy) {
             m_evaluated = true;
-            proxy->evaluate(URL, 0, script);
+            proxy->evaluate(url, 0, script);
             Document::updateDocumentsRendering();
         }
     }
index 84c0e90..d6eaf0f 100644 (file)
@@ -1,9 +1,7 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 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
  * Boston, MA 02110-1301, USA.
  *
  */
+
 #ifndef HTMLScriptElement_h
 #define HTMLScriptElement_h
 
-#include "HTMLElement.h"
 #include "CachedResourceClient.h"
+#include "HTMLElement.h"
 
 namespace WebCore {
 
 class CachedScript;
 
-class HTMLScriptElement : public HTMLElement, public CachedResourceClient
-{
+class HTMLScriptElement : public HTMLElement, public CachedResourceClient {
 public:
-    HTMLScriptElement(Document *doc);
+    HTMLScriptElement(Document*);
     ~HTMLScriptElement();
 
     virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
     virtual int tagPriority() const { return 1; }
     virtual bool checkDTD(const Node* newChild) { return newChild->isTextNode(); }
 
-    virtual void parseMappedAttribute(MappedAttribute *attr);
+    virtual void parseMappedAttribute(MappedAttribute*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
-    virtual void notifyFinished(CachedResource *finishedObj);
+    virtual void notifyFinished(CachedResource*);
 
     virtual void childrenChanged();
 
-    virtual bool isURLAttribute(Attribute *attr) const;
+    virtual bool isURLAttribute(Attribute*) const;
 
     void setCreatedByParser(bool createdByParser) { m_createdByParser = createdByParser; }
     virtual void finishedParsing();
 
     bool shouldExecuteAsJavaScript();
-    void evaluateScript(const String &URL, const String &script);
+    void evaluateScript(const String& url, const String& script);
 
     String text() const;
     void setText(const String&);
index cfd5bf4..10c631d 100644 (file)
@@ -505,7 +505,7 @@ HTMLTokenizer::State HTMLTokenizer::scriptExecution(const DeprecatedString& str,
     if (m_fragment || !m_doc->frame())
         return state;
     m_executingScript++;
-    DeprecatedString url = scriptURL.isNull() ? m_doc->frame()->document()->URL() : scriptURL;
+    DeprecatedString url = scriptURL.isNull() ? m_doc->frame()->document()->url() : scriptURL;
 
     SegmentedString *savedPrependingSrc = currentPrependingSrc;
     SegmentedString prependingSrc;
index 961895b..c820420 100644 (file)
@@ -66,20 +66,20 @@ static CachedResource* createResource(CachedResource::Type type, DocLoader* docL
     switch (type) {
     case CachedResource::ImageResource:
         // User agent images need to null check the docloader.  No other resources need to.
-        return new CachedImage(docLoader, url.url(), true /* for cache */);
+        return new CachedImage(docLoader, url.string(), true /* for cache */);
     case CachedResource::CSSStyleSheet:
-        return new CachedCSSStyleSheet(docLoader, url.url(), *charset, skipCanLoadCheck, sendResourceLoadCallbacks);
+        return new CachedCSSStyleSheet(docLoader, url.string(), *charset, skipCanLoadCheck, sendResourceLoadCallbacks);
     case CachedResource::Script:
-        return new CachedScript(docLoader, url.url(), *charset);
+        return new CachedScript(docLoader, url.string(), *charset);
     case CachedResource::FontResource:
-        return new CachedFont(docLoader, url.url());
+        return new CachedFont(docLoader, url.string());
 #if ENABLE(XSLT)
     case CachedResource::XSLStyleSheet:
-        return new CachedXSLStyleSheet(docLoader, url.url());
+        return new CachedXSLStyleSheet(docLoader, url.string());
 #endif
 #if ENABLE(XBL)
     case CachedResource::XBLStyleSheet:
-        return new CachedXBLDocument(docLoader, url.url());
+        return new CachedXBLDocument(docLoader, url.string());
 #endif
     default:
         break;
@@ -96,7 +96,7 @@ CachedResource* Cache::requestResource(DocLoader* docLoader, CachedResource::Typ
         return 0;
     
     // Look up the resource in our map.
-    CachedResource* resource = m_resources.get(url.url());
+    CachedResource* resource = m_resources.get(url.string());
 
     if (resource) {
         if (!skipCanLoadCheck && FrameLoader::restrictAccessToLocal() && !FrameLoader::canLoad(*resource, docLoader->doc())) {
@@ -110,7 +110,7 @@ CachedResource* Cache::requestResource(DocLoader* docLoader, CachedResource::Typ
         if (!skipCanLoadCheck && FrameLoader::restrictAccessToLocal() && !FrameLoader::canLoad(url, docLoader->doc())) {
             Document* doc = docLoader->doc();
             if(doc)
-                FrameLoader::reportLocalLoadFailed(doc->page(), url.url());
+                FrameLoader::reportLocalLoadFailed(doc->page(), url.string());
 
             return 0;
         }
@@ -120,7 +120,7 @@ CachedResource* Cache::requestResource(DocLoader* docLoader, CachedResource::Typ
         ASSERT(resource);
         ASSERT(resource->inCache());
         if (!disabled()) {
-            m_resources.set(url.url(), resource);  // The size will be added in later once the resource is loaded and calls back to us with the new size.
+            m_resources.set(url.string(), resource);  // The size will be added in later once the resource is loaded and calls back to us with the new size.
             
             // This will move the resource to the front of its LRU list and increase its access count.
             resourceAccessed(resource);
index 4528b0f..24624b3 100644 (file)
@@ -92,7 +92,7 @@ void CachedCSSStyleSheet::checkNotify()
 
     CachedResourceClientWalker w(m_clients);
     while (CachedResourceClient *c = w.next())
-        c->setCSSStyleSheet(m_response.url().url(), m_decoder->encoding().name(), m_sheet);
+        c->setCSSStyleSheet(m_response.url().string(), m_decoder->encoding().name(), m_sheet);
 
 #if USE(LOW_BANDWIDTH_DISPLAY)        
     // if checkNotify() is called from error(), client's setCSSStyleSheet(...)
index d85737f..65db74c 100644 (file)
 
 namespace WebCore {
 
-CachedResource::CachedResource(const String& URL, Type type, bool forCache, bool sendResourceLoadCallbacks)
-    : m_lastDecodedAccessTime(0)
+CachedResource::CachedResource(const String& url, Type type, bool forCache, bool sendResourceLoadCallbacks)
+    : m_url(url)
+    , m_lastDecodedAccessTime(0)
     , m_sendResourceLoadCallbacks(sendResourceLoadCallbacks)
     , m_inCache(forCache)
     , m_docLoader(0)
 {
-    m_url = URL;
     m_type = type;
     m_status = Pending;
     m_encodedSize = 0;
index c0a0190..ca9a756 100644 (file)
@@ -62,10 +62,10 @@ public:
         Unknown,      // let cache decide what to do with it
         New,          // inserting new item
         Pending,      // only partially loaded
-        Cached       // regular case
+        Cached        // regular case
     };
 
-    CachedResource(const String& URL, Type, bool forCache = true, bool sendResourceLoadCallbacks = false);
+    CachedResource(const String& url, Type, bool forCache = true, bool sendResourceLoadCallbacks = false);
     virtual ~CachedResource();
 
     virtual void setEncoding(const String&) { }
index 5872494..06e0376 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
 
     class CachedScript : public CachedResource {
     public:
-        CachedScript(DocLoader*, const String& URL, const String& charset);
+        CachedScript(DocLoader*, const String& url, const String& charset);
         virtual ~CachedScript();
 
         const String& script() const { return m_script; }
index f70ad51..8c0e5e4 100644 (file)
@@ -67,19 +67,19 @@ void DocLoader::checkForReload(const KURL& fullURL)
     if (m_allowStaleResources)
         return; //Don't reload resources while pasting
     if (m_cachePolicy == CachePolicyVerify) {
-       if (!m_reloadedURLs.contains(fullURL.url())) {
-          CachedResource* existing = cache()->resourceForURL(fullURL.url());
+       if (!m_reloadedURLs.contains(fullURL.string())) {
+          CachedResource* existing = cache()->resourceForURL(fullURL.string());
           if (existing && existing->isExpired()) {
              cache()->remove(existing);
-             m_reloadedURLs.add(fullURL.url());
+             m_reloadedURLs.add(fullURL.string());
           }
        }
     } else if ((m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)) {
-       if (!m_reloadedURLs.contains(fullURL.url())) {
-          CachedResource* existing = cache()->resourceForURL(fullURL.url());
+       if (!m_reloadedURLs.contains(fullURL.string())) {
+          CachedResource* existing = cache()->resourceForURL(fullURL.string());
           if (existing)
              cache()->remove(existing);
-          m_reloadedURLs.add(fullURL.url());
+          m_reloadedURLs.add(fullURL.string());
        }
     }
 }
@@ -144,7 +144,7 @@ CachedResource* DocLoader::requestResource(CachedResource::Type type, const Stri
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
     
     if (cache()->disabled()) {
-        HashMap<String, CachedResource*>::iterator it = m_docResources.find(fullURL.url());
+        HashMap<String, CachedResource*>::iterator it = m_docResources.find(fullURL.string());
         
         if (it != m_docResources.end()) {
             it->second->setDocLoader(0);
index da3cfcd..c81a8f1 100644 (file)
@@ -189,15 +189,15 @@ ResourceRequest& DocumentLoader::actualRequest()
     return m_request;
 }
 
-const KURL& DocumentLoader::URL() const
+const KURL& DocumentLoader::url() const
 {
     return request().url();
 }
 
-void DocumentLoader::replaceRequestURLForAnchorScroll(const KURL& URL)
+void DocumentLoader::replaceRequestURLForAnchorScroll(const KURL& url)
 {
-    m_originalRequestCopy.setURL(URL);
-    m_request.setURL(URL);
+    m_originalRequestCopy.setURL(url);
+    m_request.setURL(url);
 }
 
 void DocumentLoader::setRequest(const ResourceRequest& req)
@@ -221,7 +221,7 @@ void DocumentLoader::setRequest(const ResourceRequest& req)
 
     // Only send webView:didReceiveServerRedirectForProvisionalLoadForFrame: if URL changed.
     // Also, don't send it when replacing unreachable URLs with alternate content.
-    if (!handlingUnreachableURL && oldURL.url() != req.url().url())
+    if (!handlingUnreachableURL && oldURL != req.url())
         frameLoader()->didReceiveServerRedirectForProvisionalLoadForFrame();
 }
 
@@ -688,7 +688,7 @@ bool DocumentLoader::startLoadingMainResource(unsigned long identifier)
     if (!m_mainResourceLoader->load(m_request, m_substituteData)) {
         // FIXME: If this should really be caught, we should just ASSERT this doesn't happen;
         // should it be caught by other parts of WebKit or other parts of the app?
-        LOG_ERROR("could not create WebResourceHandle for URL %s -- should be caught by policy handler level", m_request.url().url().ascii());
+        LOG_ERROR("could not create WebResourceHandle for URL %s -- should be caught by policy handler level", m_request.url().string().ascii().data());
         m_mainResourceLoader = 0;
         return false;
     }
index 78a0eee..58482d3 100644 (file)
@@ -82,7 +82,7 @@ namespace WebCore {
 
         const SubstituteData& substituteData() const { return m_substituteData; }
 
-        const KURL& URL() const;
+        const KURL& url() const;
         const KURL& unreachableURL() const;
 
         KURL originalURL() const;
index 69e88fa..632049d 100644 (file)
@@ -114,7 +114,7 @@ const unsigned int cMaxPendingSourceLengthInLowBandwidthDisplay = 128 * 1024;
 
 struct FormSubmission {
     const char* action;
-    String URL;
+    String url;
     RefPtr<FormData> data;
     String target;
     String contentType;
@@ -124,7 +124,7 @@ struct FormSubmission {
     FormSubmission(const char* a, const String& u, PassRefPtr<FormData> d, const String& t,
             const String& ct, const String& b, PassRefPtr<Event> e)
         : action(a)
-        , URL(u)
+        , url(u)
         , data(d)
         , target(t)
         , contentType(ct)
@@ -138,7 +138,7 @@ struct ScheduledRedirection {
     enum Type { redirection, locationChange, historyNavigation, locationChangeDuringLoad };
     Type type;
     double delay;
-    String URL;
+    String url;
     String referrer;
     int historySteps;
     bool lockHistory;
@@ -147,7 +147,7 @@ struct ScheduledRedirection {
     ScheduledRedirection(double redirectDelay, const String& redirectURL, bool redirectLockHistory, bool userGesture)
         : type(redirection)
         , delay(redirectDelay)
-        , URL(redirectURL)
+        , url(redirectURL)
         , historySteps(0)
         , lockHistory(redirectLockHistory)
         , wasUserGesture(userGesture)
@@ -159,7 +159,7 @@ struct ScheduledRedirection {
             bool locationChangeLockHistory, bool locationChangeWasUserGesture)
         : type(locationChangeType)
         , delay(0)
-        , URL(locationChangeURL)
+        , url(locationChangeURL)
         , referrer(locationChangeReferrer)
         , historySteps(0)
         , lockHistory(locationChangeLockHistory)
@@ -367,15 +367,15 @@ bool FrameLoader::canHandleRequest(const ResourceRequest& request)
     return m_client->canHandleRequest(request);
 }
 
-void FrameLoader::changeLocation(const String& URL, const String& referrer, bool lockHistory, bool userGesture)
+void FrameLoader::changeLocation(const String& url, const String& referrer, bool lockHistory, bool userGesture)
 {
-    changeLocation(completeURL(URL), referrer, lockHistory, userGesture);
+    changeLocation(completeURL(url), referrer, lockHistory, userGesture);
 }
 
-void FrameLoader::changeLocation(const KURL& URL, const String& referrer, bool lockHistory, bool userGesture)
+void FrameLoader::changeLocation(const KURL& url, const String& referrer, bool lockHistory, bool userGesture)
 {
-    if (URL.url().find("javascript:", 0, false) == 0) {
-        String script = KURL::decode_string(URL.url().mid(strlen("javascript:")));
+    if (url.deprecatedString().find("javascript:", 0, false) == 0) {
+        String script = KURL::decode_string(url.deprecatedString().mid(strlen("javascript:")));
         JSValue* result = executeScript(script, userGesture);
         String scriptResult;
         if (getString(result, scriptResult)) {
@@ -388,7 +388,7 @@ void FrameLoader::changeLocation(const KURL& URL, const String& referrer, bool l
 
     ResourceRequestCachePolicy policy = (m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)
         ? ReloadIgnoringCacheData : UseProtocolCachePolicy;
-    ResourceRequest request(URL, referrer, policy);
+    ResourceRequest request(url, referrer, policy);
     
     urlSelected(request, "_self", 0, lockHistory, userGesture);
 }
@@ -400,8 +400,8 @@ void FrameLoader::urlSelected(const ResourceRequest& request, const String& _tar
         target = m_frame->document()->baseTarget();
 
     const KURL& url = request.url();
-    if (url.url().startsWith("javascript:", false)) {
-        executeScript(KURL::decode_string(url.url().mid(strlen("javascript:"))), true);
+    if (url.deprecatedString().startsWith("javascript:", false)) {
+        executeScript(KURL::decode_string(url.deprecatedString().mid(strlen("javascript:"))), true);
         return;
     }
 
@@ -434,7 +434,7 @@ bool FrameLoader::requestFrame(HTMLFrameOwnerElement* ownerElement, const String
 
     Frame* frame = ownerElement->contentFrame();
     if (frame)
-        frame->loader()->scheduleLocationChange(url.url(), m_outgoingReferrer, true, userGestureHint());
+        frame->loader()->scheduleLocationChange(url.string(), m_outgoingReferrer, true, userGestureHint());
     else
         frame = loadSubframe(ownerElement, url, frameName, m_outgoingReferrer);
     
@@ -460,7 +460,7 @@ Frame* FrameLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const KURL
     }
 
     if (!canLoad(url, referrer)) {
-        FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
+        FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
         return 0;
     }
 
@@ -500,7 +500,7 @@ void FrameLoader::submitFormAgain()
         return;
     OwnPtr<FormSubmission> form(m_deferredFormSubmission.release());
     if (form)
-        submitForm(form->action, form->URL, form->data, form->target,
+        submitForm(form->action, form->url, form->data, form->target,
             form->contentType, form->boundary, form->event.get());
 }
 
@@ -515,7 +515,7 @@ void FrameLoader::submitForm(const char* action, const String& url, PassRefPtr<F
     if (u.isEmpty())
         return;
 
-    DeprecatedString urlString = u.url();
+    DeprecatedString urlString = u.deprecatedString();
     if (urlString.startsWith("javascript:", false)) {
         m_isExecutingJavaScriptFormAction = true;
         executeScript(KURL::decode_string(urlString.mid(strlen("javascript:"))));
@@ -731,13 +731,13 @@ void FrameLoader::didExplicitOpen()
     // Cancelling redirection here works for all cases because document.open 
     // implicitly precedes document.write.
     cancelRedirection(); 
-    if (m_frame->document()->URL() != "about:blank")
-        m_URL = m_frame->document()->URL();
+    if (m_frame->document()->url() != "about:blank")
+        m_URL = m_frame->document()->url();
 }
 
 void FrameLoader::replaceContentsWithScriptResult(const KURL& url)
 {
-    JSValue* result = executeScript(KURL::decode_string(url.url().mid(strlen("javascript:"))));
+    JSValue* result = executeScript(KURL::decode_string(url.deprecatedString().mid(strlen("javascript:"))));
     String scriptResult;
     if (!getString(result, scriptResult))
         return;
@@ -748,10 +748,10 @@ void FrameLoader::replaceContentsWithScriptResult(const KURL& url)
 
 JSValue* FrameLoader::executeScript(const String& script, bool forceUserGesture)
 {
-    return executeScript(forceUserGesture ? String() : String(m_URL.url()), 0, script);
+    return executeScript(forceUserGesture ? String() : m_URL.string(), 0, script);
 }
 
-JSValue* FrameLoader::executeScript(const String& URL, int baseLine, const String& script)
+JSValue* FrameLoader::executeScript(const String& url, int baseLine, const String& script)
 {
     KJSProxy* proxy = m_frame->scriptProxy();
     if (!proxy)
@@ -760,7 +760,7 @@ JSValue* FrameLoader::executeScript(const String& URL, int baseLine, const Strin
     bool wasRunningScript = m_isRunningScript;
     m_isRunningScript = true;
 
-    JSValue* result = proxy->evaluate(URL, baseLine, script);
+    JSValue* result = proxy->evaluate(url, baseLine, script);
 
     if (!wasRunningScript) {
         m_isRunningScript = false;
@@ -851,18 +851,18 @@ void FrameLoader::receivedFirstData()
     m_workingURL = KURL();
 
     double delay;
-    String URL;
+    String url;
     if (!m_documentLoader)
         return;
-    if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField("Refresh"), false, delay, URL))
+    if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField("Refresh"), false, delay, url))
         return;
 
-    if (URL.isEmpty())
-        URL = m_URL.url();
+    if (url.isEmpty())
+        url = m_URL.string();
     else
-        URL = m_frame->document()->completeURL(URL);
+        url = m_frame->document()->completeURL(url);
 
-    scheduleHTTPRedirection(delay, URL);
+    scheduleHTTPRedirection(delay, url);
 }
 
 const String& FrameLoader::responseMIMEType() const
@@ -897,7 +897,7 @@ void FrameLoader::begin(const KURL& url, bool dispatch)
     ref.setUser(DeprecatedString());
     ref.setPass(DeprecatedString());
     ref.setRef(DeprecatedString());
-    m_outgoingReferrer = ref.url();
+    m_outgoingReferrer = ref.string();
     m_URL = url;
     KURL baseurl;
 
@@ -907,10 +907,10 @@ void FrameLoader::begin(const KURL& url, bool dispatch)
     RefPtr<Document> document = DOMImplementation::instance()->createDocument(m_responseMIMEType, m_frame, m_frame->inViewSourceMode());
     m_frame->setDocument(document);
 
-    document->setURL(m_URL.url());
+    document->setURL(m_URL.deprecatedString());
     // We prefer m_baseURL over m_URL because m_URL changes when we are
     // about to load a new page.
-    document->setBaseURL(baseurl.url());
+    document->setBaseURL(baseurl.deprecatedString());
     if (m_decoder)
         document->setDecoder(m_decoder.get());
 
@@ -1065,7 +1065,7 @@ void FrameLoader::startIconLoader()
         return;
     
     KURL url(iconURL());
-    String urlString(url.url());
+    String urlString(url.string());
     if (urlString.isEmpty())
         return;
 
@@ -1083,8 +1083,8 @@ void FrameLoader::startIconLoader()
             if (!iconDatabase()->iconDataKnownForIconURL(urlString)) {
                 LOG(IconDatabase, "Told not to load icon %s but icon data is not yet available - registering for notification and requesting load from disk", urlString.ascii().data());
                 m_client->registerForIconNotification();
-                iconDatabase()->iconForPageURL(m_URL.url(), IntSize(0, 0));
-                iconDatabase()->iconForPageURL(originalRequestURL().url(), IntSize(0, 0));
+                iconDatabase()->iconForPageURL(m_URL.string(), IntSize(0, 0));
+                iconDatabase()->iconForPageURL(originalRequestURL().string(), IntSize(0, 0));
             } else
                 m_client->dispatchDidReceiveIcon();
                 
@@ -1141,9 +1141,9 @@ static HashSet<String, CaseFoldingHash>& localSchemes()
 void FrameLoader::commitIconURLToIconDatabase(const KURL& icon)
 {
     ASSERT(iconDatabase());
-    LOG(IconDatabase, "Committing iconURL %s to database for pageURLs %s and %s", icon.url().ascii(), m_URL.url().ascii(), originalRequestURL().url().ascii());
-    iconDatabase()->setIconURLForPageURL(icon.url(), m_URL.url());
-    iconDatabase()->setIconURLForPageURL(icon.url(), originalRequestURL().url());
+    LOG(IconDatabase, "Committing iconURL %s to database for pageURLs %s and %s", icon.string().ascii().data(), m_URL.string().ascii().data(), originalRequestURL().string().ascii().data());
+    iconDatabase()->setIconURLForPageURL(icon.string(), m_URL.string());
+    iconDatabase()->setIconURLForPageURL(icon.string(), originalRequestURL().string());
 }
 
 void FrameLoader::restoreDocumentState()
@@ -1383,7 +1383,7 @@ void FrameLoader::scheduleRefresh(bool wasUserGesture)
 
     ScheduledRedirection::Type type = duringLoad
         ? ScheduledRedirection::locationChangeDuringLoad : ScheduledRedirection::locationChange;
-    scheduleRedirection(new ScheduledRedirection(type, m_URL.url(), m_outgoingReferrer, true, wasUserGesture));
+    scheduleRedirection(new ScheduledRedirection(type, m_URL.string(), m_outgoingReferrer, true, wasUserGesture));
     m_cachePolicy = CachePolicyRefresh;
 }
 
@@ -1463,7 +1463,7 @@ void FrameLoader::redirectionTimerFired(Timer<FrameLoader>*)
         case ScheduledRedirection::redirection:
         case ScheduledRedirection::locationChange:
         case ScheduledRedirection::locationChangeDuringLoad:
-            changeLocation(redirection->URL, redirection->referrer,
+            changeLocation(redirection->url, redirection->referrer,
                 redirection->lockHistory, redirection->wasUserGesture);
             return;
         case ScheduledRedirection::historyNavigation:
@@ -1621,7 +1621,7 @@ bool FrameLoader::loadPlugin(RenderPart* renderer, const KURL& url, const String
             pluginElement = static_cast<Element*>(renderer->node());
 
         if (!canLoad(url, frame()->document())) {
-            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
+            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
             return false;
         }
 
@@ -1727,9 +1727,9 @@ bool FrameLoader::userGestureHint()
     return true; // If JavaScript is disabled, a user gesture must have initiated the navigation
 }
 
-void FrameLoader::didNotOpenURL(const KURL& URL)
+void FrameLoader::didNotOpenURL(const KURL& url)
 {
-    if (m_submittedFormURL == URL)
+    if (m_submittedFormURL == url)
         m_submittedFormURL = KURL();
 }
 
@@ -1797,7 +1797,7 @@ void FrameLoader::updatePolicyBaseURL()
     if (m_frame->tree()->parent() && m_frame->tree()->parent()->document())
         setPolicyBaseURL(m_frame->tree()->parent()->document()->policyBaseURL());
     else
-        setPolicyBaseURL(m_URL.url());
+        setPolicyBaseURL(m_URL.string());
 }
 
 void FrameLoader::setPolicyBaseURL(const String& s)
@@ -1810,9 +1810,9 @@ void FrameLoader::setPolicyBaseURL(const String& s)
 
 // This does the same kind of work that FrameLoader::openURL does, except it relies on the fact
 // that a higher level already checked that the URLs match and the scrolling is the right thing to do.
-void FrameLoader::scrollToAnchor(const KURL& URL)
+void FrameLoader::scrollToAnchor(const KURL& url)
 {
-    m_URL = URL;
+    m_URL = url;
     started();
 
     gotoAnchor();
@@ -1849,7 +1849,7 @@ void FrameLoader::startRedirectionTimer()
         case ScheduledRedirection::redirection:
         case ScheduledRedirection::locationChange:
         case ScheduledRedirection::locationChangeDuringLoad:
-            clientRedirected(m_scheduledRedirection->URL.deprecatedString(),
+            clientRedirected(m_scheduledRedirection->url.deprecatedString(),
                 m_scheduledRedirection->delay,
                 currentTime() + m_redirectionTimer.nextFireInterval(),
                 m_scheduledRedirection->lockHistory,
@@ -1930,9 +1930,9 @@ void FrameLoader::finalSetupForReplace(DocumentLoader* loader)
     m_client->clearUnarchivingState(loader);
 }
 
-void FrameLoader::load(const KURL& URL, Event* event)
+void FrameLoader::load(const KURL& url, Event* event)
 {
-    load(ResourceRequest(URL), false, true, event, 0, HashMap<String, String>());
+    load(ResourceRequest(url), false, true, event, 0, HashMap<String, String>());
 }
 
 void FrameLoader::load(const FrameLoadRequest& request, bool lockHistory, bool userGesture, Event* event,
@@ -1948,9 +1948,9 @@ void FrameLoader::load(const FrameLoadRequest& request, bool lockHistory, bool u
         referrer = m_outgoingReferrer;
  
     ASSERT(frame()->document());
-    if (url.url().startsWith("file:", false)) {
+    if (url.deprecatedString().startsWith("file:", false)) {
         if (!canLoad(url, frame()->document()) && !canLoad(url, referrer)) {
-            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
+            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
             return;
         }
     }
@@ -1986,12 +1986,12 @@ void FrameLoader::load(const FrameLoadRequest& request, bool lockHistory, bool u
             page->chrome()->focus();
 }
 
-void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType newLoadType,
+void FrameLoader::load(const KURL& newURL, const String& referrer, FrameLoadType newLoadType,
     const String& frameName, Event* event, PassRefPtr<FormState> formState)
 {
     bool isFormSubmission = formState;
     
-    ResourceRequest request(URL);
+    ResourceRequest request(newURL);
     if (!referrer.isEmpty())
         request.setHTTPReferrer(referrer);
     addExtraFieldsToRequest(request, true, event || isFormSubmission);
@@ -2000,11 +2000,11 @@ void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType ne
 
     ASSERT(newLoadType != FrameLoadTypeSame);
 
-    NavigationAction action(URL, newLoadType, isFormSubmission, event);
+    NavigationAction action(newURL, newLoadType, isFormSubmission, event);
 
     if (!frameName.isEmpty()) {
         if (Frame* targetFrame = m_frame->tree()->find(frameName))
-            targetFrame->loader()->load(URL, referrer, newLoadType, String(), event, formState);
+            targetFrame->loader()->load(newURL, referrer, newLoadType, String(), event, formState);
         else
             checkNewWindowPolicy(action, request, formState, frameName);
         return;
@@ -2012,7 +2012,7 @@ void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType ne
 
     RefPtr<DocumentLoader> oldDocumentLoader = m_documentLoader;
 
-    bool sameURL = shouldTreatURLAsSameAsCurrent(URL);
+    bool sameURL = shouldTreatURLAsSameAsCurrent(newURL);
     
     // Make sure to do scroll to anchor processing even if the URL is
     // exactly the same so pages with '#' links and DHTML side effects
@@ -2020,7 +2020,7 @@ void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType ne
     if (!isFormSubmission
         && newLoadType != FrameLoadTypeReload
         && newLoadType != FrameLoadTypeSame
-        && !shouldReload(URL, url())
+        && !shouldReload(newURL, url())
         // We don't want to just scroll if a link from within a
         // frameset is trying to reload the frameset into _top.
         && !m_frame->isFrameSet()) {
@@ -2145,7 +2145,7 @@ void FrameLoader::load(DocumentLoader* loader, FrameLoadType type, PassRefPtr<Fo
 // FIXME: It would be nice if we could collapse these into one or two functions.
 bool FrameLoader::canLoad(const KURL& url, const String& referrer)
 {
-    if (!shouldTreatURLAsLocal(url.url()))
+    if (!shouldTreatURLAsLocal(url.string()))
         return true;
 
     return shouldTreatURLAsLocal(referrer);
@@ -2153,7 +2153,7 @@ bool FrameLoader::canLoad(const KURL& url, const String& referrer)
 
 bool FrameLoader::canLoad(const KURL& url, const Document* doc)
 {
-    if (!shouldTreatURLAsLocal(url.url()))
+    if (!shouldTreatURLAsLocal(url.string()))
         return true;
 
     return doc && doc->isAllowedToLoadLocalResources();
@@ -2185,7 +2185,7 @@ bool FrameLoader::shouldHideReferrer(const KURL& url, const String& referrer)
     if (!referrerIsSecureURL)
         return false;
 
-    bool URLIsSecureURL = url.url().startsWith("https:", false);
+    bool URLIsSecureURL = url.deprecatedString().startsWith("https:", false);
 
     return !URLIsSecureURL;
 }
@@ -2361,7 +2361,7 @@ bool FrameLoader::shouldAllowNavigation(Frame* targetFrame) const
         Document* targetDocument = targetFrame->document();
         // FIXME: this error message should contain more specifics of why the navigation change is not allowed.
         String message = String::format("Unsafe JavaScript attempt to initiate a navigation change for frame with URL %s from frame with URL %s.\n",
-                                        targetDocument->URL().utf8().data(), activeDocument->URL().utf8().data());
+                                        targetDocument->url().utf8().data(), activeDocument->url().utf8().data());
 
         if (KJS::Interpreter::shouldPrintExceptions())
             printf("%s", message.utf8().data());
@@ -2552,7 +2552,7 @@ void FrameLoader::commitProvisionalLoad(PassRefPtr<CachedPage> prpCachedPage)
     } else {        
         KURL url = pdl->substituteData().responseURL();
         if (url.isEmpty())
-            url = pdl->URL();
+            url = pdl->url();
         if (url.isEmpty())
             url = pdl->responseURL();
         if (url.isEmpty())
@@ -2680,9 +2680,9 @@ void FrameLoader::clientRedirectCancelledOrFinished(bool cancelWithLoadInProgres
     m_sentRedirectNotification = false;
 }
 
-void FrameLoader::clientRedirected(const KURL& URL, double seconds, double fireDate, bool lockHistory, bool isJavaScriptFormAction)
+void FrameLoader::clientRedirected(const KURL& url, double seconds, double fireDate, bool lockHistory, bool isJavaScriptFormAction)
 {
-    m_client->dispatchWillPerformClientRedirect(URL, seconds, fireDate);
+    m_client->dispatchWillPerformClientRedirect(url, seconds, fireDate);
     
     // Remember that we sent a redirect notification to the frame load delegate so that when we commit
     // the next provisional load, we can send a corresponding -webView:didCancelClientRedirectForFrame:
@@ -2740,13 +2740,13 @@ void FrameLoader::open(CachedPage& cachedPage)
         m_frame->setJSDefaultStatusBarText(String());
     }
 
-    KURL URL = cachedPage.URL();
+    KURL url = cachedPage.url();
 
-    if (URL.protocol().startsWith("http") && !URL.host().isEmpty() && URL.path().isEmpty())
-        URL.setPath("/");
+    if (url.protocol().startsWith("http") && !url.host().isEmpty() && url.path().isEmpty())
+        url.setPath("/");
     
-    m_URL = URL;
-    m_workingURL = URL;
+    m_URL = url;
+    m_workingURL = url;
 
     started();
 
@@ -2759,7 +2759,7 @@ void FrameLoader::open(CachedPage& cachedPage)
     m_needsClear = true;
     m_isComplete = false;
     m_didCallImplicitClose = false;
-    m_outgoingReferrer = URL.url();
+    m_outgoingReferrer = url.string();
 
     FrameView* view = cachedPage.view();
     if (view)
@@ -2795,18 +2795,6 @@ void FrameLoader::finishedLoading()
     checkLoadComplete();
 }
 
-// FIXME: Which one of these URL methods is right?
-
-KURL FrameLoader::url() const
-{
-    return m_URL;
-}
-
-KURL FrameLoader::URL() const
-{
-    return activeDocumentLoader()->URL();
-}
-
 bool FrameLoader::isArchiveLoadPending(ResourceLoader* loader) const
 {
     return m_client->isArchiveLoadPending(loader);
@@ -3162,14 +3150,14 @@ void FrameLoader::tokenizerProcessedData()
     checkCompleted();
 }
 
-void FrameLoader::didTellBridgeAboutLoad(const String& URL)
+void FrameLoader::didTellBridgeAboutLoad(const String& url)
 {
-    m_urlsBridgeKnowsAbout.add(URL);
+    m_urlsBridgeKnowsAbout.add(url);
 }
 
-bool FrameLoader::haveToldBridgeAboutLoad(const String& URL)
+bool FrameLoader::haveToldBridgeAboutLoad(const String& url)
 {
-    return m_urlsBridgeKnowsAbout.contains(URL);
+    return m_urlsBridgeKnowsAbout.contains(url);
 }
 
 void FrameLoader::handledOnloadEvents()
@@ -3237,7 +3225,7 @@ void FrameLoader::committedLoad(DocumentLoader* loader, const char* data, int le
     m_client->committedLoad(loader, data, length);
 }
 
-void FrameLoader::post(const KURL& URL, const String& referrer, const String& frameName, PassRefPtr<FormData> formData, 
+void FrameLoader::post(const KURL& url, const String& referrer, const String& frameName, PassRefPtr<FormData> formData, 
     const String& contentType, Event* event, HTMLFormElement* form, const HashMap<String, String>& formValues)
 {
     // When posting, use the NSURLRequestReloadIgnoringCacheData load flag.
@@ -3246,7 +3234,7 @@ void FrameLoader::post(const KURL& URL, const String& referrer, const String& fr
 
     // FIXME: Where's the code that implements what the comment above says?
 
-    ResourceRequest request(URL);
+    ResourceRequest request(url);
     addExtraFieldsToRequest(request, true, true);
 
     if (!referrer.isEmpty())
@@ -3255,7 +3243,7 @@ void FrameLoader::post(const KURL& URL, const String& referrer, const String& fr
     request.setHTTPBody(formData);
     request.setHTTPContentType(contentType);
 
-    NavigationAction action(URL, FrameLoadTypeStandard, true, event);
+    NavigationAction action(url, FrameLoadTypeStandard, true, event);
 
     RefPtr<FormState> formState;
     if (form && !formValues.isEmpty())
@@ -3310,7 +3298,7 @@ void FrameLoader::loadResourceSynchronously(const ResourceRequest& request, Reso
 
     if (error.isNull()) {
         ASSERT(!newRequest.isNull());
-        didTellBridgeAboutLoad(newRequest.url().url());
+        didTellBridgeAboutLoad(newRequest.url().string());
         ResourceHandle::loadResourceSynchronously(newRequest, error, response, data);
     }
     
@@ -3412,10 +3400,10 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ
     if (!shouldContinue)
         return;
 
-    KURL URL = request.url();
+    KURL url = request.url();
     
-    m_documentLoader->replaceRequestURLForAnchorScroll(URL);
-    if (!isRedirect && !shouldTreatURLAsSameAsCurrent(URL)) {
+    m_documentLoader->replaceRequestURLForAnchorScroll(url);
+    if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url)) {
         // NB: must happen after _setURL, since we add based on the current request.
         // Must also happen before we openURL and displace the scroll position, since
         // adding the BF item will save away scroll state.
@@ -3430,7 +3418,7 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ
         addHistoryItemForFragmentScroll();
     }
     
-    scrollToAnchor(URL);
+    scrollToAnchor(url);
     
     if (!isRedirect)
         // This will clear previousItem from the rest of the frame tree that didn't
@@ -3782,11 +3770,11 @@ void FrameLoader::cachePageForHistoryItem(HistoryItem* item)
     }
 }
 
-bool FrameLoader::shouldTreatURLAsSameAsCurrent(const KURL& URL) const
+bool FrameLoader::shouldTreatURLAsSameAsCurrent(const KURL& url) const
 {
     if (!m_currentHistoryItem)
         return false;
-    return URL == m_currentHistoryItem->url() || URL == m_currentHistoryItem->originalURL();
+    return url == m_currentHistoryItem->url() || url == m_currentHistoryItem->originalURL();
 }
 
 PassRefPtr<HistoryItem> FrameLoader::createHistoryItem(bool useOriginal)
@@ -3809,7 +3797,7 @@ PassRefPtr<HistoryItem> FrameLoader::createHistoryItem(bool useOriginal)
             url = docLoader->requestURL();                
     }
 
-    LOG(History, "WebCoreHistory: Creating item for %s", url.url().ascii());
+    LOG(History, "WebCoreHistory: Creating item for %s", url.string().ascii().data());
     
     // Frames that have never successfully loaded any content
     // may have no URL at all. Currently our history code can't
@@ -3822,7 +3810,7 @@ PassRefPtr<HistoryItem> FrameLoader::createHistoryItem(bool useOriginal)
         originalURL = KURL("about:blank");
     
     RefPtr<HistoryItem> item = new HistoryItem(url, m_frame->tree()->name(), m_frame->tree()->parent() ? m_frame->tree()->parent()->tree()->name() : "", docLoader ? docLoader->title() : "");
-    item->setOriginalURLString(originalURL.url());
+    item->setOriginalURLString(originalURL.string());
     
     // Save form state if this is a POST
     if (docLoader) {
@@ -3853,7 +3841,7 @@ void FrameLoader::addBackForwardItemClippedAtTarget(bool doClip)
             }
 
             RefPtr<HistoryItem> item = frameLoader->createHistoryItemTree(m_frame, doClip);
-            LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", item.get(), documentLoader()->URL().url().ascii());
+            LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", item.get(), documentLoader()->url().string().ascii().data());
             page->backForwardList()->addItem(item);
         }
 }
@@ -3976,7 +3964,7 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
     KURL itemOriginalURL = item->originalURL();
     KURL currentURL;
     if (documentLoader())
-        currentURL = documentLoader()->URL();
+        currentURL = documentLoader()->url();
     RefPtr<FormData> formData = item->formData();
 
     // Are we navigating to an anchor within the page?
@@ -4030,7 +4018,7 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
                 load(cachedPage->documentLoader(), loadType, 0);   
                 inPageCache = true;
             } else {
-                LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", m_provisionalHistoryItem->url().url().ascii());
+                LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", m_provisionalHistoryItem->url().string().ascii().data());
                 pageCache()->remove(item);
             }
         }
@@ -4095,7 +4083,7 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
 // Walk the frame tree and ensure that the URLs match the URLs in the item.
 bool FrameLoader::urlsMatchItem(HistoryItem* item) const
 {
-    KURL currentURL = documentLoader()->URL();
+    KURL currentURL = documentLoader()->url();
     
     if (!equalIgnoringRef(currentURL, item->url()))
         return false;
@@ -4147,7 +4135,7 @@ void FrameLoader::recursiveGoToItem(HistoryItem* item, HistoryItem* fromItem, Fr
     KURL itemURL = item->url();
     KURL currentURL;
     if (documentLoader())
-        currentURL = documentLoader()->URL();
+        currentURL = documentLoader()->url();
     
     // Always reload the target frame of the item we're going to.  This ensures that we will
     // do -some- load for the transition, which means a proper notification will be posted
@@ -4221,7 +4209,7 @@ void FrameLoader::addHistoryForCurrentLocation()
 
 void FrameLoader::updateHistoryForStandardLoad()
 {
-    LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", documentLoader()->URL().url().ascii());
+    LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", documentLoader()->url().string().ascii().data());
     
     bool frameNavigationOnLoad = false;
     
@@ -4237,7 +4225,7 @@ void FrameLoader::updateHistoryForStandardLoad()
         if (!documentLoader()->urlForHistory().isEmpty())
             addHistoryForCurrentLocation();
     } else if (documentLoader()->unreachableURL().isEmpty() && m_currentHistoryItem) {
-        m_currentHistoryItem->setURL(documentLoader()->URL());
+        m_currentHistoryItem->setURL(documentLoader()->url());
         m_currentHistoryItem->setFormInfoFromRequest(documentLoader()->request());
     }
     
@@ -4306,7 +4294,7 @@ void FrameLoader::updateHistoryForRedirectWithLockedHistory()
         if (!m_currentHistoryItem && !m_frame->tree()->parent())
             addHistoryForCurrentLocation();
         if (m_currentHistoryItem) {
-            m_currentHistoryItem->setURL(documentLoader()->URL());
+            m_currentHistoryItem->setURL(documentLoader()->url());
             m_currentHistoryItem->setFormInfoFromRequest(documentLoader()->request());
         }
     } else {
index fd477cd..395e763 100644 (file)
@@ -272,15 +272,15 @@ namespace WebCore {
 
         void setDefersLoading(bool);
 
-        void changeLocation(const String& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
-        void changeLocation(const KURL& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
+        void changeLocation(const String& url, const String& referrer, bool lockHistory = true, bool userGesture = false);
+        void changeLocation(const KURL&, const String& referrer, bool lockHistory = true, bool userGesture = false);
         void urlSelected(const ResourceRequest&, const String& target, Event*, bool lockHistory, bool userGesture);
         void urlSelected(const FrameLoadRequest&, Event*, bool lockHistory, bool userGesture);
       
-        bool requestFrame(HTMLFrameOwnerElement*, const String& URL, const AtomicString& frameName);
-        Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL& URL, const String& name, const String& referrer);
+        bool requestFrame(HTMLFrameOwnerElement*, const String& url, const AtomicString& frameName);
+        Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer);
 
-        void submitForm(const char* action, const String& URL, PassRefPtr<FormData>, const String& target, const String& contentType, const String& boundary, Event*);
+        void submitForm(const char* action, const String& url, PassRefPtr<FormData>, const String& target, const String& contentType, const String& boundary, Event*);
         void submitFormAgain();
         void submitForm(const FrameLoadRequest&, Event*);
 
@@ -298,8 +298,8 @@ namespace WebCore {
         KURL dataURLBaseFromRequest(const ResourceRequest& request) const;
 
         bool isScheduledLocationChangePending() const { return m_scheduledRedirection && isLocationChange(*m_scheduledRedirection); }
-        void scheduleHTTPRedirection(double delay, const String& URL);
-        void scheduleLocationChange(const String& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
+        void scheduleHTTPRedirection(double delay, const String& url);
+        void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool userGesture = false);
         void scheduleRefresh(bool userGesture = false);
         void scheduleHistoryNavigation(int steps);
 
@@ -319,7 +319,7 @@ namespace WebCore {
         void setEncoding(const String& encoding, bool userChosen);
         String encoding() const;
 
-        KJS::JSValue* executeScript(const String& URL, int baseLine, const String& script);
+        KJS::JSValue* executeScript(const String& url, int baseLine, const String& script);
         KJS::JSValue* executeScript(const String& script, bool forceUserGesture = false);
 
         void gotoAnchor();
@@ -357,9 +357,7 @@ namespace WebCore {
 
         void frameDetached();
 
-        // FIXME: Which one of these URL methods is right?
-        KURL url() const;
-        KURL URL() const;
+        const KURL& url() const { return m_URL; }
 
         void updateBaseURLForEmptyDocument();
 
@@ -379,13 +377,13 @@ namespace WebCore {
 
         bool isComplete() const;
 
-        bool requestObject(RenderPart* frame, const String& URL, const AtomicString& frameName,
+        bool requestObject(RenderPart* frame, const String& url, const AtomicString& frameName,
             const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
 
-        KURL completeURL(const String& URL);
+        KURL completeURL(const String& url);
 
-        void didTellBridgeAboutLoad(const String& URL);
-        bool haveToldBridgeAboutLoad(const String& URL);
+        void didTellBridgeAboutLoad(const String& url);
+        bool haveToldBridgeAboutLoad(const String& url);
 
         KURL originalRequestURL() const;
 
index a1b566d..122363a 100644 (file)
@@ -169,7 +169,7 @@ void ImageDocument::createDocumentStructure()
     
     imageElement->setAttribute(styleAttr, "-webkit-user-select: none");        
     imageElement->setLoadManually(true);
-    imageElement->setSrc(URL());
+    imageElement->setSrc(url());
     
     body->appendChild(imageElement, ec);
     
index 8efc3d1..6de846c 100644 (file)
@@ -173,9 +173,9 @@ void MainResourceLoader::willSendRequest(ResourceRequest& newRequest, const Reso
     frameLoader()->checkNavigationPolicy(newRequest, callContinueAfterNavigationPolicy, this);
 }
 
-static bool shouldLoadAsEmptyDocument(const KURL& URL)
+static bool shouldLoadAsEmptyDocument(const KURL& url)
 {
-    return URL.isEmpty() || equalIgnoringCase(String(URL.protocol()), "about");
+    return url.isEmpty() || equalIgnoringCase(String(url.protocol()), "about");
 }
 
 void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy, const ResourceResponse& r)
@@ -295,7 +295,7 @@ void MainResourceLoader::didReceiveData(const char* data, int length, long long
 
 void MainResourceLoader::didFinishLoading()
 {
-    ASSERT(shouldLoadAsEmptyDocument(frameLoader()->URL()) || !defersLoading());
+    ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading());
 
     // The additional processing can do anything including possibly removing the last
     // reference to this object.
index 8605d07..6bd65ae 100644 (file)
@@ -52,29 +52,29 @@ NavigationAction::NavigationAction()
 {
 }
 
-NavigationAction::NavigationAction(const KURL& URL, NavigationType type)
-    : m_URL(URL)
+NavigationAction::NavigationAction(const KURL& url, NavigationType type)
+    : m_URL(url)
     , m_type(type)
 {
 }
 
-NavigationAction::NavigationAction(const KURL& URL, FrameLoadType frameLoadType,
+NavigationAction::NavigationAction(const KURL& url, FrameLoadType frameLoadType,
         bool isFormSubmission)
-    : m_URL(URL)
+    : m_URL(url)
     , m_type(navigationType(frameLoadType, isFormSubmission, 0))
 {
 }
 
-NavigationAction::NavigationAction(const KURL& URL, NavigationType type, PassRefPtr<Event> event)
-    : m_URL(URL)
+NavigationAction::NavigationAction(const KURL& url, NavigationType type, PassRefPtr<Event> event)
+    : m_URL(url)
     , m_type(type)
     , m_event(event)
 {
 }
 
-NavigationAction::NavigationAction(const KURL& URL, FrameLoadType frameLoadType,
+NavigationAction::NavigationAction(const KURL& url, FrameLoadType frameLoadType,
         bool isFormSubmission, PassRefPtr<Event> event)
-    : m_URL(URL)
+    : m_URL(url)
     , m_type(navigationType(frameLoadType, isFormSubmission, event))
     , m_event(event)
 {
index 78cd3bc..0477c6e 100644 (file)
@@ -46,7 +46,7 @@ namespace WebCore {
 
         bool isEmpty() const { return m_URL.isEmpty(); }
 
-        KURL URL() const { return m_URL; }
+        KURL url() const { return m_URL; }
         NavigationType type() const { return m_type; }
         const Event* event() const { return m_event.get(); }
 
index ed5205c..ea58c89 100644 (file)
@@ -86,7 +86,7 @@ void PluginTokenizer::createDocumentStructure()
     m_embedElement->setAttribute(heightAttr, "100%");
     
     m_embedElement->setAttribute(nameAttr, "plugin");
-    m_embedElement->setSrc(m_doc->URL());
+    m_embedElement->setSrc(m_doc->url());
     m_embedElement->setType(m_doc->frame()->loader()->responseMIMEType());
     
     body->appendChild(embedElement, ec);    
index 5699019..5ba6660 100644 (file)
@@ -77,7 +77,7 @@ SubresourceLoader::~SubresourceLoader()
 
 bool SubresourceLoader::load(const ResourceRequest& r)
 {
-    m_frame->loader()->didTellBridgeAboutLoad(r.url().url());
+    m_frame->loader()->didTellBridgeAboutLoad(r.url().string());
     
     return ResourceLoader::load(r);
 }
@@ -96,7 +96,7 @@ PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, Subresourc
     if (!skipCanLoadCheck
             && FrameLoader::restrictAccessToLocal()
             && !FrameLoader::canLoad(request.url(), frame->document())) {
-        FrameLoader::reportLocalLoadFailed(frame->page(), request.url().url());
+        FrameLoader::reportLocalLoadFailed(frame->page(), request.url().string());
         return 0;
     }
     
index 5b32bf3..2d333f4 100644 (file)
@@ -75,7 +75,7 @@ void IconLoader::startLoading()
 
     RefPtr<SubresourceLoader> loader = SubresourceLoader::create(m_frame, this, m_frame->loader()->iconURL());
     if (!loader)
-        LOG_ERROR("Failed to start load for icon at url %s", m_frame->loader()->iconURL().url().ascii());
+        LOG_ERROR("Failed to start load for icon at url %s", m_frame->loader()->iconURL().string().ascii().data());
 
     // Store the handle so we can cancel the load if stopLoading is called later.
     // But only do it if the load hasn't already completed.
@@ -138,7 +138,6 @@ void IconLoader::didFinishLoading(SubresourceLoader* resourceLoader)
 
 void IconLoader::finishLoading(const KURL& iconURL, PassRefPtr<SharedBuffer> data)
 {
-
     // When an icon load results in a 404 we commit it to the database here and clear the loading state.  
     // But the SubresourceLoader continues pulling in data in the background for the 404 page if the server sends one.  
     // Once that data finishes loading or if the load is cancelled while that data is being read, finishLoading ends up being called a second time.
@@ -147,8 +146,8 @@ void IconLoader::finishLoading(const KURL& iconURL, PassRefPtr<SharedBuffer> dat
     // <rdar://problem/5463392> tracks that enhancement
     
     if (!iconURL.isEmpty() && m_loadIsInProgress) {
-        iconDatabase()->setIconDataForIconURL(data, iconURL.url());
-        LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", iconURL.url().ascii());
+        iconDatabase()->setIconDataForIconURL(data, iconURL.string());
+        LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", iconURL.string().ascii().data());
         m_frame->loader()->commitIconURLToIconDatabase(iconURL);
         m_frame->loader()->client()->dispatchDidReceiveIcon();
     }
index 020e1f1..4e26906 100644 (file)
@@ -73,10 +73,10 @@ void Loader::servePendingRequests()
         if (!req->cachedResource()->accept().isEmpty())
             request.setHTTPAccept(req->cachedResource()->accept());
 
-        KURL r = dl->doc()->URL();
+        KURL r = dl->doc()->url();
         if (r.protocol().startsWith("http") && r.path().isEmpty())
             r.setPath("/");
-        request.setHTTPReferrer(r.url());
+        request.setHTTPReferrer(r.string());
         DeprecatedString domain = r.host();
         if (dl->doc()->isHTMLDocument())
             domain = static_cast<HTMLDocument*>(dl->doc())->domain().deprecatedString();
index 7029122..76ad5c7 100644 (file)
@@ -98,11 +98,9 @@ NSData *urlOriginalData(NSURL *url)
     NSData *data = [NSData dataWithBytesNoCopy:buffer length:bytesFilled freeWhenDone:YES];
     
     NSURL *baseURL = (NSURL *)CFURLGetBaseURL((CFURLRef)url);
-    if (baseURL) {
-        NSURL *URL = urlWithDataRelativeToURL(data, baseURL);
-        return urlOriginalData(URL);
-    } else
-        return data;
+    if (baseURL)
+        return urlOriginalData(urlWithDataRelativeToURL(data, baseURL));
+    return data;
 }
 
 NSURL *urlWithData(NSData *data)
index 3b6ae9d..d6863c3 100644 (file)
@@ -327,7 +327,7 @@ void Chrome::setToolTip(const HitTestResult& result)
         // Get tooltip representing link's URL
         if (toolTip.isEmpty())
             // FIXME: Need to pass this URL through userVisibleString once that's in WebCore
-            toolTip = result.absoluteLinkURL().url();
+            toolTip = result.absoluteLinkURL().string();
     }
 
     // Lastly we'll consider a tooltip for element with "title" attribute
index 19216ae..081dc71 100644 (file)
@@ -156,7 +156,7 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
         case ContextMenuItemTagOpenFrameInNewWindow: {
             KURL url = frame->loader()->documentLoader()->unreachableURL();
             if (frame && url.isEmpty())
-                url = frame->loader()->documentLoader()->URL();
+                url = frame->loader()->documentLoader()->url();
             openNewWindow(url, frame);
             break;
         }
index 71eb12e..1aba62f 100644 (file)
@@ -296,7 +296,7 @@ void Frame::setUserStyleSheetLocation(const KURL& url)
     delete d->m_userStyleSheetLoader;
     d->m_userStyleSheetLoader = 0;
     if (d->m_doc && d->m_doc->docLoader())
-        d->m_userStyleSheetLoader = new UserStyleSheetLoader(d->m_doc, url.url());
+        d->m_userStyleSheetLoader = new UserStyleSheetLoader(d->m_doc, url.string());
 }
 
 void Frame::setUserStyleSheet(const String& styleSheet)
index 98035bb..adf0bca 100644 (file)
@@ -145,7 +145,7 @@ struct InspectorResource : public RefCounted<InspectorResource> {
         if (!doc)
             return Other;
 
-        CachedResource* cachedResource = doc->docLoader()->cachedResource(requestURL.url());
+        CachedResource* cachedResource = doc->docLoader()->cachedResource(requestURL.string());
         if (!cachedResource)
             return Other;
 
@@ -271,7 +271,7 @@ static JSValueRef addSourceToFrame(JSContextRef ctx, JSObjectRef /*function*/, J
         if (!doc)
             return undefined;
 
-        CachedResource* cachedResource = doc->docLoader()->cachedResource(resource->requestURL.url());
+        CachedResource* cachedResource = doc->docLoader()->cachedResource(resource->requestURL.string());
         if (!cachedResource)
             return undefined;
 
@@ -925,7 +925,7 @@ JSObjectRef InspectorController::addScriptResource(InspectorResource* resource)
     JSObjectRef resourceConstructor = JSValueToObject(m_scriptContext, JSObjectGetProperty(m_scriptContext, m_scriptObject, resourceString, 0), 0);
     JSStringRelease(resourceString);
 
-    String urlString = resource->requestURL.url();
+    String urlString = resource->requestURL.string();
     JSStringRef url = JSStringCreateWithCharacters(urlString.characters(), urlString.length());
     JSValueRef urlValue = JSValueMakeString(m_scriptContext, url);
     JSStringRelease(url);
@@ -1022,7 +1022,7 @@ void InspectorController::updateScriptResourceRequest(InspectorResource* resourc
     if (!resource->scriptObject || !m_scriptContext)
         return;
 
-    String urlString = resource->requestURL.url();
+    String urlString = resource->requestURL.string();
     JSStringRef url = JSStringCreateWithCharacters(urlString.characters(), urlString.length());
     JSValueRef urlValue = JSValueMakeString(m_scriptContext, url);
     JSStringRelease(url);
@@ -1370,7 +1370,7 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
         ASSERT(m_mainResource);
         // FIXME: Should look into asserting that m_mainResource->loader == loader here.
 
-        m_client->inspectedURLChanged(loader->URL().url());
+        m_client->inspectedURLChanged(loader->url().string());
 
         deleteAllValues(m_consoleMessages);
         m_consoleMessages.clear();
index eae6e80..1c03154 100644 (file)
@@ -1201,13 +1201,13 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     }
 }
 
-- (BOOL)getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)URL
+- (BOOL)getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)url
 {
     Document* doc = m_frame->document();
     if (!doc)
         return NO;
 
-    CachedResource* resource = doc->docLoader()->cachedResource(URL);
+    CachedResource* resource = doc->docLoader()->cachedResource(url);
     if (!resource)
         return NO;
 
index 43811ff..2de0cff 100644 (file)
@@ -27,6 +27,7 @@
 #define KURL_h
 
 #include "DeprecatedString.h"
+#include "PlatformString.h"
 #include <wtf/Platform.h>
 
 #if PLATFORM(CF)
@@ -44,7 +45,6 @@ class NSURL;
 namespace WebCore {
 
     class KURL;
-    class String;
     class TextEncoding;
 
     bool operator==(const KURL&, const KURL&);
@@ -65,10 +65,14 @@ public:
 #if PLATFORM(CF)
     KURL(CFURLRef);
 #endif
-    bool isEmpty() const { return urlString.isEmpty(); } 
+
+    bool isNull() const { return urlString.isNull(); }
+    bool isEmpty() const { return urlString.isEmpty(); }
+
     bool hasPath() const;
 
-    DeprecatedString url() const { return urlString; }
+    String string() const { return urlString; }
+    const DeprecatedString& deprecatedString() const { return urlString; }
 
     DeprecatedString protocol() const;
     DeprecatedString host() const;
index 9f35316..9c415ca 100644 (file)
@@ -166,20 +166,20 @@ String ClipboardMac::getData(const String& type, bool& success) const
                 if (count > 0) {
                     if (type != "text/uri-list")
                         count = 1;
-                    NSMutableString *URLs = [NSMutableString string];
+                    NSMutableString *urls = [NSMutableString string];
                     unsigned i;
                     for (i = 0; i < count; i++) {
                         if (i > 0) {
-                            [URLs appendString:@"\n"];
+                            [urls appendString:@"\n"];
                         }
                         NSString *string = [fileList objectAtIndex:i];
                         if (![string isKindOfClass:[NSString class]])
                             break;
-                        NSURL *URL = [NSURL fileURLWithPath:string];
-                        [URLs appendString:[URL absoluteString]];
+                        NSURL *url = [NSURL fileURLWithPath:string];
+                        [urls appendString:[url absoluteString]];
                     }
                     if (i == count)
-                        cocoaValue = URLs;
+                        cocoaValue = urls;
                 }
             }
         }
index 3c9fecb..2e6d529 100644 (file)
@@ -42,8 +42,8 @@ String cookies(const KURL& url)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
-    NSURL *URL = url.getNSURL();
-    NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
+    NSURL *cookieURL = url.getNSURL();
+    NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
 
     // <rdar://problem/5632883> On 10.5, NSHTTPCookieStorage would happily store an empty cookie, which would be sent as "Cookie: =".
     // We have a workaround in setCookies() to prevent that, but we also need to avoid sending cookies that were previously stored.
@@ -70,14 +70,14 @@ void setCookies(const KURL& url, const KURL& policyBaseURL, const String& cookie
     if (cookieStr.isEmpty())
         return;
 
-    NSURL *URL = url.getNSURL();
+    NSURL *cookieURL = url.getNSURL();
     
     // <http://bugs.webkit.org/show_bug.cgi?id=6531>, <rdar://4409034>
     // cookiesWithResponseHeaderFields doesn't parse cookies without a value
     String cookieString = cookieStr.contains('=') ? cookieStr : cookieStr + "=";
     
-    NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:URL];
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:URL mainDocumentURL:policyBaseURL.getNSURL()];    
+    NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL];
+    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:cookieURL mainDocumentURL:policyBaseURL.getNSURL()];    
 
     END_BLOCK_OBJC_EXCEPTIONS;
 }
index 4b02297..87db2f9 100644 (file)
@@ -210,12 +210,12 @@ void Pasteboard::writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL&
     
     ASSERT(!url.isEmpty());
     
-    NSURL *URL = url.getNSURL();
-    NSString *userVisibleString = frame->editor()->client()->userVisibleString(URL);
+    NSURL *cocoaURL = url.getNSURL();
+    NSString *userVisibleString = frame->editor()->client()->userVisibleString(cocoaURL);
     
     NSString *title = (NSString*)titleStr;
     if ([title length] == 0) {
-        title = [[URL path] lastPathComponent];
+        title = [[cocoaURL path] lastPathComponent];
         if ([title length] == 0)
             title = userVisibleString;
     }
@@ -226,7 +226,7 @@ void Pasteboard::writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL&
                                      nil]
                             forType:WebURLsWithTitlesPboardType];
     if ([types containsObject:NSURLPboardType])
-        [URL writeToPasteboard:pasteboard];
+        [cocoaURL writeToPasteboard:pasteboard];
     if ([types containsObject:WebURLPboardType])
         [pasteboard setString:userVisibleString forType:WebURLPboardType];
     if ([types containsObject:WebURLNamePboardType])
@@ -240,7 +240,7 @@ void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame)
     Pasteboard::writeURL(m_pasteboard.get(), nil, url, titleStr, frame);
 }
 
-static NSFileWrapper* fileWrapperForImage(CachedResource* resource, NSURL *URL)
+static NSFileWrapper* fileWrapperForImage(CachedResource* resource, NSURL *url)
 {
     SharedBuffer* coreData = resource->data();
     NSData *data = [[[NSData alloc] initWithBytes:coreData->platformData() 
@@ -250,7 +250,7 @@ static NSFileWrapper* fileWrapperForImage(CachedResource* resource, NSURL *URL)
     NSString *MIMEType = nil;
     if (!coreMIMEType.isNull())
         MIMEType = coreMIMEType;
-    [wrapper setPreferredFilename:suggestedFilenameWithMIMEType(URL, MIMEType)];
+    [wrapper setPreferredFilename:suggestedFilenameWithMIMEType(url, MIMEType)];
     return wrapper;
 }
 
@@ -270,12 +270,12 @@ void Pasteboard::writeImage(Node* node, const KURL& url, const String& title)
     ASSERT(node);
     Frame* frame = node->document()->frame();
 
-    NSURL *URL = url.getNSURL();
-    ASSERT(URL);
+    NSURL *cocoaURL = url.getNSURL();
+    ASSERT(cocoaURL);
 
     NSArray* types = writableTypesForImage();
     [m_pasteboard.get() declareTypes:types owner:nil];
-    writeURL(m_pasteboard.get(), types, URL, nsStringNilIfEmpty(title), frame);
+    writeURL(m_pasteboard.get(), types, cocoaURL, nsStringNilIfEmpty(title), frame);
 
     ASSERT(node->renderer() && node->renderer()->isImage());
     RenderImage* renderer = static_cast<RenderImage*>(node->renderer());
@@ -289,7 +289,7 @@ void Pasteboard::writeImage(Node* node, const KURL& url, const String& title)
     String MIMEType = cachedImage->response().mimeType();
     ASSERT(MIMETypeRegistry::isSupportedImageResourceMIMEType(MIMEType));
 
-    writeFileWrapperAsRTFDAttachment(fileWrapperForImage(cachedImage, URL));
+    writeFileWrapperAsRTFDAttachment(fileWrapperForImage(cachedImage, cocoaURL));
 }
 
 bool Pasteboard::canSmartReplace()
@@ -324,13 +324,11 @@ String Pasteboard::plainText(Frame* frame)
     }
     
     
-    NSURL *URL;
-    
-    if ((URL = [NSURL URLFromPasteboard:m_pasteboard.get()])) {
+    if (NSURL *url = [NSURL URLFromPasteboard:m_pasteboard.get()]) {
         // FIXME: using the editorClient to call into webkit, for now, since 
-        // calling [URL _web_userVisibleString] from WebCore involves migrating a sizable web of 
+        // calling _web_userVisibleString from WebCore involves migrating a sizable web of 
         // helper code that should either be done in a separate patch or figured out in another way.
-        string = frame->editor()->client()->userVisibleString(URL);
+        string = frame->editor()->client()->userVisibleString(url);
         if ([string length] > 0)
             return string;
     }
index f1c0477..969a9f6 100644 (file)
@@ -172,11 +172,11 @@ bool ResourceHandle::portAllowed(const ResourceRequest& request)
         return true;
 
     // Allow ports 21 and 22 for FTP URLs, as Mozilla does.
-    if ((port == 21 || port == 22) && request.url().url().startsWith("ftp:", false))
+    if ((port == 21 || port == 22) && request.url().deprecatedString().startsWith("ftp:", false))
         return true;
 
     // Allow any port number in a file URL, since the port number is ignored.
-    if (request.url().url().startsWith("file:", false))
+    if (request.url().deprecatedString().startsWith("file:", false))
         return true;
 
     return false;
index c6342f5..d0fd9d2 100644 (file)
@@ -45,7 +45,7 @@ bool ResourceRequestBase::isNull() const
 {
     updateResourceRequest(); 
     
-    return m_url.url().isNull();
+    return m_url.isNull();
 }
 
 const KURL& ResourceRequestBase::url() const 
index d9293a8..dd66cb6 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "AuthenticationCF.h"
 #include "AuthenticationChallenge.h"
+#include "CString.h"
 #include "DocLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -61,7 +62,7 @@ CFURLRequestRef willSendRequest(CFURLConnectionRef conn, CFURLRequestRef cfReque
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
 
-    LOG(Network, "CFNet - willSendRequest(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - willSendRequest(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
 
     ResourceRequest request(cfRequest);
     if (handle->client())
@@ -77,7 +78,7 @@ void didReceiveResponse(CFURLConnectionRef conn, CFURLResponseRef cfResponse, co
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
 
-    LOG(Network, "CFNet - didReceiveResponse(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - didReceiveResponse(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
 
     if (handle->client())
         handle->client()->didReceiveResponse(handle, cfResponse);
@@ -89,7 +90,7 @@ void didReceiveData(CFURLConnectionRef conn, CFDataRef data, CFIndex originalLen
     const UInt8* bytes = CFDataGetBytePtr(data);
     CFIndex length = CFDataGetLength(data);
 
-    LOG(Network, "CFNet - didReceiveData(conn=%p, handle=%p, bytes=%d) (%s)", conn, handle, length, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - didReceiveData(conn=%p, handle=%p, bytes=%d) (%s)", conn, handle, length, handle->request().url().string().utf8().data());
 
     if (handle->client())
         handle->client()->didReceiveData(handle, (const char*)bytes, length, originalLength);
@@ -99,7 +100,7 @@ void didFinishLoading(CFURLConnectionRef conn, const void* clientInfo)
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
 
-    LOG(Network, "CFNet - didFinishLoading(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - didFinishLoading(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
 
     if (handle->client())
         handle->client()->didFinishLoading(handle);
@@ -109,7 +110,7 @@ void didFail(CFURLConnectionRef conn, CFErrorRef error, const void* clientInfo)
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
 
-    LOG(Network, "CFNet - didFail(conn=%p, handle=%p, error = %p) (%s)", conn, handle, error, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - didFail(conn=%p, handle=%p, error = %p) (%s)", conn, handle, error, handle->request().url().string().utf8().data());
 
     if (handle->client())
         handle->client()->didFail(handle, ResourceError(error));
@@ -139,7 +140,7 @@ void didReceiveChallenge(CFURLConnectionRef conn, CFURLAuthChallengeRef challeng
 {
     ResourceHandle* handle = (ResourceHandle*)clientInfo;
     ASSERT(handle);
-    LOG(Network, "CFNet - didReceiveChallenge(conn=%p, handle=%p (%s)", conn, handle, handle->request().url().url().ascii());
+    LOG(Network, "CFNet - didReceiveChallenge(conn=%p, handle=%p (%s)", conn, handle, handle->request().url().string().utf8().data());
 
     handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(challenge, handle));
 }
@@ -162,14 +163,14 @@ void addHeadersFromHashMap(CFMutableURLRequestRef request, const HTTPHeaderMap&
 ResourceHandleInternal::~ResourceHandleInternal()
 {
     if (m_connection) {
-        LOG(Network, "CFNet - Cancelling connection %p (%s)", m_connection, m_request.url().url().ascii());
+        LOG(Network, "CFNet - Cancelling connection %p (%s)", m_connection, m_request.url().string().utf8().data());
         CFURLConnectionCancel(m_connection.get());
     }
 }
 
 ResourceHandle::~ResourceHandle()
 {
-    LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_request.url().url().ascii());
+    LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_request.url().string().utf8().data());
 }
 
 CFArrayRef arrayFromFormData(const FormData& d)
@@ -260,7 +261,7 @@ bool ResourceHandle::start(Frame* frame)
     CFURLConnectionScheduleDownloadWithRunLoop(d->m_connection.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
     CFURLConnectionStart(d->m_connection.get());
 
-    LOG(Network, "CFNet - Starting URL %s (handle=%p, conn=%p)", d->m_request.url().url().ascii(), this, d->m_connection);
+    LOG(Network, "CFNet - Starting URL %s (handle=%p, conn=%p)", d->m_request.url().string().utf8().data(), this, d->m_connection);
 
     return true;
 }
index cd75b66..fd4180e 100644 (file)
@@ -107,7 +107,7 @@ static FORMATETC* texthtmlFormat()
 
 HGLOBAL createGlobalData(const KURL& url, const String& title)
 {
-    String mutableURL(url.url());
+    String mutableURL(url.string());
     String mutableTitle(title);
     SIZE_T size = mutableURL.length() + mutableTitle.length() + 2;  // +1 for "\n" and +1 for null terminator
     HGLOBAL cbData = ::GlobalAlloc(GPTR, size * sizeof(UChar));
@@ -196,7 +196,7 @@ DeprecatedCString markupToCF_HTML(const String& markup, const String& srcURL)
 String urlToMarkup(const KURL& url, const String& title)
 {
     String markup("<a href=\"");
-    markup.append(url.url());
+    markup.append(url.string());
     markup.append("\">");
     markup.append(title);
     markup.append("</a>");
index cf4611e..197dcf6 100644 (file)
@@ -444,7 +444,7 @@ static bool writeURL(WCDataObject *data, const KURL& url, String title, bool wit
     }
 
     if (withPlainText) {
-        medium.hGlobal = createGlobalData(url.url());
+        medium.hGlobal = createGlobalData(url.string());
         if (medium.hGlobal && FAILED(data->SetData(plainTextWFormat(), &medium, TRUE)))
             ::GlobalFree(medium.hGlobal);
         else
@@ -642,7 +642,7 @@ static void writeImageToDataObject(IDataObject* dataObject, Element* element, co
     if (!imageBuffer || !imageBuffer->size())
         return;
 
-    HGLOBAL imageFileDescriptor = createGlobalImageFileDescriptor(url.url(), element->getAttribute(altAttr), cachedImage);
+    HGLOBAL imageFileDescriptor = createGlobalImageFileDescriptor(url.string(), element->getAttribute(altAttr), cachedImage);
     if (!imageFileDescriptor)
         return;
 
@@ -695,7 +695,7 @@ void ClipboardWin::writeURL(const KURL& kurl, const String& titleStr, Frame*)
     WebCore::writeURL(m_writableDataObject.get(), kurl, titleStr, true, true);
 
     int estimatedSize = 0;
-    String url = kurl.url();
+    String url = kurl.string();
 
     HGLOBAL urlFileDescriptor = createGlobalUrlFileDescriptor(url, titleStr, estimatedSize);
     if (!urlFileDescriptor)
@@ -718,7 +718,7 @@ void ClipboardWin::writeRange(Range* selectedRange, Frame* frame)
     medium.tymed = TYMED_HGLOBAL;
     ExceptionCode ec = 0;
 
-    medium.hGlobal = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->URL()));
+    medium.hGlobal = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url()));
     if (medium.hGlobal && FAILED(m_writableDataObject->SetData(htmlFormat(), &medium, TRUE)))
         ::GlobalFree(medium.hGlobal);
 
index 2eeb1bf..427c303 100644 (file)
@@ -116,7 +116,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
     // Put CF_HTML format on the pasteboard 
     if (::OpenClipboard(m_owner)) {
         ExceptionCode ec = 0;
-        HGLOBAL cbData = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->URL()));
+        HGLOBAL cbData = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url()));
         if (!::SetClipboardData(HTMLClipboardFormat, cbData))
             ::GlobalFree(cbData);
         ::CloseClipboard();
@@ -174,7 +174,7 @@ void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame)
 
     // bare-bones CF_UNICODETEXT support
     if (::OpenClipboard(m_owner)) {
-        HGLOBAL cbData = createGlobalData(url.url());
+        HGLOBAL cbData = createGlobalData(url.string());
         if (!::SetClipboardData(CF_UNICODETEXT, cbData))
             ::GlobalFree(cbData);
         ::CloseClipboard();
index 0c4d251..43654a3 100644 (file)
@@ -514,7 +514,7 @@ String PluginDatabaseWin::MIMETypeForExtension(const String& extension) const
 PluginPackageWin* PluginDatabaseWin::findPlugin(const KURL& url, String& mimeType)
 {   
     PluginPackageWin* plugin = pluginForMIMEType(mimeType);
-    String filename = url.url();
+    String filename = url.string();
     
     if (!plugin) {
         String filename = url.lastPathComponent();
index 2a81ad8..d3ee1de 100644 (file)
@@ -129,10 +129,10 @@ void PluginStreamWin::startStream()
 
     // Some plugins (Flash) expect that javascript URLs are passed back decoded as this is the
     // format used when requesting the URL.
-    if (responseURL.url().startsWith("javascript:", false))
-        m_stream.url = _strdup(responseURL.decode_string(responseURL.url()).utf8());
+    if (responseURL.string().startsWith("javascript:", false))
+        m_stream.url = _strdup(responseURL.decode_string(responseURL.deprecatedString()).utf8());
     else
-        m_stream.url = _strdup(responseURL.url().utf8());
+        m_stream.url = _strdup(responseURL.deprecatedString().utf8());
     
     CString mimeTypeStr = m_resourceResponse.mimeType().utf8();
     
@@ -262,7 +262,7 @@ void PluginStreamWin::destroyStream()
     }
 
     if (m_sendNotification)
-        m_pluginFuncs->urlnotify(m_instance, m_resourceRequest.url().url().utf8(), m_reason, m_notifyData);
+        m_pluginFuncs->urlnotify(m_instance, m_resourceRequest.url().deprecatedString().utf8(), m_reason, m_notifyData);
 
     m_streamState = StreamStopped;
 
index 450634b..7ee61c5 100644 (file)
@@ -204,11 +204,11 @@ private:
 
 static String scriptStringIfJavaScriptURL(const KURL& url)
 {
-    if (!url.url().startsWith("javascript:", false))
+    if (!url.string().startsWith("javascript:", false))
         return String();
 
     // This returns an unescaped string
-    return KURL::decode_string(url.url().mid(11));
+    return KURL::decode_string(url.deprecatedString().mid(11));
 }
 
 PluginViewWin* PluginViewWin::s_currentPluginView = 0;
@@ -784,7 +784,7 @@ void PluginViewWin::performRequest(PluginRequestWin* request)
             // FIXME: <rdar://problem/4807469> This should be sent when the document has finished loading
             if (request->sendNotification()) {
                 KJS::JSLock::DropAllLocks dropAllLocks;
-                m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.url().utf8(), NPRES_DONE, request->notifyData());
+                m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.deprecatedString().utf8(), NPRES_DONE, request->notifyData());
             }
         }
         return;
index 7dfc777..c8ec8ad 100644 (file)
@@ -51,9 +51,9 @@ void SVGImageLoader::updateFromElement()
     
     CachedImage *newImage = 0;
     if (!imageElement->href().isEmpty()) {
-        DeprecatedString uri = imageElement->baseURI().deprecatedString();;
+        DeprecatedString uri = imageElement->baseURI().deprecatedString();
         if (!uri.isEmpty())
-            uri = KURL(uri, imageElement->href().deprecatedString()).url();
+            uri = KURL(uri, imageElement->href().deprecatedString()).deprecatedString();
         else
             uri = imageElement->href().deprecatedString();
         newImage = doc->docLoader()->requestImage(uri);
index 8737f5b..1061f96 100644 (file)
@@ -171,7 +171,7 @@ Document* XMLHttpRequest::getResponseXML(ExceptionCode& ec) const
         } else {
             m_responseXML = m_doc->implementation()->createDocument(0);
             m_responseXML->open();
-            m_responseXML->setURL(m_url.url());
+            m_responseXML->setURL(m_url.deprecatedString());
             // FIXME: set Last-Modified and cookies (currently, those are only available for HTMLDocuments).
             m_responseXML->write(String(m_responseText));
             m_responseXML->finishParsing();
@@ -319,7 +319,7 @@ bool XMLHttpRequest::urlMatchesDocumentDomain(const KURL& url) const
         return true;
 
     // but a remote document can only load from the same port on the server
-    KURL documentURL = m_doc->URL();
+    KURL documentURL = m_doc->url();
     if (documentURL.protocol().lower() == url.protocol().lower()
             && documentURL.host().lower() == url.host().lower()
             && documentURL.port() == url.port())
index de1aedc..bfdec20 100644 (file)
@@ -88,7 +88,7 @@ void XSLImportRule::loadSheet()
     XSLStyleSheet* parentSheet = parentStyleSheet();
     if (!parentSheet->href().isNull())
         // use parent styleheet's URL as the base URL
-        absHref = KURL(parentSheet->href().deprecatedString(),m_strHref.deprecatedString()).url();
+        absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).string();
     
     // Check for a cycle in our import chain.  If we encounter a stylesheet
     // in our parent chain with the same URL, then just bail.
index 74f84c2..9576e2f 100644 (file)
@@ -255,7 +255,7 @@ RefPtr<Document> XSLTProcessor::createDocumentFromSource(const String& sourceStr
     
     result->open();
     if (sourceIsDocument) {
-        result->setURL(ownerDocument->URL());
+        result->setURL(ownerDocument->url());
         result->setBaseURL(ownerDocument->baseURL());
     }
     result->determineParseMode(documentSource); // Make sure we parse in the correct mode.
@@ -293,7 +293,7 @@ static inline RefPtr<DocumentFragment> createFragmentFromSource(String sourceStr
 static xsltStylesheetPtr xsltStylesheetPointer(RefPtr<XSLStyleSheet>& cachedStylesheet, Node* stylesheetRootNode)
 {
     if (!cachedStylesheet && stylesheetRootNode) {
-        cachedStylesheet = new XSLStyleSheet(stylesheetRootNode->parent() ? stylesheetRootNode->parent() : stylesheetRootNode, stylesheetRootNode->document()->URL());
+        cachedStylesheet = new XSLStyleSheet(stylesheetRootNode->parent() ? stylesheetRootNode->parent() : stylesheetRootNode, stylesheetRootNode->document()->url());
         cachedStylesheet->parseString(createMarkup(stylesheetRootNode));
     }
     
@@ -312,7 +312,7 @@ static inline xmlDocPtr xmlDocPtrFromNode(Node* sourceNode, bool& shouldDelete)
     if (sourceIsDocument)
         sourceDoc = (xmlDocPtr)ownerDocument->transformSource();
     if (!sourceDoc) {
-        sourceDoc = (xmlDocPtr)xmlDocPtrForString(ownerDocument->docLoader(), createMarkup(sourceNode), sourceIsDocument ? ownerDocument->URL() : DeprecatedString());
+        sourceDoc = (xmlDocPtr)xmlDocPtrForString(ownerDocument->docLoader(), createMarkup(sourceNode), sourceIsDocument ? ownerDocument->url() : DeprecatedString());
         shouldDelete = (sourceDoc != 0);
     }
     return sourceDoc;
index 3a83d0c..b8a8569 100644 (file)
@@ -1,3 +1,16 @@
+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.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::actionDictionary):
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource _URL]):
+        * WebView/WebView.mm:
+        (-[WebView _dispatchDidReceiveIconFromWebFrame:]):
+
 2007-12-11  Darin Adler  <darin@apple.com>
 
         Reviewed by Geoff.
index df5348b..5bf6112 100644 (file)
@@ -1121,7 +1121,7 @@ NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& act
             element, WebActionElementKey,
             [NSNumber numberWithInt:mouseEvent->button()], WebActionButtonKey,
             [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-            action.URL().getNSURL(), WebActionOriginalURLKey,
+            action.url().getNSURL(), WebActionOriginalURLKey,
             nil];
         [element release];
         return result;
@@ -1129,7 +1129,7 @@ NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& act
     return [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
         [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-        action.URL().getNSURL(), WebActionOriginalURLKey,
+        action.url().getNSURL(), WebActionOriginalURLKey,
         nil];
 }
 
index 4be83ba..cd033b1 100644 (file)
@@ -319,7 +319,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
 // May return nil if not initialized with a URL.
 - (NSURL *)_URL
 {
-    KURL URL = _private->loader->URL();
+    KURL URL = _private->loader->url();
     return URL.isEmpty() ? nil : URL.getNSURL();
 }
 
index c0d8747..9cc118f 100644 (file)
@@ -4039,7 +4039,7 @@ static WebFrameView *containingFrameView(NSView *view)
 
     WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(self);
     if (implementations->didReceiveIconForFrameFunc) {
-        Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().url(), IntSize(16, 16));
+        Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().string(), IntSize(16, 16));
         if (NSImage *icon = webGetNSImage(image, NSMakeSize(16, 16)))
             CallFrameLoadDelegate(implementations->didReceiveIconForFrameFunc, self, @selector(webView:didReceiveIcon:forFrame:), icon, webFrame);
     }
index ef2b41e..a53db84 100644 (file)
@@ -1,3 +1,22 @@
+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.
+
+        * WebFrame.cpp:
+        (WebFrame::url):
+        (WebFrame::dispatchWillPerformClientRedirect):
+        (WebFrame::setTitle):
+        (WebFrame::updateGlobalHistoryForStandardLoad):
+        (WebFrame::updateGlobalHistoryForReload):
+        (WebFrame::cancelledError):
+        (WebFrame::blockedError):
+        (WebFrame::interruptForPolicyChangeError):
+        (WebFrame::createPlugin):
+        * WebView.cpp:
+        (WebView::notifyDidAddIcon):
+
 2007-12-10  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Darin.
index c9076a4..d0196de 100644 (file)
@@ -47,7 +47,7 @@ KURL MarshallingHelpers::BSTRToKURL(BSTR urlStr)
 
 BSTR MarshallingHelpers::KURLToBSTR(const KURL& url)
 {
-    String urlString(url.url());
+    String urlString(url.string());
     return SysAllocStringLen(urlString.characters(), urlString.length());
 }
 
index 059deaa..1e49946 100644 (file)
@@ -133,7 +133,7 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI
         }
     } else if (isEqual(pszPropName, WebActionOriginalURLKey)) {
         V_VT(pVar) = VT_BSTR;
-        V_BSTR(pVar) = BString(m_action.URL().url()).release();
+        V_BSTR(pVar) = BString(m_action.url().string()).release();
         return S_OK;
     } else if (isEqual(pszPropName, WebActionModifierFlagsKey)) {
         if (const UIEventWithKeyState* keyEvent = findEventWithKeyState(const_cast<Event*>(m_action.event()))) {
index 2c33ca2..430c6a2 100644 (file)
@@ -245,7 +245,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::unreachableURL(
     /* [retval][out] */ BSTR* url)
 {
     KURL unreachableURL = m_loader->unreachableURL();
-    BString urlString((LPOLESTR)unreachableURL.url().unicode(), unreachableURL.url().length());
+    BString urlString((LPOLESTR)unreachableURL.deprecatedString().unicode(), unreachableURL.deprecatedString().length());
 
     *url = urlString.release();
     return S_OK;
index af99c66..64ff835 100644 (file)
@@ -102,9 +102,9 @@ void WebDownload::init(ResourceHandle* handle, const ResourceRequest& request, c
     // However, we should never hit that case
     if (!m_download) {
         ASSERT_NOT_REACHED();
-        LOG_ERROR("WebDownload - Failed to create WebDownload from existing connection (%s)", request.url().url().ascii());
+        LOG_ERROR("WebDownload - Failed to create WebDownload from existing connection (%s)", request.url().deprecatedString().ascii());
     } else
-        LOG(Download, "WebDownload - Created WebDownload %p from existing connection (%s)", this, request.url().url().ascii());
+        LOG(Download, "WebDownload - Created WebDownload %p from existing connection (%s)", this, request.url().deprecatedString().ascii());
 
     // The CFURLDownload either starts successfully and retains the CFURLConnection, 
     // or it fails to creating and we have a now-useless connection with a dangling ref. 
@@ -130,7 +130,7 @@ void WebDownload::init(const KURL& url, IWebDownloadDelegate* delegate)
     CFURLDownloadScheduleWithCurrentMessageQueue(m_download.get());
     CFURLDownloadScheduleDownloadWithRunLoop(m_download.get(), ResourceHandle::loaderRunLoop(), kCFRunLoopDefaultMode);
 
-    LOG(Download, "WebDownload - Initialized download of url %s in WebDownload %p", url.url().ascii(), this);
+    LOG(Download, "WebDownload - Initialized download of url %s in WebDownload %p", url.deprecatedString().ascii(), this);
 }
 
 WebDownload::~WebDownload()
@@ -232,7 +232,7 @@ HRESULT STDMETHODCALLTYPE WebDownload::initWithRequest(
     CFURLDownloadScheduleWithCurrentMessageQueue(m_download.get());
     CFURLDownloadScheduleDownloadWithRunLoop(m_download.get(), ResourceHandle::loaderRunLoop(), kCFRunLoopDefaultMode);
 
-    LOG(Download, "WebDownload - initWithRequest complete, started download of url %s", webRequest->resourceRequest().url().url().ascii());
+    LOG(Download, "WebDownload - initWithRequest complete, started download of url %s", webRequest->resourceRequest().url().deprecatedString().ascii());
     return S_OK;
 }
 
index 23a10fe..5a09529 100644 (file)
@@ -180,7 +180,7 @@ DragImageRef WebDragClient::createDragImageForLink(KURL& url, const String& inLa
     bool clipURLString = false;
     bool clipLabelString = false;
 
-    String urlString = url.url(); 
+    String urlString = url.string(); 
     String label = inLabel;
     if (label.isEmpty()) {
         drawURLString = false;
index d7a7c39..c1aaedb 100644 (file)
@@ -144,7 +144,7 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR
         V_ARRAY(pVar) = MarshallingHelpers::intRectToSafeArray(m_result->boundingBox());
         return S_OK;
     } else if (isEqual(WebElementImageURLKey, key))
-        return convertStringToVariant(pVar, m_result->absoluteImageURL().url());
+        return convertStringToVariant(pVar, m_result->absoluteImageURL().string());
     else if (isEqual(WebElementIsSelectedKey, key)) {
         V_VT(pVar) = VT_BOOL;
         if (m_result->isSelected())
@@ -157,7 +157,7 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR
     else if (isEqual(WebElementTitleKey, key))
         return convertStringToVariant(pVar, m_result->title());
     else if (isEqual(WebElementLinkURLKey, key))
-        return convertStringToVariant(pVar, m_result->absoluteLinkURL().url());
+        return convertStringToVariant(pVar, m_result->absoluteLinkURL().string());
     else if (isEqual(WebElementLinkTargetFrameKey, key)) {
         if (!m_result->targetFrame())
             return E_FAIL;
index 1e0650a..2d30d51 100644 (file)
@@ -762,7 +762,7 @@ KURL WebFrame::url() const
     if (!coreFrame)
         return KURL();
 
-    return coreFrame->loader()->URL();
+    return coreFrame->loader()->url();
 }
 
 void WebFrame::attachScriptDebugger()
@@ -1565,7 +1565,7 @@ void WebFrame::dispatchWillPerformClientRedirect(const KURL& url, double delay,
 {
     COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
     if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate)))
-        frameLoadDelegate->willPerformClientRedirectToURL(d->webView, BString(url.url()), delay, MarshallingHelpers::CFAbsoluteTimeToDATE(fireDate), this);
+        frameLoadDelegate->willPerformClientRedirectToURL(d->webView, BString(url.string()), delay, MarshallingHelpers::CFAbsoluteTimeToDATE(fireDate), this);
 }
 
 void WebFrame::dispatchDidChangeLocationWithinPage()
@@ -1826,7 +1826,7 @@ void WebFrame::setTitle(const String& title, const KURL& url)
         history.adoptRef(webHistory());
         if (history) {
             COMPtr<IWebHistoryItem> item;
-            if (SUCCEEDED(history->itemForURL(BString(url.url()), &item))) {
+            if (SUCCEEDED(history->itemForURL(BString(url.string()), &item))) {
                 COMPtr<IWebHistoryItemPrivate> itemPrivate;
                 if (SUCCEEDED(item->QueryInterface(IID_IWebHistoryItemPrivate, (void**)&itemPrivate)))
                     itemPrivate->setTitle(BString(title));
@@ -1853,12 +1853,12 @@ void WebFrame::updateGlobalHistoryForStandardLoad(const KURL& url)
     if (!history)
         return;
 
-    history->addItemForURL(BString(url.url()), 0);                 
+    history->addItemForURL(BString(url.string()), 0);                 
 }
 
 void WebFrame::updateGlobalHistoryForReload(const KURL& url)
 {
-    BString urlBStr(url.url());
+    BString urlBStr(url.string());
 
     COMPtr<WebHistory> history;
     history.adoptRef(webHistory());
@@ -1929,13 +1929,13 @@ ResourceError WebFrame::cancelledError(const ResourceRequest& request)
 {
     // FIXME: Need ChickenCat to include CFNetwork/CFURLError.h to get these values
     // Alternatively, we could create our own error domain/codes.
-    return ResourceError(String(WebURLErrorDomain), -999, request.url().url(), String());
+    return ResourceError(String(WebURLErrorDomain), -999, request.url().string(), String());
 }
 
 ResourceError WebFrame::blockedError(const ResourceRequest& request)
 {
     // FIXME: Need to implement the String descriptions for errors in the WebKitErrorDomain and have them localized
-    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().url(), String());
+    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().string(), String());
 }
 
 ResourceError WebFrame::cannotShowURLError(const ResourceRequest&)
@@ -1947,7 +1947,7 @@ ResourceError WebFrame::cannotShowURLError(const ResourceRequest&)
 ResourceError WebFrame::interruptForPolicyChangeError(const ResourceRequest& request)
 {
     // FIXME: Need to implement the String descriptions for errors in the WebKitErrorDomain and have them localized
-    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().url(), String());
+    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), String());
 }
 
 ResourceError WebFrame::cannotShowMIMETypeError(const ResourceResponse&)
@@ -2374,7 +2374,7 @@ Widget* WebFrame::createPlugin(const IntSize& pluginSize, Element* element, cons
             ASSERT_NOT_REACHED();
     }
 
-    ResourceError resourceError(String(WebKitErrorDomain), errorCode, url.url(), String());
+    ResourceError resourceError(String(WebKitErrorDomain), errorCode, url.string(), String());
     COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
      
     resourceLoadDelegate->plugInFailedWithError(d->webView, error.get(), getWebDataSource(d->frame->loader()->documentLoader()));
index 6e90765..e8d1f4d 100644 (file)
@@ -126,7 +126,7 @@ HRESULT STDMETHODCALLTYPE WebResource::URL(
         return E_POINTER;
     }
 
-    *url = BString(String(m_url.url())).release();
+    *url = BString(String(m_url.string())).release();
     return S_OK;
 }
     
index 0ebbedc..b372a54 100644 (file)
@@ -342,7 +342,7 @@ HRESULT STDMETHODCALLTYPE WebURLResponse::URL(
     if (!result)
         return E_INVALIDARG;
 
-    BString url(m_response.url().url());
+    BString url(m_response.url().string());
     *result = url.release();
     if (!m_response.url().isEmpty() && !*result)
         return E_OUTOFMEMORY;
index 8d486f1..2449e6a 100644 (file)
@@ -2122,7 +2122,7 @@ HRESULT WebView::notifyDidAddIcon(IWebNotification* notification)
 
     String mainFrameURL;
     if (m_mainFrame)
-        mainFrameURL = m_mainFrame->url().url();
+        mainFrameURL = m_mainFrame->url().string();
 
     if (!mainFrameURL.isEmpty() && mainFrameURL == String((CFStringRef)value))
         dispatchDidReceiveIconFromWebFrame(m_mainFrame);