Changeset 28639 in webkit


Ignore:
Timestamp:
Dec 11, 2007 11:26:19 PM (16 years ago)
Author:
weinig@apple.com
Message:

WebCore:

Reviewed by Darin Adler.

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

  • Renames Document::URL() -> Document::url()
  • Renames DocumentLoader::URL() -> DocumentLoader::url()
  • Renames KURL::url() to KURL::string() and KURL::deprecatedString()
  • Remove FrameLoader::URL()
  • Various variable renames.

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

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

WebKit/mac:

Reviewed by Darin Adler.

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

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

WebKit/win:

Reviewed by Darin Adler.

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

  • WebFrame.cpp: (WebFrame::url): (WebFrame::dispatchWillPerformClientRedirect): (WebFrame::setTitle): (WebFrame::updateGlobalHistoryForStandardLoad): (WebFrame::updateGlobalHistoryForReload): (WebFrame::cancelledError): (WebFrame::blockedError): (WebFrame::interruptForPolicyChangeError): (WebFrame::createPlugin):
  • WebView.cpp: (WebView::notifyDidAddIcon):
Location:
trunk
Files:
86 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r28637 r28639  
     12007-12-11  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Scrub URL out of the tree in preparation for renaming KURL to URL.
     6            - Renames Document::URL() -> Document::url()
     7            - Renames DocumentLoader::URL() -> DocumentLoader::url()
     8            - Renames KURL::url() to KURL::string() and KURL::deprecatedString()
     9            - Remove FrameLoader::URL()
     10            - Various variable renames.
     11
     12        The change from Document::URL() to Document::url() required changes
     13        to the bindings scripts as well, because URL() is the name of a DOM
     14        method.  The code generation scripts now have code to special case URL()
     15        to url().
     16
     17        * WebCore.base.exp:
     18        * bindings/js/kjs_events.cpp:
     19        (WebCore::JSLazyEventListener::parseCode):
     20        * bindings/js/kjs_navigator.cpp:
     21        (KJS::Navigator::getValueProperty):
     22        * bindings/js/kjs_proxy.cpp:
     23        (WebCore::KJSProxy::initScript):
     24        * bindings/js/kjs_window.cpp:
     25        (KJS::Window::put):
     26        (KJS::Window::allowsAccessFrom):
     27        (KJS::Location::put):
     28        (KJS::LocationProtoFuncReplace::callAsFunction):
     29        (KJS::LocationProtoFuncReload::callAsFunction):
     30        (KJS::LocationProtoFuncAssign::callAsFunction):
     31        * bindings/scripts/CodeGenerator.pm:
     32        * bindings/scripts/CodeGeneratorCOM.pm:
     33        * bindings/scripts/CodeGeneratorJS.pm:
     34        * bindings/scripts/CodeGeneratorObjC.pm:
     35        * css/CSSImportRule.cpp:
     36        (WebCore::CSSImportRule::insertedIntoParent):
     37        * css/CSSParser.cpp:
     38        (WebCore::CSSParser::parseValue):
     39        (WebCore::CSSParser::parseContent):
     40        (WebCore::CSSParser::parseBackgroundImage):
     41        (WebCore::CSSParser::parseFontFaceSrc):
     42        (WebCore::CSSParser::parseBorderImage):
     43        (WebCore::CSSParser::createImportRule):
     44        * css/CSSStyleSelector.cpp:
     45        (WebCore::CSSStyleSelector::setEncodedURL):
     46        * dom/Document.cpp:
     47        (WebCore::Document::processHttpEquiv):
     48        (WebCore::Document::cookie):
     49        (WebCore::Document::setCookie):
     50        (WebCore::Document::domain):
     51        (WebCore::Document::setDomain):
     52        (WebCore::Document::getImageMap):
     53        (WebCore::Document::completeURL):
     54        * dom/Document.h:
     55        (WebCore::Document::url):
     56        (WebCore::Document::baseURL):
     57        * dom/Element.cpp:
     58        (WebCore::Element::baseURI):
     59        * dom/ProcessingInstruction.h:
     60        * dom/StyledElement.cpp:
     61        (WebCore::StyledElement::addCSSImageProperty):
     62        * dom/StyledElement.h:
     63        * dom/XMLTokenizer.cpp:
     64        (WebCore::XMLTokenizer::endElementNs):
     65        (WebCore::XMLTokenizer::end):
     66        (WebCore::):
     67        * dom/XMLTokenizer.h:
     68        * editing/Editor.cpp:
     69        (WebCore::Editor::copy):
     70        * editing/markup.cpp:
     71        (WebCore::completeURLs):
     72        * history/CachedPage.h:
     73        (WebCore::CachedPage::url):
     74        * history/HistoryItem.cpp:
     75        (WebCore::HistoryItem::HistoryItem):
     76        (WebCore::HistoryItem::setURL):
     77        (WebCore::HistoryItem::isCurrentDocument):
     78        * html/HTMLBaseElement.cpp:
     79        (WebCore::HTMLBaseElement::process):
     80        * html/HTMLParser.cpp:
     81        (WebCore::HTMLParser::reportErrorToConsole):
     82        * html/HTMLScriptElement.cpp:
     83        (WebCore::HTMLScriptElement::childrenChanged):
     84        (WebCore::HTMLScriptElement::insertedIntoDocument):
     85        (WebCore::HTMLScriptElement::evaluateScript):
     86        * html/HTMLScriptElement.h:
     87        * html/HTMLTokenizer.cpp:
     88        (WebCore::HTMLTokenizer::scriptExecution):
     89        * loader/Cache.cpp:
     90        (WebCore::createResource):
     91        (WebCore::Cache::requestResource):
     92        * loader/CachedCSSStyleSheet.cpp:
     93        (WebCore::CachedCSSStyleSheet::checkNotify):
     94        * loader/CachedResource.cpp:
     95        (WebCore::CachedResource::CachedResource):
     96        * loader/CachedResource.h:
     97        (WebCore::CachedResource::):
     98        * loader/CachedScript.h:
     99        * loader/DocLoader.cpp:
     100        (WebCore::DocLoader::checkForReload):
     101        (WebCore::DocLoader::requestResource):
     102        * loader/DocumentLoader.cpp:
     103        (WebCore::DocumentLoader::url):
     104        (WebCore::DocumentLoader::replaceRequestURLForAnchorScroll):
     105        (WebCore::DocumentLoader::setRequest):
     106        (WebCore::DocumentLoader::startLoadingMainResource):
     107        * loader/DocumentLoader.h:
     108        * loader/FrameLoader.cpp:
     109        (WebCore::FormSubmission::FormSubmission):
     110        (WebCore::ScheduledRedirection::ScheduledRedirection):
     111        (WebCore::FrameLoader::changeLocation):
     112        (WebCore::FrameLoader::urlSelected):
     113        (WebCore::FrameLoader::requestFrame):
     114        (WebCore::FrameLoader::loadSubframe):
     115        (WebCore::FrameLoader::submitFormAgain):
     116        (WebCore::FrameLoader::submitForm):
     117        (WebCore::FrameLoader::didExplicitOpen):
     118        (WebCore::FrameLoader::replaceContentsWithScriptResult):
     119        (WebCore::FrameLoader::executeScript):
     120        (WebCore::FrameLoader::receivedFirstData):
     121        (WebCore::FrameLoader::begin):
     122        (WebCore::FrameLoader::startIconLoader):
     123        (WebCore::FrameLoader::commitIconURLToIconDatabase):
     124        (WebCore::FrameLoader::scheduleRefresh):
     125        (WebCore::FrameLoader::redirectionTimerFired):
     126        (WebCore::FrameLoader::loadPlugin):
     127        (WebCore::FrameLoader::didNotOpenURL):
     128        (WebCore::FrameLoader::updatePolicyBaseURL):
     129        (WebCore::FrameLoader::scrollToAnchor):
     130        (WebCore::FrameLoader::startRedirectionTimer):
     131        (WebCore::FrameLoader::load):
     132        (WebCore::FrameLoader::canLoad):
     133        (WebCore::FrameLoader::shouldHideReferrer):
     134        (WebCore::FrameLoader::shouldAllowNavigation):
     135        (WebCore::FrameLoader::commitProvisionalLoad):
     136        (WebCore::FrameLoader::clientRedirected):
     137        (WebCore::FrameLoader::open):
     138        (WebCore::FrameLoader::didTellBridgeAboutLoad):
     139        (WebCore::FrameLoader::haveToldBridgeAboutLoad):
     140        (WebCore::FrameLoader::post):
     141        (WebCore::FrameLoader::loadResourceSynchronously):
     142        (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
     143        (WebCore::FrameLoader::shouldTreatURLAsSameAsCurrent):
     144        (WebCore::FrameLoader::createHistoryItem):
     145        (WebCore::FrameLoader::addBackForwardItemClippedAtTarget):
     146        (WebCore::FrameLoader::loadItem):
     147        (WebCore::FrameLoader::urlsMatchItem):
     148        (WebCore::FrameLoader::recursiveGoToItem):
     149        (WebCore::FrameLoader::updateHistoryForStandardLoad):
     150        (WebCore::FrameLoader::updateHistoryForRedirectWithLockedHistory):
     151        * loader/FrameLoader.h:
     152        (WebCore::FrameLoader::url):
     153        * loader/ImageDocument.cpp:
     154        (WebCore::ImageDocument::createDocumentStructure):
     155        * loader/MainResourceLoader.cpp:
     156        (WebCore::shouldLoadAsEmptyDocument):
     157        (WebCore::MainResourceLoader::didFinishLoading):
     158        * loader/NavigationAction.cpp:
     159        (WebCore::NavigationAction::NavigationAction):
     160        * loader/NavigationAction.h:
     161        (WebCore::NavigationAction::url):
     162        * loader/PluginDocument.cpp:
     163        (WebCore::PluginTokenizer::createDocumentStructure):
     164        * loader/SubresourceLoader.cpp:
     165        (WebCore::SubresourceLoader::load):
     166        (WebCore::SubresourceLoader::create):
     167        * loader/icon/IconLoader.cpp:
     168        (WebCore::IconLoader::startLoading):
     169        (WebCore::IconLoader::finishLoading):
     170        * loader/loader.cpp:
     171        (WebCore::Loader::servePendingRequests):
     172        * loader/mac/LoaderNSURLExtras.m:
     173        (urlOriginalData):
     174        * page/Chrome.cpp:
     175        (WebCore::Chrome::setToolTip):
     176        * page/ContextMenuController.cpp:
     177        (WebCore::ContextMenuController::contextMenuItemSelected):
     178        * page/Frame.cpp:
     179        (WebCore::Frame::setUserStyleSheetLocation):
     180        * page/InspectorController.cpp:
     181        (WebCore::InspectorResource::type):
     182        (WebCore::addSourceToFrame):
     183        (WebCore::InspectorController::addScriptResource):
     184        (WebCore::InspectorController::updateScriptResourceRequest):
     185        (WebCore::InspectorController::didCommitLoad):
     186        * page/mac/WebCoreFrameBridge.mm:
     187        (-[WebCoreFrameBridge getData:andResponse:forURL:]):
     188        * platform/KURL.h:
     189        (WebCore::KURL::string):
     190        (WebCore::KURL::deprecatedString):
     191        * platform/mac/ClipboardMac.mm:
     192        (WebCore::ClipboardMac::getData):
     193        * platform/mac/CookieJar.mm:
     194        (WebCore::cookies):
     195        (WebCore::setCookies):
     196        * platform/mac/PasteboardMac.mm:
     197        (WebCore::Pasteboard::writeURL):
     198        (WebCore::fileWrapperForImage):
     199        (WebCore::Pasteboard::writeImage):
     200        (WebCore::Pasteboard::plainText):
     201        * platform/network/ResourceHandle.cpp:
     202        (WebCore::ResourceHandle::portAllowed):
     203        * platform/network/ResourceRequestBase.cpp:
     204        (WebCore::ResourceRequestBase::isNull):
     205        * platform/network/cf/ResourceHandleCFNet.cpp:
     206        (WebCore::willSendRequest):
     207        (WebCore::didReceiveResponse):
     208        (WebCore::didReceiveData):
     209        (WebCore::didFinishLoading):
     210        (WebCore::didFail):
     211        (WebCore::didReceiveChallenge):
     212        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
     213        (WebCore::ResourceHandle::~ResourceHandle):
     214        (WebCore::ResourceHandle::start):
     215        * platform/win/ClipboardUtilitiesWin.cpp:
     216        (WebCore::createGlobalData):
     217        (WebCore::urlToMarkup):
     218        * platform/win/ClipboardWin.cpp:
     219        (WebCore::writeURL):
     220        (WebCore::writeImageToDataObject):
     221        (WebCore::ClipboardWin::writeURL):
     222        (WebCore::ClipboardWin::writeRange):
     223        * platform/win/PasteboardWin.cpp:
     224        (WebCore::Pasteboard::writeSelection):
     225        (WebCore::Pasteboard::writeURL):
     226        * plugins/win/PluginDatabaseWin.cpp:
     227        (WebCore::PluginDatabaseWin::findPlugin):
     228        * plugins/win/PluginStreamWin.cpp:
     229        (WebCore::PluginStreamWin::startStream):
     230        (WebCore::PluginStreamWin::destroyStream):
     231        * plugins/win/PluginViewWin.cpp:
     232        (WebCore::scriptStringIfJavaScriptURL):
     233        (WebCore::PluginViewWin::performRequest):
     234        * svg/SVGImageLoader.cpp:
     235        (WebCore::SVGImageLoader::updateFromElement):
     236        * xml/XMLHttpRequest.cpp:
     237        (WebCore::XMLHttpRequest::getResponseXML):
     238        (WebCore::XMLHttpRequest::urlMatchesDocumentDomain):
     239        * xml/XSLImportRule.cpp:
     240        (WebCore::XSLImportRule::loadSheet):
     241        * xml/XSLTProcessor.cpp:
     242        (WebCore::XSLTProcessor::createDocumentFromSource):
     243        (WebCore::xsltStylesheetPointer):
     244        (WebCore::xmlDocPtrFromNode):
     245
    12462007-12-11  Beth Dakin  <bdakin@apple.com>
    2247

  • trunk/WebCore/WebCore.base.exp

    r28626 r28639  
    613613__ZNK7WebCore14DocumentLoader19originalRequestCopyEv
    614614__ZNK7WebCore14DocumentLoader21isLoadingMainResourceEv
    615 __ZNK7WebCore14DocumentLoader3URLEv
     615__ZNK7WebCore14DocumentLoader3urlEv
    616616__ZNK7WebCore14DocumentLoader5titleEv
    617617__ZNK7WebCore14DocumentLoader8responseEv

  • trunk/WebCore/bindings/js/kjs_events.cpp

    r28468 r28639  
    301301        List args;
    302302
    303         UString sourceURL(frame->loader()->url().url());
     303        UString sourceURL(frame->loader()->url().string());
    304304        args.append(eventParameterName());
    305305        args.append(jsString(m_code));

  • trunk/WebCore/bindings/js/kjs_navigator.cpp

    r28468 r28639  
    196196  case AppVersion: {
    197197    // Version is everything in the user agent string past the "Mozilla/" prefix.
    198     const String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL());
     198    const String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL());
    199199    return jsString(userAgent.substring(userAgent.find('/') + 1));
    200200  }
    … …  
    210210    return jsString(defaultLanguage());
    211211  case UserAgent:
    212     return jsString(m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL()));
     212    return jsString(m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL()));
    213213  case Platform:
    214214    return jsString(WEBCORE_NAVIGATOR_PLATFORM);

  • trunk/WebCore/bindings/js/kjs_proxy.cpp

    r28468 r28639  
    152152
    153153    // FIXME: We can get rid of this (and eliminate compatMode entirely).
    154     String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->URL() : KURL());
     154    String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL());
    155155    if (userAgent.find("Microsoft") >= 0 || userAgent.find("MSIE") >= 0)
    156156        m_globalObject->setCompatMode(IECompat);

  • trunk/WebCore/bindings/js/kjs_window.cpp

    r28592 r28639  
    685685        if (!p->loader()->shouldAllowNavigation(impl()->frame()))
    686686          return;
    687         DeprecatedString dstUrl = p->loader()->completeURL(DeprecatedString(value->toString(exec))).url();
     687        String dstUrl = p->loader()->completeURL(value->toString(exec)).string();
    688688        if (!dstUrl.startsWith("javascript:", false) || allowsAccessFrom(exec)) {
    689689          bool userGesture = p->scriptProxy()->processingUserGesture();
    … …  
    834834        // FIXME: this error message should contain more specifics of why the same origin check has failed.
    835835        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",
    836                                         targetDocument->URL().utf8().data(), originDocument->URL().utf8().data());
     836                                        targetDocument->url().utf8().data(), originDocument->url().utf8().data());
    837837
    838838        if (Interpreter::shouldPrintExceptions())
    … …  
    15291529          if (!frame->loader()->shouldAllowNavigation(m_frame))
    15301530              return;
    1531           url = frame->loader()->completeURL(str).url();
     1531          url = frame->loader()->completeURL(str);
    15321532          break;
    15331533      }
    … …  
    15711571
    15721572  Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
    1573   if (!url.url().startsWith("javascript:", false) || sameDomainAccess) {
     1573  if (!url.deprecatedString().startsWith("javascript:", false) || sameDomainAccess) {
    15741574    bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
    1575     m_frame->loader()->scheduleLocationChange(url.url(), activeFrame->loader()->outgoingReferrer(), false, userGesture);
     1575    m_frame->loader()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), false, userGesture);
    15761576  }
    15771577}
    … …  
    15941594        if (!str.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
    15951595            bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
    1596             frame->loader()->scheduleLocationChange(activeFrame->loader()->completeURL(str).url(), activeFrame->loader()->outgoingReferrer(), true, userGesture);
     1596            frame->loader()->scheduleLocationChange(activeFrame->loader()->completeURL(str).string(), activeFrame->loader()->outgoingReferrer(), true, userGesture);
    15971597        }
    15981598    }
    … …  
    16141614        return jsUndefined();
    16151615
    1616     if (!frame->loader()->url().url().startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
    1617       bool userGesture = Window::retrieveActive(exec)->impl()->frame()->scriptProxy()->processingUserGesture();
    1618       frame->loader()->scheduleRefresh(userGesture);
     1616    if (!frame->loader()->url().deprecatedString().startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
     1617        bool userGesture = Window::retrieveActive(exec)->impl()->frame()->scriptProxy()->processingUserGesture();
     1618        frame->loader()->scheduleRefresh(userGesture);
    16191619    }
    16201620    return jsUndefined();
    … …  
    16351635            return jsUndefined();
    16361636        const Window* window = Window::retrieveWindow(frame);
    1637         DeprecatedString dstUrl = activeFrame->loader()->completeURL(DeprecatedString(args[0]->toString(exec))).url();
     1637        String dstUrl = activeFrame->loader()->completeURL(args[0]->toString(exec)).string();
    16381638        if (!dstUrl.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
    16391639            bool userGesture = activeFrame->scriptProxy()->processingUserGesture();

  • trunk/WebCore/bindings/scripts/CodeGenerator.pm

    r28318 r28639  
    11#
    2 # KDOM IDL parser
     2# WebKit IDL parser
    33#
    44# Copyright (C) 2005 Nikolas Zimmermann <wildfox@kde.org>
    55# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    6 #
    7 # This file is part of the KDE project
     6# Copyright (C) 2007 Apple Inc. All rights reserved.
    87#
    98# This library is free software; you can redistribute it and/or
    … …  
    360359}
    361360
     361# Uppercase the first letter while respecting WebKit style guidelines.
     362# E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.
     363sub WK_ucfirst
     364{
     365    my ($object, $param) = @_;
     366    my $ret = ucfirst($param);
     367    $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
     368    return $ret;
     369}
     370
     371# Lowercase the first letter while respecting WebKit style guidelines.
     372# URL becomes url, but SetURL becomes setURL.
     373sub WK_lcfirst
     374{
     375    my ($object, $param) = @_;
     376    my $ret = lcfirst($param);
     377    $ret =~ s/uRL/url/;
     378    return $ret;
     379}
     380
    3623811;

  • trunk/WebCore/bindings/scripts/CodeGeneratorCOM.pm

    r27655 r28639  
    617617    push(@getterImplementation, "        return E_POINTER;\n\n");
    618618
    619     my $implementationGetter = "impl${implementationClassWithoutNamespace}()->${attributeName}(" . ($hasGetterException ? "ec" : ""). ")";
     619    my $implementationGetter = "impl${implementationClassWithoutNamespace}()->" . $codeGenerator->WK_lcfirst($attributeName) . "(" . ($hasGetterException ? "ec" : ""). ")";
    620620
    621621    push(@getterImplementation, "    WebCore::ExceptionCode ec = 0;\n") if $hasGetterException;
    … …  
    764764
    765765    my $callSigBegin = "    ";
    766     my $callSigMiddle = "${implementationGetter}->${functionName}(" . join(", ", @parameterList) . ")";
     766    my $callSigMiddle = "${implementationGetter}->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterList) . ")";
    767767    my $callSigEnd = ";\n";
    768768

  • trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r28570 r28639  
    8282}
    8383
    84 # Uppercase the first letter, while respecting WebKit style guidelines.
    85 # E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.
    86 sub WK_ucfirst
    87 {
    88     my $param = shift;
    89     my $ret = ucfirst($param);
    90     $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
    91     return $ret;
    92 }
    93 
    9484# Params: 'domClass' struct
    9585sub GenerateInterface
    … …  
    411401            }
    412402
    413             my $value = $attribute->signature->type =~ /Constructor$/
    414                       ? $attribute->signature->name . "ConstructorAttrNum"
    415                       : WK_ucfirst($attribute->signature->name) . "AttrNum";
     403            my $value = $codeGenerator->WK_ucfirst($attribute->signature->name)
     404                . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
     405                . "AttrNum";
    416406            $value .= ", " if (($i < $numAttributes - 1) or (($i eq $numAttributes - 1) and (($numFunctions ne 0) or $dataNode->extendedAttributes->{"GenerateConstructor"})));
    417407            push(@headerContent, $value);
    … …  
    432422        foreach my $attribute (@{$dataNode->attributes}) {
    433423            if ($attribute->signature->extendedAttributes->{"Custom"}) {
    434                 push(@headerContent, "    KJS::JSValue* " . $attribute->signature->name . "(KJS::ExecState*) const;\n");
     424                push(@headerContent, "    KJS::JSValue* " . $codeGenerator->WK_lcfirst($attribute->signature->name) . "(KJS::ExecState*) const;\n");
    435425                if ($attribute->type !~ /^readonly/) {
    436                     push(@headerContent, "    void set" . WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
     426                    push(@headerContent, "    void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
    437427                }
    438428            } elsif ($attribute->signature->extendedAttributes->{"CustomGetter"}) {
    439                 push(@headerContent, "    KJS::JSValue* " . $attribute->signature->name . "(KJS::ExecState*) const;\n");
     429                push(@headerContent, "    KJS::JSValue* " . $codeGenerator->WK_lcfirst($attribute->signature->name) . "(KJS::ExecState*) const;\n");
    440430            } elsif ($attribute->signature->extendedAttributes->{"CustomSetter"}) {
    441431                if ($attribute->type !~ /^readonly/) {
    442                     push(@headerContent, "    void set" . WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
     432                    push(@headerContent, "    void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(KJS::ExecState*, KJS::JSValue*);\n");
    443433                }
    444434            }
    … …  
    454444        foreach my $function (@{$dataNode->functions}) {
    455445            if ($function->signature->extendedAttributes->{"Custom"}) {
    456                 push(@headerContent, "    KJS::JSValue* " . $function->signature->name . "(KJS::ExecState*, const KJS::List&);\n");
     446                push(@headerContent, "    KJS::JSValue* " . $codeGenerator->WK_lcfirst($function->signature->name) . "(KJS::ExecState*, const KJS::List&);\n");
    457447            }
    458448        }
    … …  
    552542        push(@headerContent,"// Functions\n\n");
    553543        foreach my $function (@{$dataNode->functions}) {
    554             push(@headerContent, prototypeFunctionFor($className, WK_ucfirst($function->signature->name)));
     544            push(@headerContent, prototypeFunctionFor($className, $codeGenerator->WK_ucfirst($function->signature->name)));
    555545        }       
    556546    }
    … …  
    623613            push(@hashKeys, $name);
    624614
    625             my $value = $className . "::" . ($attribute->signature->type =~ /Constructor$/
    626                                        ? $attribute->signature->name . "ConstructorAttrNum"
    627                                        : WK_ucfirst($attribute->signature->name) . "AttrNum");
     615            my $value = $className . "::" . $codeGenerator->WK_ucfirst($attribute->signature->name)
     616                . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
     617                . "AttrNum";
    628618            push(@hashValues, $value);
    629619
    … …  
    715705        push(@hashKeys, $name);
    716706
    717         my $value = "&" . $className . "PrototypeFunction" . WK_ucfirst($name) . "::create";
     707        my $value = "&" . $className . "PrototypeFunction" . $codeGenerator->WK_ucfirst($name) . "::create";
    718708        push(@hashValues, $value);
    719709
    … …  
    908898
    909899        foreach my $attribute (@{$dataNode->attributes}) {
    910             my $name = $attribute->signature->name;
     900            my $getterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->name);
    911901
    912902            my $implClassNameForValueConversion = "";
    … …  
    915905            }
    916906
    917             if ($attribute->signature->type =~ /Constructor$/) {
    918                 push(@implContent, "    case " . $name . "ConstructorAttrNum: {\n");
    919             } else {
    920                 push(@implContent, "    case " . WK_ucfirst($name) . "AttrNum: {\n");
    921             }
     907            push(@implContent, "    case " . $codeGenerator->WK_ucfirst($attribute->signature->name)
     908                . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
     909                . "AttrNum: {\n");
    922910
    923911            if ($dataNode->extendedAttributes->{"CheckDomainSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurity"}) {
    … …  
    927915
    928916            if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"CustomGetter"}) {
    929                 push(@implContent, "        return $name(exec);\n");
     917                push(@implContent, "        return $getterFunctionName(exec);\n");
    930918            } elsif ($attribute->signature->extendedAttributes->{"CheckNodeSecurity"}) {
    931919                $implIncludes{"kjs_dom.h"} = 1;
    932                 push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
    933                 push(@implContent, "        return checkNodeSecurity(exec, imp->$name()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name()") . " : jsUndefined();\n");
     920                push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
     921                push(@implContent, "        return checkNodeSecurity(exec, imp->$getterFunctionName()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
    934922            } elsif ($attribute->signature->extendedAttributes->{"CheckFrameSecurity"}) {
    935923                $implIncludes{"Document.h"} = 1;
    936924                $implIncludes{"kjs_dom.h"} = 1;
    937                 push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
    938                 push(@implContent, "        return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature,  0, $implClassName, $implClassNameForValueConversion, "imp->$name()") . " : jsUndefined();\n");
     925                push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
     926                push(@implContent, "        return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature,  0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
    939927            } elsif ($attribute->signature->type =~ /Constructor$/) {
    940928                my $constructorType = $codeGenerator->StripModule($attribute->signature->type);
    … …  
    943931            } elsif (!@{$attribute->getterExceptions}) {
    944932                if ($podType) {
    945                     push(@implContent, "        $podType imp(*impl());\n\n");
     933                    push(@implContent, "        $podType imp(*impl());\n");
    946934                    if ($podType eq "float") { # Special case for JSSVGNumber
    947935                        push(@implContent, "        return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp") . ";\n");
    948936                    } else {
    949                         push(@implContent, "        return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$name()") . ";\n");
     937                        push(@implContent, "        return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$getterFunctionName()") . ";\n");
    950938                    }
    951939                } else {
    952                     push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
     940                    push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
    953941                    my $type = $codeGenerator->StripModule($attribute->signature->type);
    954                     my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name()");
    955 
     942                    my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()");
    956943                    if ($codeGenerator->IsSVGAnimatedType($type)) {
    957944                        push(@implContent, "        RefPtr<$type> obj = $jsType;\n");
    … …  
    965952
    966953                if ($podType) {
    967                     push(@implContent, "        $podType imp(*impl());\n\n");
    968                     push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$name(ec)") . ";\n");
     954                    push(@implContent, "        $podType imp(*impl());\n");
     955                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$getterFunctionName(ec)") . ";\n");
    969956                } else {
    970                     push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
    971                     push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$name(ec)") . ";\n");
     957                    push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
     958                    push(@implContent, "        KJS::JSValue* result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName(ec)") . ";\n");
    972959                }
    973960
    … …  
    10181005                if ($attribute->type !~ /^readonly/) {
    10191006                    my $name = $attribute->signature->name;
    1020 
    1021                     if ($attribute->signature->type =~ /Constructor$/) {
    1022                         push(@implContent, "    case " . $name ."ConstructorAttrNum: {\n");
    1023                     } else {
    1024                         push(@implContent, "    case " . WK_ucfirst($name) . "AttrNum: {\n");
    1025                     }
     1007                    my $setterFunctionName = $codeGenerator->WK_ucfirst($name);
     1008
     1009                    push(@implContent, "    case " . $codeGenerator->WK_ucfirst($attribute->signature->name)
     1010                        . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "")
     1011                        . "AttrNum: {\n");
    10261012
    10271013                    if ($dataNode->extendedAttributes->{"CheckDomainSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurity"}) {
    … …  
    10311017
    10321018                    if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"CustomSetter"}) {
    1033                         push(@implContent, "        set" . WK_ucfirst($name) . "(exec, value);\n");
     1019                        push(@implContent, "        set$setterFunctionName(exec, value);\n");
    10341020                    } elsif ($attribute->signature->type =~ /Constructor$/) {
    10351021                        my $constructorType = $attribute->signature->type;
    … …  
    10421028                    } else {
    10431029                        if ($podType) {
    1044                             push(@implContent, "        $podType imp(*impl());\n\n");
     1030                            push(@implContent, "        $podType imp(*impl());\n");
    10451031                            if ($podType eq "float") { # Special case for JSSVGNumber
    10461032                                push(@implContent, "        imp = " . JSValueToNative($attribute->signature, "value") . ";\n");
    10471033                            } else {
    1048                                 push(@implContent, "        imp.set" . WK_ucfirst($name) . "(" . JSValueToNative($attribute->signature, "value") . ");\n");
     1034                                push(@implContent, "        imp.set$setterFunctionName(" . JSValueToNative($attribute->signature, "value") . ");\n");
    10491035                            }
    10501036                            push(@implContent, "        m_impl->commitChange(exec, imp);\n");
    10511037                        } else {
    1052                             push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n\n");
     1038                            push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
    10531039                            push(@implContent, "        ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
    1054                             push(@implContent, "        imp->set" . WK_ucfirst($name) . "(" . JSValueToNative($attribute->signature, "value"));
     1040                            push(@implContent, "        imp->set$setterFunctionName(" . JSValueToNative($attribute->signature, "value"));
    10551041                            push(@implContent, ", ec") if @{$attribute->setterExceptions};
    10561042                            push(@implContent, ");\n");
    … …  
    10821068    if ($numFunctions > 0) {
    10831069        foreach my $function (@{$dataNode->functions}) {
    1084             my $functionClassName = $className . "PrototypeFunction" . WK_ucfirst($function->signature->name);
     1070            my $functionClassName = $className . "PrototypeFunction" . $codeGenerator->WK_ucfirst($function->signature->name);
    10851071            push(@implContent, "JSValue* ${functionClassName}::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)\n");
    10861072            push(@implContent, "{\n");
    10871073            push(@implContent, "    if (!thisObj->inherits(&${className}::info))\n");
    1088             push(@implContent, "      return throwError(exec, TypeError);\n\n");
     1074            push(@implContent, "        return throwError(exec, TypeError);\n");
    10891075
    10901076            AddIncludesForType($function->signature->type);
    … …  
    10931079
    10941080            if ($function->signature->extendedAttributes->{"Custom"}) {
    1095                 push(@implContent, "        return castedThisObj->" . $function->signature->name . "(exec, args);\n");
     1081                push(@implContent, "        return castedThisObj->" . $codeGenerator->WK_lcfirst($function->signature->name) . "(exec, args);\n");
    10961082            } else {
    10971083                if ($podType) {
    10981084                    push(@implContent, "    JSSVGPODTypeWrapper<$podType>* wrapper = castedThisObj->impl();\n");
    1099                     push(@implContent, "    $podType imp(*wrapper);\n\n");
     1085                    push(@implContent, "    $podType imp(*wrapper);\n");
    11001086                } else {
    11011087                    push(@implContent, "    $implClassName* imp = static_cast<$implClassName*>(castedThisObj->impl());\n");
    … …  
    11201106
    11211107                my $paramIndex = 0;
    1122                 my $functionString = "imp" . ($podType ? "." : "->") . $function->signature->name . "(";
     1108                my $functionString = "imp" . ($podType ? "." : "->") . $codeGenerator->WK_lcfirst($function->signature->name) . "(";
    11231109
    11241110                my $hasOptionalArguments = 0;
    … …  
    12671253
    12681254        if ($podType) {
    1269             push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n\n");
     1255            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n");
    12701256            push(@implContent, $indent . "if (castedThisObj->context())\n");
    12711257            push(@implContent, $indent . "    castedThisObj->context()->notifyAttributeChange();\n");
    … …  
    12781264
    12791265        if ($podType) {
    1280             push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n\n");
     1266            push(@implContent, $indent . "wrapper->commitChange(exec, imp);\n");
    12811267            push(@implContent, $indent . "if (castedThisObj->context())\n");
    12821268            push(@implContent, $indent . "    castedThisObj->context()->notifyAttributeChange();\n");
    … …  
    14621448        $getter =~ s/\(\)//;
    14631449
    1464         my $setter = "set" . WK_ucfirst($getter);
     1450        my $setter = "set" . $codeGenerator->WK_ucfirst($getter);
    14651451
    14661452        if ($implClassNameForValueConversion eq "") {

  • trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm

    r27924 r28639  
    204204}
    205205
    206 # Uppercase the first letter, while respecting WebKit style guidelines.
    207 # E.g., xmlEncoding becomes XMLEncoding, but xmllang becomes Xmllang.
    208 sub WK_ucfirst
    209 {
    210     my $param = shift;
    211     my $ret = ucfirst($param);
    212     $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
    213     return $ret;
    214 }
    215 
    216206sub ReadPublicInterfaces
    217207{
    … …  
    10661056            my $getterSig = "- ($attributeType)$attributeInterfaceName\n";
    10671057            my $hasGetterException = @{$attribute->getterExceptions};
    1068             my $getterContentHead = "IMPL->$attributeName(";
     1058            my $getterContentHead = "IMPL->" . $codeGenerator->WK_lcfirst($attributeName) . "(";
    10691059            my $getterContentTail = ")";
    10701060
    … …  
    11641154                my $hasSetterException = @{$attribute->setterExceptions};
    11651155
    1166                 $attributeName = "set" . WK_ucfirst($attributeName);
     1156                $attributeName = "set" . $codeGenerator->WK_ucfirst($attributeName);
    11671157                my $setterName = "set" . ucfirst($attributeInterfaceName);
    11681158                my $argName = "new" . ucfirst($attributeInterfaceName);
    … …  
    12961286
    12971287            push(@parameterNames, "ec") if $raisesExceptions and !($svgMatrixRotateFromVector || $svgMatrixInverse);
    1298             my $content = $caller . "->" . $functionName . "(" . join(", ", @parameterNames) . ")";
     1288            my $content = $caller . "->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
    12991289
    13001290            if ($svgMatrixRotateFromVector) {

  • trunk/WebCore/css/CSSImportRule.cpp

    r25754 r28639  
    9191    if (!parentSheet->href().isNull())
    9292        // use parent styleheet's URL as the base URL
    93         absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).url();
     93        absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).string();
    9494
    9595    // Check for a cycle in our import chain.  If we encounter a stylesheet

  • trunk/WebCore/css/CSSParser.cpp

    r27978 r28639  
    822822                if (!uri.isEmpty()) {
    823823                    list->append(new CSSCursorImageValue(
    824                                  String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
     824                                 KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
    825825                                 hotspot, styleElement));
    826826                }
    … …  
    885885            if (!uri.isEmpty()) {
    886886                parsedValue = new CSSImageValue(
    887                     String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
     887                    KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
    888888                    styleElement);
    889889                valueList->next();
    … …  
    18501850            String value = parseURL(domString(val->string));
    18511851            parsedValue = new CSSImageValue(
    1852                 String(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).url()), styleElement);
     1852                KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).string(), styleElement);
    18531853        } else if (val->unit == Value::Function) {
    18541854            // attr(X) | counter(X [,Y]) | counters(X, Y, [,Z])
    … …  
    19161916        String uri = parseURL(domString(valueList->current()->string));
    19171917        if (!uri.isEmpty())
    1918             value = new CSSImageValue(String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
     1918            value = new CSSImageValue(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
    19191919                                         styleElement);
    19201920        return true;
    … …  
    27622762        if (val->unit == CSSPrimitiveValue::CSS_URI && !expectComma) {
    27632763            String value = parseURL(domString(val->string));
    2764             parsedValue = new CSSFontFaceSrcValue(String(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).url()), false);
     2764            parsedValue = new CSSFontFaceSrcValue(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).string(), false);
    27652765            uriValue = parsedValue;
    27662766            allowFormat = true;
    … …  
    32173217        return false;
    32183218   
    3219     context.commitImage(new CSSImageValue(String(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).url()),
     3219    context.commitImage(new CSSImageValue(KURL(styleElement->baseURL().deprecatedString(), uri.deprecatedString()).string(),
    32203220                                                             styleElement));
    32213221    while ((val = valueList->next())) {
    … …  
    37793779}
    37803780
    3781 CSSRule* CSSParser::createImportRule(const ParseString& URL, MediaList* media)
     3781CSSRule* CSSParser::createImportRule(const ParseString& url, MediaList* media)
    37823782{
    37833783    if (!media)
    … …  
    37873787    if (!styleElement->isCSSStyleSheet())
    37883788        return 0;
    3789     CSSImportRule* rule = new CSSImportRule(styleElement, domString(URL), media);
     3789    CSSImportRule* rule = new CSSImportRule(styleElement, domString(url), media);
    37903790    m_parsedStyleObjects.append(rule);
    37913791    return rule;

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r28536 r28639  
    324324    u.setQuery(DeprecatedString::null);
    325325    u.setRef(DeprecatedString::null);
    326     encodedurl.file = u.url();
     326    encodedurl.file = u.deprecatedString();
    327327    int pos = encodedurl.file.findRev('/');
    328328    encodedurl.path = encodedurl.file;
    … …  
    332332    }
    333333    u.setPath(DeprecatedString::null);
    334     encodedurl.host = u.url();
     334    encodedurl.host = u.deprecatedString();
    335335}
    336336

  • trunk/WebCore/dom/Document.cpp

    r28626 r28639  
    18201820        if (frame && parseHTTPRefresh(content, true, delay, url)) {
    18211821            if (url.isEmpty())
    1822                 url = frame->loader()->url().url();
     1822                url = frame->loader()->url().string();
    18231823            else
    18241824                url = completeURL(url);
    … …  
    25612561String Document::cookie() const
    25622562{
    2563     return cookies(URL());
     2563    return cookies(url());
    25642564}
    25652565
    25662566void Document::setCookie(const String& value)
    25672567{
    2568     setCookies(URL(), policyBaseURL().deprecatedString(), value);
     2568    setCookies(url(), policyBaseURL().deprecatedString(), value);
    25692569}
    25702570
    … …  
    25792579{
    25802580    if (m_domain.isEmpty()) // not set yet (we set it on demand to save time and space)
    2581         m_domain = KURL(URL()).host(); // Initially set to the host
     2581        m_domain = KURL(url()).host(); // Initially set to the host
    25822582    return m_domain;
    25832583}
    … …  
    25882588    // Initially set to the host
    25892589    if (m_domain.isEmpty())
    2590         m_domain = KURL(URL()).host();
     2590        m_domain = KURL(url()).host();
    25912591
    25922592    // Both NS and IE specify that changing the domain is only allowed when
    … …  
    27352735}
    27362736
    2737 HTMLMapElement *Document::getImageMap(const String& URL) const
    2738 {
    2739     if (URL.isNull())
     2737HTMLMapElement *Document::getImageMap(const String& url) const
     2738{
     2739    if (url.isNull())
    27402740        return 0;
    2741     int hashPos = URL.find('#');
    2742     String name = (hashPos < 0 ? URL : URL.substring(hashPos + 1)).impl();
     2741    int hashPos = url.find('#');
     2742    String name = (hashPos < 0 ? url : url.substring(hashPos + 1)).impl();
    27432743    AtomicString mapName = hMode == XHtml ? name : name.lower();
    27442744    return m_imageMapsByName.get(mapName.impl());
    … …  
    27572757}
    27582758
    2759 DeprecatedString Document::completeURL(const DeprecatedString& URL)
     2759DeprecatedString Document::completeURL(const DeprecatedString& url)
    27602760{
    27612761    // FIXME: This treats null URLs the same as empty URLs, unlike the String function below.
    … …  
    27632763    // If both the URL and base URL are empty, like they are for documents
    27642764    // created using DOMImplementation::createDocument, just return the passed in URL.
    2765     // (We do this because URL() returns "about:blank" for empty URLs.
     2765    // (We do this because url() returns "about:blank" for empty URLs.
    27662766    if (m_url.isEmpty() && m_baseURL.isEmpty())
    2767         return URL;
     2767        return url;
    27682768    if (!m_decoder)
    2769         return KURL(baseURL(), URL).url();
    2770     return KURL(baseURL(), URL, m_decoder->encoding()).url();
    2771 }
    2772 
    2773 String Document::completeURL(const String &URL)
     2769        return KURL(baseURL(), url).deprecatedString();
     2770    return KURL(baseURL(), url, m_decoder->encoding()).deprecatedString();
     2771}
     2772
     2773String Document::completeURL(const String& url)
    27742774{
    27752775    // FIXME: This always returns null when passed a null URL, unlike the String function above.
    2776     if (URL.isNull())
    2777         return URL;
    2778     return completeURL(URL.deprecatedString());
     2776    if (url.isNull())
     2777        return url;
     2778    return completeURL(url.deprecatedString());
    27792779}
    27802780

  • trunk/WebCore/dom/Document.h

    r28626 r28639  
    362362    bool wellFormed() const { return m_wellFormed; }
    363363
    364     DeprecatedString URL() const { return m_url.isEmpty() ? "about:blank" : m_url; }
     364    DeprecatedString url() const { return m_url.isEmpty() ? "about:blank" : m_url; }
    365365    void setURL(const DeprecatedString& url);
    366366
    367     DeprecatedString baseURL() const { return m_baseURL.isEmpty() ? URL() : m_baseURL; }
     367    DeprecatedString baseURL() const { return m_baseURL.isEmpty() ? url() : m_baseURL; }
    368368    void setBaseURL(const DeprecatedString& baseURL);
    369369
    … …  
    577577    void addImageMap(HTMLMapElement*);
    578578    void removeImageMap(HTMLMapElement*);
    579     HTMLMapElement* getImageMap(const String& URL) const;
     579    HTMLMapElement* getImageMap(const String& url) const;
    580580
    581581    HTMLElement* body();

  • trunk/WebCore/dom/Element.cpp

    r27701 r28639  
    564564
    565565    if (!xmlbase.protocol().isEmpty())
    566         return xmlbase.url();
     566        return xmlbase.string();
    567567
    568568    Node* parent = parentNode();
    569569    if (parent)
    570         return KURL(parent->baseURI().deprecatedString(), xmlbase.url()).url();
    571 
    572     return xmlbase.url();
     570        return KURL(parent->baseURI().deprecatedString(), xmlbase.deprecatedString()).string();
     571
     572    return xmlbase.string();
    573573}
    574574

  • trunk/WebCore/dom/ProcessingInstruction.h

    r27690 r28639  
    5858    StyleSheet* sheet() const { return m_sheet.get(); }
    5959    bool checkStyleSheet();
    60     virtual void setCSSStyleSheet(const String& URL, const String& charset, const String& sheet);
     60    virtual void setCSSStyleSheet(const String& url, const String& charset, const String& sheet);
    6161#if ENABLE(XSLT)
    62     virtual void setXSLStyleSheet(const String& URL, const String& sheet);
     62    virtual void setXSLStyleSheet(const String& url, const String& sheet);
    6363#endif
    6464    void setCSSStyleSheet(CSSStyleSheet*);

  • trunk/WebCore/dom/StyledElement.cpp

    r27617 r28639  
    294294}
    295295
    296 void StyledElement::addCSSImageProperty(MappedAttribute* attr, int id, const String &URL)
     296void StyledElement::addCSSImageProperty(MappedAttribute* attr, int id, const String& url)
    297297{
    298298    if (!attr->decl()) createMappedDecl(attr);
    299     attr->decl()->setImageProperty(id, URL, false);
     299    attr->decl()->setImageProperty(id, url, false);
    300300}
    301301

  • trunk/WebCore/dom/StyledElement.h

    r25754 r28639  
    5050    void addCSSProperty(MappedAttribute* attr, int id, int value);
    5151    void addCSSStringProperty(MappedAttribute* attr, int id, const String &value, CSSPrimitiveValue::UnitTypes = CSSPrimitiveValue::CSS_STRING);
    52     void addCSSImageProperty(MappedAttribute* attr, int id, const String &URL);
     52    void addCSSImageProperty(MappedAttribute*, int propertyID, const String& url);
    5353    void addCSSColor(MappedAttribute* attr, int id, const String &c);
    5454    void createMappedDecl(MappedAttribute* attr);

  • trunk/WebCore/dom/XMLTokenizer.cpp

    r28028 r28639  
    846846                    scriptCode += static_cast<CharacterData*>(child)->data();
    847847            }
    848             m_view->frame()->loader()->executeScript(m_doc->URL(), m_scriptStartLine - 1, scriptCode);
     848            m_view->frame()->loader()->executeScript(m_doc->url(), m_scriptStartLine - 1, scriptCode);
    849849        }
    850850       
    … …  
    12751275#if ENABLE(XSLT)
    12761276    if (m_sawXSLTransform) {
    1277         m_doc->setTransformSource(xmlDocPtrForString(m_doc->docLoader(), m_originalSourceForTransform, m_doc->URL()));
     1277        m_doc->setTransformSource(xmlDocPtrForString(m_doc->docLoader(), m_originalSourceForTransform, m_doc->url()));
    12781278       
    12791279        m_doc->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets.
    … …  
    19181918                    scriptCode += static_cast<CharacterData*>(child)->data();
    19191919            }
    1920             m_view->frame()->loader()->executeScript(m_doc->URL(), m_scriptStartLine - 1, scriptCode);
     1920            m_view->frame()->loader()->executeScript(m_doc->url(), m_scriptStartLine - 1, scriptCode);
    19211921        }
    19221922        m_requestingScript = false;

  • trunk/WebCore/dom/XMLTokenizer.h

    r28028 r28639  
    171171
    172172#if ENABLE(XSLT)
    173 void* xmlDocPtrForString(DocLoader*, const String& source, const DeprecatedString& URL);
     173void* xmlDocPtrForString(DocLoader*, const String& source, const DeprecatedString& url);
    174174void setLoaderForLibXMLCallbacks(DocLoader*);
    175175#endif

  • trunk/WebCore/editing/Editor.cpp

    r28631 r28639  
    938938    Document* document = m_frame->document();
    939939    if (HTMLImageElement* imageElement = imageElementFromImageDocument(document))
    940         Pasteboard::generalPasteboard()->writeImage(imageElement, document->URL(), document->title());
     940        Pasteboard::generalPasteboard()->writeImage(imageElement, document->url(), document->title());
    941941    else
    942942        Pasteboard::generalPasteboard()->writeSelection(selectedRange().get(), canSmartCopyOrDelete(), m_frame);

  • trunk/WebCore/editing/markup.cpp

    r27495 r28639  
    552552                Attribute* attr = attrs->attributeItem(i);
    553553                if (e->isURLAttribute(attr)) {
    554                     String completedURL = KURL(baseURLAsKURL, attr->value().deprecatedString()).url();
     554                    String completedURL = KURL(baseURLAsKURL, attr->value().deprecatedString()).string();
    555555                    changes.append(AttributeChange(e, attr->name(), completedURL));
    556556                }

  • trunk/WebCore/history/CachedPage.h

    r28468 r28639  
    6161    FrameView* view() const { return m_view.get(); }
    6262    Node* mousePressNode() const { return m_mousePressNode.get(); }
    63     const KURL& URL() const { return m_URL; }
     63    const KURL& url() const { return m_URL; }
    6464    void restore(Page*);
    6565   

  • trunk/WebCore/history/HistoryItem.cpp

    r27776 r28639  
    7575
    7676HistoryItem::HistoryItem(const KURL& url, const String& title)
    77     : m_urlString(url.url())
    78     , m_originalURLString(url.url())
     77    : m_urlString(url.string())
     78    , m_originalURLString(url.string())
    7979    , m_title(title)
    8080    , m_lastVisitedTime(0)
    … …  
    8787
    8888HistoryItem::HistoryItem(const KURL& url, const String& target, const String& parent, const String& title)
    89     : m_urlString(url.url())
    90     , m_originalURLString(url.url())
     89    : m_urlString(url.string())
     90    , m_originalURLString(url.string())
    9191    , m_target(target)
    9292    , m_parent(parent)
    … …  
    210210{
    211211    pageCache()->remove(this);
    212     setURLString(url.url());
     212    setURLString(url.string());
    213213    clearDocumentState();
    214214}
    … …  
    389389{
    390390    // FIXME: We should find a better way to check if this is the current document.
    391     return urlString() == doc->URL();
     391    return urlString() == doc->url();
    392392}
    393393

  • trunk/WebCore/html/HTMLBaseElement.cpp

    r25754 r28639  
    8080
    8181    if (!m_href.isEmpty() && document()->frame())
    82         document()->setBaseURL(KURL(document()->frame()->loader()->url(), m_href.deprecatedString()).url());
     82        document()->setBaseURL(KURL(document()->frame()->loader()->url(), m_href.deprecatedString()).deprecatedString());
    8383
    8484    if (!m_target.isEmpty())

  • trunk/WebCore/html/HTMLParser.cpp

    r27951 r28639  
    14791479    message.replace("%tag2", tag2);
    14801480
    1481     page->chrome()->addMessageToConsole(HTMLMessageSource, isWarning(errorCode) ? WarningMessageLevel: ErrorMessageLevel, message, lineNumber, document->URL());
    1482 }
    1483 
    1484 }
     1481    page->chrome()->addMessageToConsole(HTMLMessageSource, isWarning(errorCode) ? WarningMessageLevel: ErrorMessageLevel, message, lineNumber, document->url());
     1482}
     1483
     1484}

  • trunk/WebCore/html/HTMLScriptElement.cpp

    r28612 r28639  
    6565    // we evaluate the script.
    6666    if (!m_createdByParser && inDocument() && firstChild())
    67         evaluateScript(document()->URL(), text());
     67        evaluateScript(document()->url(), text());
    6868}
    6969
    … …  
    138138    String scriptString = text();   
    139139    if (!scriptString.isEmpty())
    140         evaluateScript(document()->URL(), scriptString);
     140        evaluateScript(document()->url(), scriptString);
    141141}
    142142
    … …  
    246246}
    247247
    248 void HTMLScriptElement::evaluateScript(const String& URL, const String& script)
     248void HTMLScriptElement::evaluateScript(const String& url, const String& script)
    249249{
    250250    if (m_evaluated)
    … …  
    259259        if (proxy) {
    260260            m_evaluated = true;
    261             proxy->evaluate(URL, 0, script);
     261            proxy->evaluate(url, 0, script);
    262262            Document::updateDocumentsRendering();
    263263        }

  • trunk/WebCore/html/HTMLScriptElement.h

    r25754 r28639  
    11/*
    2  * This file is part of the DOM implementation for KDE.
    3  *
    42 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
    53 *           (C) 1999 Antti Koivisto (koivisto@kde.org)
    6  * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc.
     4 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
    75 *
    86 * This library is free software; you can redistribute it and/or
    … …  
    2220 *
    2321 */
     22
    2423#ifndef HTMLScriptElement_h
    2524#define HTMLScriptElement_h
    2625
     26#include "CachedResourceClient.h"
    2727#include "HTMLElement.h"
    28 #include "CachedResourceClient.h"
    2928
    3029namespace WebCore {
    … …  
    3231class CachedScript;
    3332
    34 class HTMLScriptElement : public HTMLElement, public CachedResourceClient
    35 {
     33class HTMLScriptElement : public HTMLElement, public CachedResourceClient {
    3634public:
    37     HTMLScriptElement(Document *doc);
     35    HTMLScriptElement(Document*);
    3836    ~HTMLScriptElement();
    3937
    … …  
    4240    virtual bool checkDTD(const Node* newChild) { return newChild->isTextNode(); }
    4341
    44     virtual void parseMappedAttribute(MappedAttribute *attr);
     42    virtual void parseMappedAttribute(MappedAttribute*);
    4543    virtual void insertedIntoDocument();
    4644    virtual void removedFromDocument();
    47     virtual void notifyFinished(CachedResource *finishedObj);
     45    virtual void notifyFinished(CachedResource*);
    4846
    4947    virtual void childrenChanged();
    5048
    51     virtual bool isURLAttribute(Attribute *attr) const;
     49    virtual bool isURLAttribute(Attribute*) const;
    5250
    5351    void setCreatedByParser(bool createdByParser) { m_createdByParser = createdByParser; }
    … …  
    5553
    5654    bool shouldExecuteAsJavaScript();
    57     void evaluateScript(const String &URL, const String &script);
     55    void evaluateScript(const String& url, const String& script);
    5856
    5957    String text() const;

  • trunk/WebCore/html/HTMLTokenizer.cpp

    r27886 r28639  
    506506        return state;
    507507    m_executingScript++;
    508     DeprecatedString url = scriptURL.isNull() ? m_doc->frame()->document()->URL() : scriptURL;
     508    DeprecatedString url = scriptURL.isNull() ? m_doc->frame()->document()->url() : scriptURL;
    509509
    510510    SegmentedString *savedPrependingSrc = currentPrependingSrc;

  • trunk/WebCore/loader/Cache.cpp

    r26484 r28639  
    6767    case CachedResource::ImageResource:
    6868        // User agent images need to null check the docloader.  No other resources need to.
    69         return new CachedImage(docLoader, url.url(), true /* for cache */);
     69        return new CachedImage(docLoader, url.string(), true /* for cache */);
    7070    case CachedResource::CSSStyleSheet:
    71         return new CachedCSSStyleSheet(docLoader, url.url(), *charset, skipCanLoadCheck, sendResourceLoadCallbacks);
     71        return new CachedCSSStyleSheet(docLoader, url.string(), *charset, skipCanLoadCheck, sendResourceLoadCallbacks);
    7272    case CachedResource::Script:
    73         return new CachedScript(docLoader, url.url(), *charset);
     73        return new CachedScript(docLoader, url.string(), *charset);
    7474    case CachedResource::FontResource:
    75         return new CachedFont(docLoader, url.url());
     75        return new CachedFont(docLoader, url.string());
    7676#if ENABLE(XSLT)
    7777    case CachedResource::XSLStyleSheet:
    78         return new CachedXSLStyleSheet(docLoader, url.url());
     78        return new CachedXSLStyleSheet(docLoader, url.string());
    7979#endif
    8080#if ENABLE(XBL)
    8181    case CachedResource::XBLStyleSheet:
    82         return new CachedXBLDocument(docLoader, url.url());
     82        return new CachedXBLDocument(docLoader, url.string());
    8383#endif
    8484    default:
    … …  
    9797   
    9898    // Look up the resource in our map.
    99     CachedResource* resource = m_resources.get(url.url());
     99    CachedResource* resource = m_resources.get(url.string());
    100100
    101101    if (resource) {
    … …  
    111111            Document* doc = docLoader->doc();
    112112            if(doc)
    113                 FrameLoader::reportLocalLoadFailed(doc->page(), url.url());
     113                FrameLoader::reportLocalLoadFailed(doc->page(), url.string());
    114114
    115115            return 0;
    … …  
    121121        ASSERT(resource->inCache());
    122122        if (!disabled()) {
    123             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.
     123            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.
    124124           
    125125            // This will move the resource to the front of its LRU list and increase its access count.

  • trunk/WebCore/loader/CachedCSSStyleSheet.cpp

    r27937 r28639  
    9393    CachedResourceClientWalker w(m_clients);
    9494    while (CachedResourceClient *c = w.next())
    95         c->setCSSStyleSheet(m_response.url().url(), m_decoder->encoding().name(), m_sheet);
     95        c->setCSSStyleSheet(m_response.url().string(), m_decoder->encoding().name(), m_sheet);
    9696
    9797#if USE(LOW_BANDWIDTH_DISPLAY)       

  • trunk/WebCore/loader/CachedResource.cpp

    r25754 r28639  
    3636namespace WebCore {
    3737
    38 CachedResource::CachedResource(const String& URL, Type type, bool forCache, bool sendResourceLoadCallbacks)
    39     : m_lastDecodedAccessTime(0)
     38CachedResource::CachedResource(const String& url, Type type, bool forCache, bool sendResourceLoadCallbacks)
     39    : m_url(url)
     40    , m_lastDecodedAccessTime(0)
    4041    , m_sendResourceLoadCallbacks(sendResourceLoadCallbacks)
    4142    , m_inCache(forCache)
    4243    , m_docLoader(0)
    4344{
    44     m_url = URL;
    4545    m_type = type;
    4646    m_status = Pending;

  • trunk/WebCore/loader/CachedResource.h

    r27937 r28639  
    6363        New,          // inserting new item
    6464        Pending,      // only partially loaded
    65         Cached       // regular case
     65        Cached        // regular case
    6666    };
    6767
    68     CachedResource(const String& URL, Type, bool forCache = true, bool sendResourceLoadCallbacks = false);
     68    CachedResource(const String& url, Type, bool forCache = true, bool sendResourceLoadCallbacks = false);
    6969    virtual ~CachedResource();
    7070

  • trunk/WebCore/loader/CachedScript.h

    r27937 r28639  
    3838    class CachedScript : public CachedResource {
    3939    public:
    40         CachedScript(DocLoader*, const String& URL, const String& charset);
     40        CachedScript(DocLoader*, const String& url, const String& charset);
    4141        virtual ~CachedScript();
    4242

  • trunk/WebCore/loader/DocLoader.cpp

    r26702 r28639  
    6868        return; //Don't reload resources while pasting
    6969    if (m_cachePolicy == CachePolicyVerify) {
    70        if (!m_reloadedURLs.contains(fullURL.url())) {
    71           CachedResource* existing = cache()->resourceForURL(fullURL.url());
     70       if (!m_reloadedURLs.contains(fullURL.string())) {
     71          CachedResource* existing = cache()->resourceForURL(fullURL.string());
    7272          if (existing && existing->isExpired()) {
    7373             cache()->remove(existing);
    74              m_reloadedURLs.add(fullURL.url());
     74             m_reloadedURLs.add(fullURL.string());
    7575          }
    7676       }
    7777    } else if ((m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)) {
    78        if (!m_reloadedURLs.contains(fullURL.url())) {
    79           CachedResource* existing = cache()->resourceForURL(fullURL.url());
     78       if (!m_reloadedURLs.contains(fullURL.string())) {
     79          CachedResource* existing = cache()->resourceForURL(fullURL.string());
    8080          if (existing)
    8181             cache()->remove(existing);
    82           m_reloadedURLs.add(fullURL.url());
     82          m_reloadedURLs.add(fullURL.string());
    8383       }
    8484    }
    … …  
    145145   
    146146    if (cache()->disabled()) {
    147         HashMap<String, CachedResource*>::iterator it = m_docResources.find(fullURL.url());
     147        HashMap<String, CachedResource*>::iterator it = m_docResources.find(fullURL.string());
    148148       
    149149        if (it != m_docResources.end()) {

  • trunk/WebCore/loader/DocumentLoader.cpp

    r27379 r28639  
    190190}
    191191
    192 const KURL& DocumentLoader::URL() const
     192const KURL& DocumentLoader::url() const
    193193{
    194194    return request().url();
    195195}
    196196
    197 void DocumentLoader::replaceRequestURLForAnchorScroll(const KURL& URL)
    198 {
    199     m_originalRequestCopy.setURL(URL);
    200     m_request.setURL(URL);
     197void DocumentLoader::replaceRequestURLForAnchorScroll(const KURL& url)
     198{
     199    m_originalRequestCopy.setURL(url);
     200    m_request.setURL(url);
    201201}
    202202
    … …  
    222222    // Only send webView:didReceiveServerRedirectForProvisionalLoadForFrame: if URL changed.
    223223    // Also, don't send it when replacing unreachable URLs with alternate content.
    224     if (!handlingUnreachableURL && oldURL.url() != req.url().url())
     224    if (!handlingUnreachableURL && oldURL != req.url())
    225225        frameLoader()->didReceiveServerRedirectForProvisionalLoadForFrame();
    226226}
    … …  
    689689        // FIXME: If this should really be caught, we should just ASSERT this doesn't happen;
    690690        // should it be caught by other parts of WebKit or other parts of the app?
    691         LOG_ERROR("could not create WebResourceHandle for URL %s -- should be caught by policy handler level", m_request.url().url().ascii());
     691        LOG_ERROR("could not create WebResourceHandle for URL %s -- should be caught by policy handler level", m_request.url().string().ascii().data());
    692692        m_mainResourceLoader = 0;
    693693        return false;

  • trunk/WebCore/loader/DocumentLoader.h

    r27776 r28639  
    8383        const SubstituteData& substituteData() const { return m_substituteData; }
    8484
    85         const KURL& URL() const;
     85        const KURL& url() const;
    8686        const KURL& unreachableURL() const;
    8787

  • trunk/WebCore/loader/FrameLoader.cpp

    r28626 r28639  
    115115struct FormSubmission {
    116116    const char* action;
    117     String URL;
     117    String url;
    118118    RefPtr<FormData> data;
    119119    String target;
    … …  
    125125            const String& ct, const String& b, PassRefPtr<Event> e)
    126126        : action(a)
    127         , URL(u)
     127        , url(u)
    128128        , data(d)
    129129        , target(t)
    … …  
    139139    Type type;
    140140    double delay;
    141     String URL;
     141    String url;
    142142    String referrer;
    143143    int historySteps;
    … …  
    148148        : type(redirection)
    149149        , delay(redirectDelay)
    150         , URL(redirectURL)
     150        , url(redirectURL)
    151151        , historySteps(0)
    152152        , lockHistory(redirectLockHistory)
    … …  
    160160        : type(locationChangeType)
    161161        , delay(0)
    162         , URL(locationChangeURL)
     162        , url(locationChangeURL)
    163163        , referrer(locationChangeReferrer)
    164164        , historySteps(0)
    … …  
    368368}
    369369
    370 void FrameLoader::changeLocation(const String& URL, const String& referrer, bool lockHistory, bool userGesture)
    371 {
    372     changeLocation(completeURL(URL), referrer, lockHistory, userGesture);
    373 }
    374 
    375 void FrameLoader::changeLocation(const KURL& URL, const String& referrer, bool lockHistory, bool userGesture)
    376 {
    377     if (URL.url().find("javascript:", 0, false) == 0) {
    378         String script = KURL::decode_string(URL.url().mid(strlen("javascript:")));
     370void FrameLoader::changeLocation(const String& url, const String& referrer, bool lockHistory, bool userGesture)
     371{
     372    changeLocation(completeURL(url), referrer, lockHistory, userGesture);
     373}
     374
     375void FrameLoader::changeLocation(const KURL& url, const String& referrer, bool lockHistory, bool userGesture)
     376{
     377    if (url.deprecatedString().find("javascript:", 0, false) == 0) {
     378        String script = KURL::decode_string(url.deprecatedString().mid(strlen("javascript:")));
    379379        JSValue* result = executeScript(script, userGesture);
    380380        String scriptResult;
    … …  
    389389    ResourceRequestCachePolicy policy = (m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)
    390390        ? ReloadIgnoringCacheData : UseProtocolCachePolicy;
    391     ResourceRequest request(URL, referrer, policy);
     391    ResourceRequest request(url, referrer, policy);
    392392   
    393393    urlSelected(request, "_self", 0, lockHistory, userGesture);
    … …  
    401401
    402402    const KURL& url = request.url();
    403     if (url.url().startsWith("javascript:", false)) {
    404         executeScript(KURL::decode_string(url.url().mid(strlen("javascript:"))), true);
     403    if (url.deprecatedString().startsWith("javascript:", false)) {
     404        executeScript(KURL::decode_string(url.deprecatedString().mid(strlen("javascript:"))), true);
    405405        return;
    406406    }
    … …  
    435435    Frame* frame = ownerElement->contentFrame();
    436436    if (frame)
    437         frame->loader()->scheduleLocationChange(url.url(), m_outgoingReferrer, true, userGestureHint());
     437        frame->loader()->scheduleLocationChange(url.string(), m_outgoingReferrer, true, userGestureHint());
    438438    else
    439439        frame = loadSubframe(ownerElement, url, frameName, m_outgoingReferrer);
    … …  
    461461
    462462    if (!canLoad(url, referrer)) {
    463         FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
     463        FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
    464464        return 0;
    465465    }
    … …  
    501501    OwnPtr<FormSubmission> form(m_deferredFormSubmission.release());
    502502    if (form)
    503         submitForm(form->action, form->URL, form->data, form->target,
     503        submitForm(form->action, form->url, form->data, form->target,
    504504            form->contentType, form->boundary, form->event.get());
    505505}
    … …  
    516516        return;
    517517
    518     DeprecatedString urlString = u.url();
     518    DeprecatedString urlString = u.deprecatedString();
    519519    if (urlString.startsWith("javascript:", false)) {
    520520        m_isExecutingJavaScriptFormAction = true;
    … …  
    732732    // implicitly precedes document.write.
    733733    cancelRedirection();
    734     if (m_frame->document()->URL() != "about:blank")
    735         m_URL = m_frame->document()->URL();
     734    if (m_frame->document()->url() != "about:blank")
     735        m_URL = m_frame->document()->url();
    736736}
    737737
    738738void FrameLoader::replaceContentsWithScriptResult(const KURL& url)
    739739{
    740     JSValue* result = executeScript(KURL::decode_string(url.url().mid(strlen("javascript:"))));
     740    JSValue* result = executeScript(KURL::decode_string(url.deprecatedString().mid(strlen("javascript:"))));
    741741    String scriptResult;
    742742    if (!getString(result, scriptResult))
    … …  
    749749JSValue* FrameLoader::executeScript(const String& script, bool forceUserGesture)
    750750{
    751     return executeScript(forceUserGesture ? String() : String(m_URL.url()), 0, script);
    752 }
    753 
    754 JSValue* FrameLoader::executeScript(const String& URL, int baseLine, const String& script)
     751    return executeScript(forceUserGesture ? String() : m_URL.string(), 0, script);
     752}
     753
     754JSValue* FrameLoader::executeScript(const String& url, int baseLine, const String& script)
    755755{
    756756    KJSProxy* proxy = m_frame->scriptProxy();
    … …  
    761761    m_isRunningScript = true;
    762762
    763     JSValue* result = proxy->evaluate(URL, baseLine, script);
     763    JSValue* result = proxy->evaluate(url, baseLine, script);
    764764
    765765    if (!wasRunningScript) {
    … …  
    852852
    853853    double delay;
    854     String URL;
     854    String url;
    855855    if (!m_documentLoader)
    856856        return;
    857     if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField("Refresh"), false, delay, URL))
    858         return;
    859 
    860     if (URL.isEmpty())
    861         URL = m_URL.url();
     857    if (!parseHTTPRefresh(m_documentLoader->response().httpHeaderField("Refresh"), false, delay, url))
     858        return;
     859
     860    if (url.isEmpty())
     861        url = m_URL.string();
    862862    else
    863         URL = m_frame->document()->completeURL(URL);
    864 
    865     scheduleHTTPRedirection(delay, URL);
     863        url = m_frame->document()->completeURL(url);
     864
     865    scheduleHTTPRedirection(delay, url);
    866866}
    867867
    … …  
    898898    ref.setPass(DeprecatedString());
    899899    ref.setRef(DeprecatedString());
    900     m_outgoingReferrer = ref.url();
     900    m_outgoingReferrer = ref.string();
    901901    m_URL = url;
    902902    KURL baseurl;
    … …  
    908908    m_frame->setDocument(document);
    909909
    910     document->setURL(m_URL.url());
     910    document->setURL(m_URL.deprecatedString());
    911911    // We prefer m_baseURL over m_URL because m_URL changes when we are
    912912    // about to load a new page.
    913     document->setBaseURL(baseurl.url());
     913    document->setBaseURL(baseurl.deprecatedString());
    914914    if (m_decoder)
    915915        document->setDecoder(m_decoder.get());
    … …  
    10661066   
    10671067    KURL url(iconURL());
    1068     String urlString(url.url());
     1068    String urlString(url.string());
    10691069    if (urlString.isEmpty())
    10701070        return;
    … …  
    10841084                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());
    10851085                m_client->registerForIconNotification();
    1086                 iconDatabase()->iconForPageURL(m_URL.url(), IntSize(0, 0));
    1087                 iconDatabase()->iconForPageURL(originalRequestURL().url(), IntSize(0, 0));
     1086                iconDatabase()->iconForPageURL(m_URL.string(), IntSize(0, 0));
     1087                iconDatabase()->iconForPageURL(originalRequestURL().string(), IntSize(0, 0));
    10881088            } else
    10891089                m_client->dispatchDidReceiveIcon();
    … …  
    11421142{
    11431143    ASSERT(iconDatabase());
    1144     LOG(IconDatabase, "Committing iconURL %s to database for pageURLs %s and %s", icon.url().ascii(), m_URL.url().ascii(), originalRequestURL().url().ascii());
    1145     iconDatabase()->setIconURLForPageURL(icon.url(), m_URL.url());
    1146     iconDatabase()->setIconURLForPageURL(icon.url(), originalRequestURL().url());
     1144    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());
     1145    iconDatabase()->setIconURLForPageURL(icon.string(), m_URL.string());
     1146    iconDatabase()->setIconURLForPageURL(icon.string(), originalRequestURL().string());
    11471147}
    11481148
    … …  
    13841384    ScheduledRedirection::Type type = duringLoad
    13851385        ? ScheduledRedirection::locationChangeDuringLoad : ScheduledRedirection::locationChange;
    1386     scheduleRedirection(new ScheduledRedirection(type, m_URL.url(), m_outgoingReferrer, true, wasUserGesture));
     1386    scheduleRedirection(new ScheduledRedirection(type, m_URL.string(), m_outgoingReferrer, true, wasUserGesture));
    13871387    m_cachePolicy = CachePolicyRefresh;
    13881388}
    … …  
    14641464        case ScheduledRedirection::locationChange:
    14651465        case ScheduledRedirection::locationChangeDuringLoad:
    1466             changeLocation(redirection->URL, redirection->referrer,
     1466            changeLocation(redirection->url, redirection->referrer,
    14671467                redirection->lockHistory, redirection->wasUserGesture);
    14681468            return;
    … …  
    16221622
    16231623        if (!canLoad(url, frame()->document())) {
    1624             FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
     1624            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
    16251625            return false;
    16261626        }
    … …  
    17281728}
    17291729
    1730 void FrameLoader::didNotOpenURL(const KURL& URL)
    1731 {
    1732     if (m_submittedFormURL == URL)
     1730void FrameLoader::didNotOpenURL(const KURL& url)
     1731{
     1732    if (m_submittedFormURL == url)
    17331733        m_submittedFormURL = KURL();
    17341734}
    … …  
    17981798        setPolicyBaseURL(m_frame->tree()->parent()->document()->policyBaseURL());
    17991799    else
    1800         setPolicyBaseURL(m_URL.url());
     1800        setPolicyBaseURL(m_URL.string());
    18011801}
    18021802
    … …  
    18111811// This does the same kind of work that FrameLoader::openURL does, except it relies on the fact
    18121812// that a higher level already checked that the URLs match and the scrolling is the right thing to do.
    1813 void FrameLoader::scrollToAnchor(const KURL& URL)
    1814 {
    1815     m_URL = URL;
     1813void FrameLoader::scrollToAnchor(const KURL& url)
     1814{
     1815    m_URL = url;
    18161816    started();
    18171817
    … …  
    18501850        case ScheduledRedirection::locationChange:
    18511851        case ScheduledRedirection::locationChangeDuringLoad:
    1852             clientRedirected(m_scheduledRedirection->URL.deprecatedString(),
     1852            clientRedirected(m_scheduledRedirection->url.deprecatedString(),
    18531853                m_scheduledRedirection->delay,
    18541854                currentTime() + m_redirectionTimer.nextFireInterval(),
    … …  
    19311931}
    19321932
    1933 void FrameLoader::load(const KURL& URL, Event* event)
    1934 {
    1935     load(ResourceRequest(URL), false, true, event, 0, HashMap<String, String>());
     1933void FrameLoader::load(const KURL& url, Event* event)
     1934{
     1935    load(ResourceRequest(url), false, true, event, 0, HashMap<String, String>());
    19361936}
    19371937
    … …  
    19491949 
    19501950    ASSERT(frame()->document());
    1951     if (url.url().startsWith("file:", false)) {
     1951    if (url.deprecatedString().startsWith("file:", false)) {
    19521952        if (!canLoad(url, frame()->document()) && !canLoad(url, referrer)) {
    1953             FrameLoader::reportLocalLoadFailed(m_frame->page(), url.url());
     1953            FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
    19541954            return;
    19551955        }
    … …  
    19871987}
    19881988
    1989 void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType newLoadType,
     1989void FrameLoader::load(const KURL& newURL, const String& referrer, FrameLoadType newLoadType,
    19901990    const String& frameName, Event* event, PassRefPtr<FormState> formState)
    19911991{
    19921992    bool isFormSubmission = formState;
    19931993   
    1994     ResourceRequest request(URL);
     1994    ResourceRequest request(newURL);
    19951995    if (!referrer.isEmpty())
    19961996        request.setHTTPReferrer(referrer);
    … …  
    20012001    ASSERT(newLoadType != FrameLoadTypeSame);
    20022002
    2003     NavigationAction action(URL, newLoadType, isFormSubmission, event);
     2003    NavigationAction action(newURL, newLoadType, isFormSubmission, event);
    20042004
    20052005    if (!frameName.isEmpty()) {
    20062006        if (Frame* targetFrame = m_frame->tree()->find(frameName))
    2007             targetFrame->loader()->load(URL, referrer, newLoadType, String(), event, formState);
     2007            targetFrame->loader()->load(newURL, referrer, newLoadType, String(), event, formState);
    20082008        else
    20092009            checkNewWindowPolicy(action, request, formState, frameName);
    … …  
    20132013    RefPtr<DocumentLoader> oldDocumentLoader = m_documentLoader;
    20142014
    2015     bool sameURL = shouldTreatURLAsSameAsCurrent(URL);
     2015    bool sameURL = shouldTreatURLAsSameAsCurrent(newURL);
    20162016   
    20172017    // Make sure to do scroll to anchor processing even if the URL is
    … …  
    20212021        && newLoadType != FrameLoadTypeReload
    20222022        && newLoadType != FrameLoadTypeSame
    2023         && !shouldReload(URL, url())
     2023        && !shouldReload(newURL, url())
    20242024        // We don't want to just scroll if a link from within a
    20252025        // frameset is trying to reload the frameset into _top.
    … …  
    21462146bool FrameLoader::canLoad(const KURL& url, const String& referrer)
    21472147{
    2148     if (!shouldTreatURLAsLocal(url.url()))
     2148    if (!shouldTreatURLAsLocal(url.string()))
    21492149        return true;
    21502150
    … …  
    21542154bool FrameLoader::canLoad(const KURL& url, const Document* doc)
    21552155{
    2156     if (!shouldTreatURLAsLocal(url.url()))
     2156    if (!shouldTreatURLAsLocal(url.string()))
    21572157        return true;
    21582158
    … …  
    21862186        return false;
    21872187
    2188     bool URLIsSecureURL = url.url().startsWith("https:", false);
     2188    bool URLIsSecureURL = url.deprecatedString().startsWith("https:", false);
    21892189
    21902190    return !URLIsSecureURL;
    … …  
    23622362        // FIXME: this error message should contain more specifics of why the navigation change is not allowed.
    23632363        String message = String::format("Unsafe JavaScript attempt to initiate a navigation change for frame with URL %s from frame with URL %s.\n",
    2364                                         targetDocument->URL().utf8().data(), activeDocument->URL().utf8().data());
     2364                                        targetDocument->url().utf8().data(), activeDocument->url().utf8().data());
    23652365
    23662366        if (KJS::Interpreter::shouldPrintExceptions())
    … …  
    25532553        KURL url = pdl->substituteData().responseURL();
    25542554        if (url.isEmpty())
    2555             url = pdl->URL();
     2555            url = pdl->url();
    25562556        if (url.isEmpty())
    25572557            url = pdl->responseURL();
    … …  
    26812681}
    26822682
    2683 void FrameLoader::clientRedirected(const KURL& URL, double seconds, double fireDate, bool lockHistory, bool isJavaScriptFormAction)
    2684 {
    2685     m_client->dispatchWillPerformClientRedirect(URL, seconds, fireDate);
     2683void FrameLoader::clientRedirected(const KURL& url, double seconds, double fireDate, bool lockHistory, bool isJavaScriptFormAction)
     2684{
     2685    m_client->dispatchWillPerformClientRedirect(url, seconds, fireDate);
    26862686   
    26872687    // Remember that we sent a redirect notification to the frame load delegate so that when we commit
    … …  
    27412741    }
    27422742
    2743     KURL URL = cachedPage.URL();
    2744 
    2745     if (URL.protocol().startsWith("http") && !URL.host().isEmpty() && URL.path().isEmpty())
    2746         URL.setPath("/");
    2747    
    2748     m_URL = URL;
    2749     m_workingURL = URL;
     2743    KURL url = cachedPage.url();
     2744
     2745    if (url.protocol().startsWith("http") && !url.host().isEmpty() && url.path().isEmpty())
     2746        url.setPath("/");
     2747   
     2748    m_URL = url;
     2749    m_workingURL = url;
    27502750
    27512751    started();
    … …  
    27602760    m_isComplete = false;
    27612761    m_didCallImplicitClose = false;
    2762     m_outgoingReferrer = URL.url();
     2762    m_outgoingReferrer = url.string();
    27632763
    27642764    FrameView* view = cachedPage.view();
    … …  
    27942794    m_client->dispatchDidLoadMainResource(dl.get());
    27952795    checkLoadComplete();
    2796 }
    2797 
    2798 // FIXME: Which one of these URL methods is right?
    2799 
    2800 KURL FrameLoader::url() const
    2801 {
    2802     return m_URL;
    2803 }
    2804 
    2805 KURL FrameLoader::URL() const
    2806 {
    2807     return activeDocumentLoader()->URL();
    28082796}
    28092797
    … …  
    31633151}
    31643152
    3165 void FrameLoader::didTellBridgeAboutLoad(const String& URL)
    3166 {
    3167     m_urlsBridgeKnowsAbout.add(URL);
    3168 }
    3169 
    3170 bool FrameLoader::haveToldBridgeAboutLoad(const String& URL)
    3171 {
    3172     return m_urlsBridgeKnowsAbout.contains(URL);
     3153void FrameLoader::didTellBridgeAboutLoad(const String& url)
     3154{
     3155    m_urlsBridgeKnowsAbout.add(url);
     3156}
     3157
     3158bool FrameLoader::haveToldBridgeAboutLoad(const String& url)
     3159{
     3160    return m_urlsBridgeKnowsAbout.contains(url);
    31733161}
    31743162
    … …  
    32383226}
    32393227
    3240 void FrameLoader::post(const KURL& URL, const String& referrer, const String& frameName, PassRefPtr<FormData> formData,
     3228void FrameLoader::post(const KURL& url, const String& referrer, const String& frameName, PassRefPtr<FormData> formData,
    32413229    const String& contentType, Event* event, HTMLFormElement* form, const HashMap<String, String>& formValues)
    32423230{
    … …  
    32473235    // FIXME: Where's the code that implements what the comment above says?
    32483236
    3249     ResourceRequest request(URL);
     3237    ResourceRequest request(url);
    32503238    addExtraFieldsToRequest(request, true, true);
    32513239
    … …  
    32563244    request.setHTTPContentType(contentType);
    32573245
    3258     NavigationAction action(URL, FrameLoadTypeStandard, true, event);
     3246    NavigationAction action(url, FrameLoadTypeStandard, true, event);
    32593247
    32603248    RefPtr<FormState> formState;
    … …  
    33113299    if (error.isNull()) {
    33123300        ASSERT(!newRequest.isNull());
    3313         didTellBridgeAboutLoad(newRequest.url().url());
     3301        didTellBridgeAboutLoad(newRequest.url().string());
    33143302        ResourceHandle::loadResourceSynchronously(newRequest, error, response, data);
    33153303    }
    … …  
    34133401        return;
    34143402
    3415     KURL URL = request.url();
    3416    
    3417     m_documentLoader->replaceRequestURLForAnchorScroll(URL);
    3418     if (!isRedirect && !shouldTreatURLAsSameAsCurrent(URL)) {
     3403    KURL url = request.url();
     3404   
     3405    m_documentLoader->replaceRequestURLForAnchorScroll(url);
     3406    if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url)) {
    34193407        // NB: must happen after _setURL, since we add based on the current request.
    34203408        // Must also happen before we openURL and displace the scroll position, since
    … …  
    34313419    }
    34323420   
    3433     scrollToAnchor(URL);
     3421    scrollToAnchor(url);
    34343422   
    34353423    if (!isRedirect)
    … …  
    37833771}
    37843772
    3785 bool FrameLoader::shouldTreatURLAsSameAsCurrent(const KURL& URL) const
     3773bool FrameLoader::shouldTreatURLAsSameAsCurrent(const KURL& url) const
    37863774{
    37873775    if (!m_currentHistoryItem)
    37883776        return false;
    3789     return URL == m_currentHistoryItem->url() || URL == m_currentHistoryItem->originalURL();
     3777    return url == m_currentHistoryItem->url() || url == m_currentHistoryItem->originalURL();
    37903778}
    37913779
    … …  
    38103798    }
    38113799
    3812     LOG(History, "WebCoreHistory: Creating item for %s", url.url().ascii());
     3800    LOG(History, "WebCoreHistory: Creating item for %s", url.string().ascii().data());
    38133801   
    38143802    // Frames that have never successfully loaded any content
    … …  
    38233811   
    38243812    RefPtr<HistoryItem> item = new HistoryItem(url, m_frame->tree()->name(), m_frame->tree()->parent() ? m_frame->tree()->parent()->tree()->name() : "", docLoader ? docLoader->title() : "");
    3825     item->setOriginalURLString(originalURL.url());
     3813    item->setOriginalURLString(originalURL.string());
    38263814   
    38273815    // Save form state if this is a POST
    … …  
    38543842
    38553843            RefPtr<HistoryItem> item = frameLoader->createHistoryItemTree(m_frame, doClip);
    3856             LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", item.get(), documentLoader()->URL().url().ascii());
     3844            LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", item.get(), documentLoader()->url().string().ascii().data());
    38573845            page->backForwardList()->addItem(item);
    38583846        }
    … …  
    39773965    KURL currentURL;
    39783966    if (documentLoader())
    3979         currentURL = documentLoader()->URL();
     3967        currentURL = documentLoader()->url();
    39803968    RefPtr<FormData> formData = item->formData();
    39813969
    … …  
    40314019                inPageCache = true;
    40324020            } else {
    4033                 LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", m_provisionalHistoryItem->url().url().ascii());
     4021                LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", m_provisionalHistoryItem->url().string().ascii().data());
    40344022                pageCache()->remove(item);
    40354023            }
    … …  
    40964084bool FrameLoader::urlsMatchItem(HistoryItem* item) const
    40974085{
    4098     KURL currentURL = documentLoader()->URL();
     4086    KURL currentURL = documentLoader()->url();
    40994087   
    41004088    if (!equalIgnoringRef(currentURL, item->url()))
    … …  
    41484136    KURL currentURL;
    41494137    if (documentLoader())
    4150         currentURL = documentLoader()->URL();
     4138        currentURL = documentLoader()->url();
    41514139   
    41524140    // Always reload the target frame of the item we're going to.  This ensures that we will
    … …  
    42224210void FrameLoader::updateHistoryForStandardLoad()
    42234211{
    4224     LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", documentLoader()->URL().url().ascii());
     4212    LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", documentLoader()->url().string().ascii().data());
    42254213   
    42264214    bool frameNavigationOnLoad = false;
    … …  
    42384226            addHistoryForCurrentLocation();
    42394227    } else if (documentLoader()->unreachableURL().isEmpty() && m_currentHistoryItem) {
    4240         m_currentHistoryItem->setURL(documentLoader()->URL());
     4228        m_currentHistoryItem->setURL(documentLoader()->url());
    42414229        m_currentHistoryItem->setFormInfoFromRequest(documentLoader()->request());
    42424230    }
    … …  
    43074295            addHistoryForCurrentLocation();
    43084296        if (m_currentHistoryItem) {
    4309             m_currentHistoryItem->setURL(documentLoader()->URL());
     4297            m_currentHistoryItem->setURL(documentLoader()->url());
    43104298            m_currentHistoryItem->setFormInfoFromRequest(documentLoader()->request());
    43114299        }

  • trunk/WebCore/loader/FrameLoader.h

    r28399 r28639  
    273273        void setDefersLoading(bool);
    274274
    275         void changeLocation(const String& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
    276         void changeLocation(const KURL& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
     275        void changeLocation(const String& url, const String& referrer, bool lockHistory = true, bool userGesture = false);
     276        void changeLocation(const KURL&, const String& referrer, bool lockHistory = true, bool userGesture = false);
    277277        void urlSelected(const ResourceRequest&, const String& target, Event*, bool lockHistory, bool userGesture);
    278278        void urlSelected(const FrameLoadRequest&, Event*, bool lockHistory, bool userGesture);
    279279     
    280         bool requestFrame(HTMLFrameOwnerElement*, const String& URL, const AtomicString& frameName);
    281         Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL& URL, const String& name, const String& referrer);
    282 
    283         void submitForm(const char* action, const String& URL, PassRefPtr<FormData>, const String& target, const String& contentType, const String& boundary, Event*);
     280        bool requestFrame(HTMLFrameOwnerElement*, const String& url, const AtomicString& frameName);
     281        Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer);
     282
     283        void submitForm(const char* action, const String& url, PassRefPtr<FormData>, const String& target, const String& contentType, const String& boundary, Event*);
    284284        void submitFormAgain();
    285285        void submitForm(const FrameLoadRequest&, Event*);
    … …  
    299299
    300300        bool isScheduledLocationChangePending() const { return m_scheduledRedirection && isLocationChange(*m_scheduledRedirection); }
    301         void scheduleHTTPRedirection(double delay, const String& URL);
    302         void scheduleLocationChange(const String& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
     301        void scheduleHTTPRedirection(double delay, const String& url);
     302        void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool userGesture = false);
    303303        void scheduleRefresh(bool userGesture = false);
    304304        void scheduleHistoryNavigation(int steps);
    … …  
    320320        String encoding() const;
    321321
    322         KJS::JSValue* executeScript(const String& URL, int baseLine, const String& script);
     322        KJS::JSValue* executeScript(const String& url, int baseLine, const String& script);
    323323        KJS::JSValue* executeScript(const String& script, bool forceUserGesture = false);
    324324
    … …  
    358358        void frameDetached();
    359359
    360         // FIXME: Which one of these URL methods is right?
    361         KURL url() const;
    362         KURL URL() const;
     360        const KURL& url() const { return m_URL; }
    363361
    364362        void updateBaseURLForEmptyDocument();
    … …  
    380378        bool isComplete() const;
    381379
    382         bool requestObject(RenderPart* frame, const String& URL, const AtomicString& frameName,
     380        bool requestObject(RenderPart* frame, const String& url, const AtomicString& frameName,
    383381            const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
    384382
    385         KURL completeURL(const String& URL);
    386 
    387         void didTellBridgeAboutLoad(const String& URL);
    388         bool haveToldBridgeAboutLoad(const String& URL);
     383        KURL completeURL(const String& url);
     384
     385        void didTellBridgeAboutLoad(const String& url);
     386        bool haveToldBridgeAboutLoad(const String& url);
    389387
    390388        KURL originalRequestURL() const;

  • trunk/WebCore/loader/ImageDocument.cpp

    r28304 r28639  
    170170    imageElement->setAttribute(styleAttr, "-webkit-user-select: none");       
    171171    imageElement->setLoadManually(true);
    172     imageElement->setSrc(URL());
     172    imageElement->setSrc(url());
    173173   
    174174    body->appendChild(imageElement, ec);

  • trunk/WebCore/loader/MainResourceLoader.cpp

    r25274 r28639  
    174174}
    175175
    176 static bool shouldLoadAsEmptyDocument(const KURL& URL)
    177 {
    178     return URL.isEmpty() || equalIgnoringCase(String(URL.protocol()), "about");
     176static bool shouldLoadAsEmptyDocument(const KURL& url)
     177{
     178    return url.isEmpty() || equalIgnoringCase(String(url.protocol()), "about");
    179179}
    180180
    … …  
    296296void MainResourceLoader::didFinishLoading()
    297297{
    298     ASSERT(shouldLoadAsEmptyDocument(frameLoader()->URL()) || !defersLoading());
     298    ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading());
    299299
    300300    // The additional processing can do anything including possibly removing the last

  • trunk/WebCore/loader/NavigationAction.cpp

    r17976 r28639  
    5353}
    5454
    55 NavigationAction::NavigationAction(const KURL& URL, NavigationType type)
    56     : m_URL(URL)
     55NavigationAction::NavigationAction(const KURL& url, NavigationType type)
     56    : m_URL(url)
    5757    , m_type(type)
    5858{
    5959}
    6060
    61 NavigationAction::NavigationAction(const KURL& URL, FrameLoadType frameLoadType,
     61NavigationAction::NavigationAction(const KURL& url, FrameLoadType frameLoadType,
    6262        bool isFormSubmission)
    63     : m_URL(URL)
     63    : m_URL(url)
    6464    , m_type(navigationType(frameLoadType, isFormSubmission, 0))
    6565{
    6666}
    6767
    68 NavigationAction::NavigationAction(const KURL& URL, NavigationType type, PassRefPtr<Event> event)
    69     : m_URL(URL)
     68NavigationAction::NavigationAction(const KURL& url, NavigationType type, PassRefPtr<Event> event)
     69    : m_URL(url)
    7070    , m_type(type)
    7171    , m_event(event)
    … …  
    7373}
    7474
    75 NavigationAction::NavigationAction(const KURL& URL, FrameLoadType frameLoadType,
     75NavigationAction::NavigationAction(const KURL& url, FrameLoadType frameLoadType,
    7676        bool isFormSubmission, PassRefPtr<Event> event)
    77     : m_URL(URL)
     77    : m_URL(url)
    7878    , m_type(navigationType(frameLoadType, isFormSubmission, event))
    7979    , m_event(event)

  • trunk/WebCore/loader/NavigationAction.h

    r18096 r28639  
    4747        bool isEmpty() const { return m_URL.isEmpty(); }
    4848
    49         KURL URL() const { return m_URL; }
     49        KURL url() const { return m_URL; }
    5050        NavigationType type() const { return m_type; }
    5151        const Event* event() const { return m_event.get(); }

  • trunk/WebCore/loader/PluginDocument.cpp

    r25540 r28639  
    8787   
    8888    m_embedElement->setAttribute(nameAttr, "plugin");
    89     m_embedElement->setSrc(m_doc->URL());
     89    m_embedElement->setSrc(m_doc->url());
    9090    m_embedElement->setType(m_doc->frame()->loader()->responseMIMEType());
    9191   

  • trunk/WebCore/loader/SubresourceLoader.cpp

    r25274 r28639  
    7878bool SubresourceLoader::load(const ResourceRequest& r)
    7979{
    80     m_frame->loader()->didTellBridgeAboutLoad(r.url().url());
     80    m_frame->loader()->didTellBridgeAboutLoad(r.url().string());
    8181   
    8282    return ResourceLoader::load(r);
    … …  
    9797            && FrameLoader::restrictAccessToLocal()
    9898            && !FrameLoader::canLoad(request.url(), frame->document())) {
    99         FrameLoader::reportLocalLoadFailed(frame->page(), request.url().url());
     99        FrameLoader::reportLocalLoadFailed(frame->page(), request.url().string());
    100100        return 0;
    101101    }

  • trunk/WebCore/loader/icon/IconLoader.cpp

    r25419 r28639  
    7676    RefPtr<SubresourceLoader> loader = SubresourceLoader::create(m_frame, this, m_frame->loader()->iconURL());
    7777    if (!loader)
    78         LOG_ERROR("Failed to start load for icon at url %s", m_frame->loader()->iconURL().url().ascii());
     78        LOG_ERROR("Failed to start load for icon at url %s", m_frame->loader()->iconURL().string().ascii().data());
    7979
    8080    // Store the handle so we can cancel the load if stopLoading is called later.
    … …  
    139139void IconLoader::finishLoading(const KURL& iconURL, PassRefPtr<SharedBuffer> data)
    140140{
    141 
    142141    // When an icon load results in a 404 we commit it to the database here and clear the loading state. 
    143142    // But the SubresourceLoader continues pulling in data in the background for the 404 page if the server sends one. 
    … …  
    148147   
    149148    if (!iconURL.isEmpty() && m_loadIsInProgress) {
    150         iconDatabase()->setIconDataForIconURL(data, iconURL.url());
    151         LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", iconURL.url().ascii());
     149        iconDatabase()->setIconDataForIconURL(data, iconURL.string());
     150        LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", iconURL.string().ascii().data());
    152151        m_frame->loader()->commitIconURLToIconDatabase(iconURL);
    153152        m_frame->loader()->client()->dispatchDidReceiveIcon();

  • trunk/WebCore/loader/loader.cpp

    r25754 r28639  
    7474            request.setHTTPAccept(req->cachedResource()->accept());
    7575
    76         KURL r = dl->doc()->URL();
     76        KURL r = dl->doc()->url();
    7777        if (r.protocol().startsWith("http") && r.path().isEmpty())
    7878            r.setPath("/");
    79         request.setHTTPReferrer(r.url());
     79        request.setHTTPReferrer(r.string());
    8080        DeprecatedString domain = r.host();
    8181        if (dl->doc()->isHTMLDocument())

  • trunk/WebCore/loader/mac/LoaderNSURLExtras.m

    r25240 r28639  
    9999   
    100100    NSURL *baseURL = (NSURL *)CFURLGetBaseURL((CFURLRef)url);
    101     if (baseURL) {
    102         NSURL *URL = urlWithDataRelativeToURL(data, baseURL);
    103         return urlOriginalData(URL);
    104     } else
    105         return data;
     101    if (baseURL)
     102        return urlOriginalData(urlWithDataRelativeToURL(data, baseURL));
     103    return data;
    106104}
    107105

  • trunk/WebCore/page/Chrome.cpp

    r28192 r28639  
    328328        if (toolTip.isEmpty())
    329329            // FIXME: Need to pass this URL through userVisibleString once that's in WebCore
    330             toolTip = result.absoluteLinkURL().url();
     330            toolTip = result.absoluteLinkURL().string();
    331331    }
    332332

  • trunk/WebCore/page/ContextMenuController.cpp

    r27754 r28639  
    157157            KURL url = frame->loader()->documentLoader()->unreachableURL();
    158158            if (frame && url.isEmpty())
    159                 url = frame->loader()->documentLoader()->URL();
     159                url = frame->loader()->documentLoader()->url();
    160160            openNewWindow(url, frame);
    161161            break;

  • trunk/WebCore/page/Frame.cpp

    r28626 r28639  
    297297    d->m_userStyleSheetLoader = 0;
    298298    if (d->m_doc && d->m_doc->docLoader())
    299         d->m_userStyleSheetLoader = new UserStyleSheetLoader(d->m_doc, url.url());
     299        d->m_userStyleSheetLoader = new UserStyleSheetLoader(d->m_doc, url.string());
    300300}
    301301

  • trunk/WebCore/page/InspectorController.cpp

    r28328 r28639  
    146146            return Other;
    147147
    148         CachedResource* cachedResource = doc->docLoader()->cachedResource(requestURL.url());
     148        CachedResource* cachedResource = doc->docLoader()->cachedResource(requestURL.string());
    149149        if (!cachedResource)
    150150            return Other;
    … …  
    272272            return undefined;
    273273
    274         CachedResource* cachedResource = doc->docLoader()->cachedResource(resource->requestURL.url());
     274        CachedResource* cachedResource = doc->docLoader()->cachedResource(resource->requestURL.string());
    275275        if (!cachedResource)
    276276            return undefined;
    … …  
    926926    JSStringRelease(resourceString);
    927927
    928     String urlString = resource->requestURL.url();
     928    String urlString = resource->requestURL.string();
    929929    JSStringRef url = JSStringCreateWithCharacters(urlString.characters(), urlString.length());
    930930    JSValueRef urlValue = JSValueMakeString(m_scriptContext, url);
    … …  
    10231023        return;
    10241024
    1025     String urlString = resource->requestURL.url();
     1025    String urlString = resource->requestURL.string();
    10261026    JSStringRef url = JSStringCreateWithCharacters(urlString.characters(), urlString.length());
    10271027    JSValueRef urlValue = JSValueMakeString(m_scriptContext, url);
    … …  
    13711371        // FIXME: Should look into asserting that m_mainResource->loader == loader here.
    13721372
    1373         m_client->inspectedURLChanged(loader->URL().url());
     1373        m_client->inspectedURLChanged(loader->url().string());
    13741374
    13751375        deleteAllValues(m_consoleMessages);

  • trunk/WebCore/page/mac/WebCoreFrameBridge.mm

    r28626 r28639  
    12021202}
    12031203
    1204 - (BOOL)getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)URL
     1204- (BOOL)getData:(NSData **)data andResponse:(NSURLResponse **)response forURL:(NSString *)url
    12051205{
    12061206    Document* doc = m_frame->document();
    … …  
    12081208        return NO;
    12091209
    1210     CachedResource* resource = doc->docLoader()->cachedResource(URL);
     1210    CachedResource* resource = doc->docLoader()->cachedResource(url);
    12111211    if (!resource)
    12121212        return NO;

  • trunk/WebCore/platform/KURL.h

    r25769 r28639  
    2828
    2929#include "DeprecatedString.h"
     30#include "PlatformString.h"
    3031#include <wtf/Platform.h>
    3132
    … …  
    4546
    4647    class KURL;
    47     class String;
    4848    class TextEncoding;
    4949
    … …  
    6666    KURL(CFURLRef);
    6767#endif
    68     bool isEmpty() const { return urlString.isEmpty(); }
     68
     69    bool isNull() const { return urlString.isNull(); }
     70    bool isEmpty() const { return urlString.isEmpty(); }
     71
    6972    bool hasPath() const;
    7073
    71     DeprecatedString url() const { return urlString; }
     74    String string() const { return urlString; }
     75    const DeprecatedString& deprecatedString() const { return urlString; }
    7276
    7377    DeprecatedString protocol() const;

  • trunk/WebCore/platform/mac/ClipboardMac.mm

    r20258 r28639  
    167167                    if (type != "text/uri-list")
    168168                        count = 1;
    169                     NSMutableString *URLs = [NSMutableString string];
     169                    NSMutableString *urls = [NSMutableString string];
    170170                    unsigned i;
    171171                    for (i = 0; i < count; i++) {
    172172                        if (i > 0) {
    173                             [URLs appendString:@"\n"];
     173                            [urls appendString:@"\n"];
    174174                        }
    175175                        NSString *string = [fileList objectAtIndex:i];
    176176                        if (![string isKindOfClass:[NSString class]])
    177177                            break;
    178                         NSURL *URL = [NSURL fileURLWithPath:string];
    179                         [URLs appendString:[URL absoluteString]];
     178                        NSURL *url = [NSURL fileURLWithPath:string];
     179                        [urls appendString:[url absoluteString]];
    180180                    }
    181181                    if (i == count)
    182                         cocoaValue = URLs;
     182                        cocoaValue = urls;
    183183                }
    184184            }

  • trunk/WebCore/platform/mac/CookieJar.mm

    r28515 r28639  
    4343    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    4444
    45     NSURL *URL = url.getNSURL();
    46     NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
     45    NSURL *cookieURL = url.getNSURL();
     46    NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
    4747
    4848    // <rdar://problem/5632883> On 10.5, NSHTTPCookieStorage would happily store an empty cookie, which would be sent as "Cookie: =".
    … …  
    7171        return;
    7272
    73     NSURL *URL = url.getNSURL();
     73    NSURL *cookieURL = url.getNSURL();
    7474   
    7575    // <http://bugs.webkit.org/show_bug.cgi?id=6531>, <rdar://4409034>
    … …  
    7777    String cookieString = cookieStr.contains('=') ? cookieStr : cookieStr + "=";
    7878   
    79     NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:URL];
    80     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:URL mainDocumentURL:policyBaseURL.getNSURL()];   
     79    NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL];
     80    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:cookieURL mainDocumentURL:policyBaseURL.getNSURL()];   
    8181
    8282    END_BLOCK_OBJC_EXCEPTIONS;

  • trunk/WebCore/platform/mac/PasteboardMac.mm

    r25494 r28639  
    211211    ASSERT(!url.isEmpty());
    212212   
    213     NSURL *URL = url.getNSURL();
    214     NSString *userVisibleString = frame->editor()->client()->userVisibleString(URL);
     213    NSURL *cocoaURL = url.getNSURL();
     214    NSString *userVisibleString = frame->editor()->client()->userVisibleString(cocoaURL);
    215215   
    216216    NSString *title = (NSString*)titleStr;
    217217    if ([title length] == 0) {
    218         title = [[URL path] lastPathComponent];
     218        title = [[cocoaURL path] lastPathComponent];
    219219        if ([title length] == 0)
    220220            title = userVisibleString;
    … …  
    227227                            forType:WebURLsWithTitlesPboardType];
    228228    if ([types containsObject:NSURLPboardType])
    229         [URL writeToPasteboard:pasteboard];
     229        [cocoaURL writeToPasteboard:pasteboard];
    230230    if ([types containsObject:WebURLPboardType])
    231231        [pasteboard setString:userVisibleString forType:WebURLPboardType];
    … …  
    241241}
    242242
    243 static NSFileWrapper* fileWrapperForImage(CachedResource* resource, NSURL *URL)
     243static NSFileWrapper* fileWrapperForImage(CachedResource* resource, NSURL *url)
    244244{
    245245    SharedBuffer* coreData = resource->data();
    … …  
    251251    if (!coreMIMEType.isNull())
    252252        MIMEType = coreMIMEType;
    253     [wrapper setPreferredFilename:suggestedFilenameWithMIMEType(URL, MIMEType)];
     253    [wrapper setPreferredFilename:suggestedFilenameWithMIMEType(url, MIMEType)];
    254254    return wrapper;
    255255}
    … …  
    271271    Frame* frame = node->document()->frame();
    272272
    273     NSURL *URL = url.getNSURL();
    274     ASSERT(URL);
     273    NSURL *cocoaURL = url.getNSURL();
     274    ASSERT(cocoaURL);
    275275
    276276    NSArray* types = writableTypesForImage();
    277277    [m_pasteboard.get() declareTypes:types owner:nil];
    278     writeURL(m_pasteboard.get(), types, URL, nsStringNilIfEmpty(title), frame);
     278    writeURL(m_pasteboard.get(), types, cocoaURL, nsStringNilIfEmpty(title), frame);
    279279
    280280    ASSERT(node->renderer() && node->renderer()->isImage());
    … …  
    290290    ASSERT(MIMETypeRegistry::isSupportedImageResourceMIMEType(MIMEType));
    291291
    292     writeFileWrapperAsRTFDAttachment(fileWrapperForImage(cachedImage, URL));
     292    writeFileWrapperAsRTFDAttachment(fileWrapperForImage(cachedImage, cocoaURL));
    293293}
    294294
    … …  
    325325   
    326326   
    327     NSURL *URL;
    328    
    329     if ((URL = [NSURL URLFromPasteboard:m_pasteboard.get()])) {
     327    if (NSURL *url = [NSURL URLFromPasteboard:m_pasteboard.get()]) {
    330328        // FIXME: using the editorClient to call into webkit, for now, since
    331         // calling [URL _web_userVisibleString] from WebCore involves migrating a sizable web of
     329        // calling _web_userVisibleString from WebCore involves migrating a sizable web of
    332330        // helper code that should either be done in a separate patch or figured out in another way.
    333         string = frame->editor()->client()->userVisibleString(URL);
     331        string = frame->editor()->client()->userVisibleString(url);
    334332        if ([string length] > 0)
    335333            return string;

  • trunk/WebCore/platform/network/ResourceHandle.cpp

    r25274 r28639  
    173173
    174174    // Allow ports 21 and 22 for FTP URLs, as Mozilla does.
    175     if ((port == 21 || port == 22) && request.url().url().startsWith("ftp:", false))
     175    if ((port == 21 || port == 22) && request.url().deprecatedString().startsWith("ftp:", false))
    176176        return true;
    177177
    178178    // Allow any port number in a file URL, since the port number is ignored.
    179     if (request.url().url().startsWith("file:", false))
     179    if (request.url().deprecatedString().startsWith("file:", false))
    180180        return true;
    181181

  • trunk/WebCore/platform/network/ResourceRequestBase.cpp

    r24434 r28639  
    4646    updateResourceRequest();
    4747   
    48     return m_url.url().isNull();
     48    return m_url.isNull();
    4949}
    5050

  • trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r27865 r28639  
    3232#include "AuthenticationCF.h"
    3333#include "AuthenticationChallenge.h"
     34#include "CString.h"
    3435#include "DocLoader.h"
    3536#include "Frame.h"
    … …  
    6263    ResourceHandle* handle = (ResourceHandle*)clientInfo;
    6364
    64     LOG(Network, "CFNet - willSendRequest(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
     65    LOG(Network, "CFNet - willSendRequest(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
    6566
    6667    ResourceRequest request(cfRequest);
    … …  
    7879    ResourceHandle* handle = (ResourceHandle*)clientInfo;
    7980
    80     LOG(Network, "CFNet - didReceiveResponse(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
     81    LOG(Network, "CFNet - didReceiveResponse(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
    8182
    8283    if (handle->client())
    … …  
    9091    CFIndex length = CFDataGetLength(data);
    9192
    92     LOG(Network, "CFNet - didReceiveData(conn=%p, handle=%p, bytes=%d) (%s)", conn, handle, length, handle->request().url().url().ascii());
     93    LOG(Network, "CFNet - didReceiveData(conn=%p, handle=%p, bytes=%d) (%s)", conn, handle, length, handle->request().url().string().utf8().data());
    9394
    9495    if (handle->client())
    … …  
    100101    ResourceHandle* handle = (ResourceHandle*)clientInfo;
    101102
    102     LOG(Network, "CFNet - didFinishLoading(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().url().ascii());
     103    LOG(Network, "CFNet - didFinishLoading(conn=%p, handle=%p) (%s)", conn, handle, handle->request().url().string().utf8().data());
    103104
    104105    if (handle->client())
    … …  
    110111    ResourceHandle* handle = (ResourceHandle*)clientInfo;
    111112
    112     LOG(Network, "CFNet - didFail(conn=%p, handle=%p, error = %p) (%s)", conn, handle, error, handle->request().url().url().ascii());
     113    LOG(Network, "CFNet - didFail(conn=%p, handle=%p, error = %p) (%s)", conn, handle, error, handle->request().url().string().utf8().data());
    113114
    114115    if (handle->client())
    … …  
    140141    ResourceHandle* handle = (ResourceHandle*)clientInfo;
    141142    ASSERT(handle);
    142     LOG(Network, "CFNet - didReceiveChallenge(conn=%p, handle=%p (%s)", conn, handle, handle->request().url().url().ascii());
     143    LOG(Network, "CFNet - didReceiveChallenge(conn=%p, handle=%p (%s)", conn, handle, handle->request().url().string().utf8().data());
    143144
    144145    handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(challenge, handle));
    … …  
    163164{
    164165    if (m_connection) {
    165         LOG(Network, "CFNet - Cancelling connection %p (%s)", m_connection, m_request.url().url().ascii());
     166        LOG(Network, "CFNet - Cancelling connection %p (%s)", m_connection, m_request.url().string().utf8().data());
    166167        CFURLConnectionCancel(m_connection.get());
    167168    }
    … …  
    170171ResourceHandle::~ResourceHandle()
    171172{
    172     LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_request.url().url().ascii());
     173    LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_request.url().string().utf8().data());
    173174}
    174175
    … …  
    261262    CFURLConnectionStart(d->m_connection.get());
    262263
    263     LOG(Network, "CFNet - Starting URL %s (handle=%p, conn=%p)", d->m_request.url().url().ascii(), this, d->m_connection);
     264    LOG(Network, "CFNet - Starting URL %s (handle=%p, conn=%p)", d->m_request.url().string().utf8().data(), this, d->m_connection);
    264265
    265266    return true;

  • trunk/WebCore/platform/win/ClipboardUtilitiesWin.cpp

    r25941 r28639  
    108108HGLOBAL createGlobalData(const KURL& url, const String& title)
    109109{
    110     String mutableURL(url.url());
     110    String mutableURL(url.string());
    111111    String mutableTitle(title);
    112112    SIZE_T size = mutableURL.length() + mutableTitle.length() + 2;  // +1 for "\n" and +1 for null terminator
    … …  
    197197{
    198198    String markup("<a href=\"");
    199     markup.append(url.url());
     199    markup.append(url.string());
    200200    markup.append("\">");
    201201    markup.append(title);

  • trunk/WebCore/platform/win/ClipboardWin.cpp

    r27619 r28639  
    445445
    446446    if (withPlainText) {
    447         medium.hGlobal = createGlobalData(url.url());
     447        medium.hGlobal = createGlobalData(url.string());
    448448        if (medium.hGlobal && FAILED(data->SetData(plainTextWFormat(), &medium, TRUE)))
    449449            ::GlobalFree(medium.hGlobal);
    … …  
    643643        return;
    644644
    645     HGLOBAL imageFileDescriptor = createGlobalImageFileDescriptor(url.url(), element->getAttribute(altAttr), cachedImage);
     645    HGLOBAL imageFileDescriptor = createGlobalImageFileDescriptor(url.string(), element->getAttribute(altAttr), cachedImage);
    646646    if (!imageFileDescriptor)
    647647        return;
    … …  
    696696
    697697    int estimatedSize = 0;
    698     String url = kurl.url();
     698    String url = kurl.string();
    699699
    700700    HGLOBAL urlFileDescriptor = createGlobalUrlFileDescriptor(url, titleStr, estimatedSize);
    … …  
    719719    ExceptionCode ec = 0;
    720720
    721     medium.hGlobal = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->URL()));
     721    medium.hGlobal = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url()));
    722722    if (medium.hGlobal && FAILED(m_writableDataObject->SetData(htmlFormat(), &medium, TRUE)))
    723723        ::GlobalFree(medium.hGlobal);

  • trunk/WebCore/platform/win/PasteboardWin.cpp

    r23986 r28639  
    117117    if (::OpenClipboard(m_owner)) {
    118118        ExceptionCode ec = 0;
    119         HGLOBAL cbData = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->URL()));
     119        HGLOBAL cbData = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url()));
    120120        if (!::SetClipboardData(HTMLClipboardFormat, cbData))
    121121            ::GlobalFree(cbData);
    … …  
    175175    // bare-bones CF_UNICODETEXT support
    176176    if (::OpenClipboard(m_owner)) {
    177         HGLOBAL cbData = createGlobalData(url.url());
     177        HGLOBAL cbData = createGlobalData(url.string());
    178178        if (!::SetClipboardData(CF_UNICODETEXT, cbData))
    179179            ::GlobalFree(cbData);

  • trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

    r27236 r28639  
    515515{   
    516516    PluginPackageWin* plugin = pluginForMIMEType(mimeType);
    517     String filename = url.url();
     517    String filename = url.string();
    518518   
    519519    if (!plugin) {

  • trunk/WebCore/plugins/win/PluginStreamWin.cpp

    r28421 r28639  
    130130    // Some plugins (Flash) expect that javascript URLs are passed back decoded as this is the
    131131    // format used when requesting the URL.
    132     if (responseURL.url().startsWith("javascript:", false))
    133         m_stream.url = _strdup(responseURL.decode_string(responseURL.url()).utf8());
     132    if (responseURL.string().startsWith("javascript:", false))
     133        m_stream.url = _strdup(responseURL.decode_string(responseURL.deprecatedString()).utf8());
    134134    else
    135         m_stream.url = _strdup(responseURL.url().utf8());
     135        m_stream.url = _strdup(responseURL.deprecatedString().utf8());
    136136   
    137137    CString mimeTypeStr = m_resourceResponse.mimeType().utf8();
    … …  
    263263
    264264    if (m_sendNotification)
    265         m_pluginFuncs->urlnotify(m_instance, m_resourceRequest.url().url().utf8(), m_reason, m_notifyData);
     265        m_pluginFuncs->urlnotify(m_instance, m_resourceRequest.url().deprecatedString().utf8(), m_reason, m_notifyData);
    266266
    267267    m_streamState = StreamStopped;

  • trunk/WebCore/plugins/win/PluginViewWin.cpp

    r28486 r28639  
    205205static String scriptStringIfJavaScriptURL(const KURL& url)
    206206{
    207     if (!url.url().startsWith("javascript:", false))
     207    if (!url.string().startsWith("javascript:", false))
    208208        return String();
    209209
    210210    // This returns an unescaped string
    211     return KURL::decode_string(url.url().mid(11));
     211    return KURL::decode_string(url.deprecatedString().mid(11));
    212212}
    213213
    … …  
    785785            if (request->sendNotification()) {
    786786                KJS::JSLock::DropAllLocks dropAllLocks;
    787                 m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.url().utf8(), NPRES_DONE, request->notifyData());
     787                m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.deprecatedString().utf8(), NPRES_DONE, request->notifyData());
    788788            }
    789789        }

  • trunk/WebCore/svg/SVGImageLoader.cpp

    r28258 r28639  
    5252    CachedImage *newImage = 0;
    5353    if (!imageElement->href().isEmpty()) {
    54         DeprecatedString uri = imageElement->baseURI().deprecatedString();;
     54        DeprecatedString uri = imageElement->baseURI().deprecatedString();
    5555        if (!uri.isEmpty())
    56             uri = KURL(uri, imageElement->href().deprecatedString()).url();
     56            uri = KURL(uri, imageElement->href().deprecatedString()).deprecatedString();
    5757        else
    5858            uri = imageElement->href().deprecatedString();

  • trunk/WebCore/xml/XMLHttpRequest.cpp

    r28626 r28639  
    172172            m_responseXML = m_doc->implementation()->createDocument(0);
    173173            m_responseXML->open();
    174             m_responseXML->setURL(m_url.url());
     174            m_responseXML->setURL(m_url.deprecatedString());
    175175            // FIXME: set Last-Modified and cookies (currently, those are only available for HTMLDocuments).
    176176            m_responseXML->write(String(m_responseText));
    … …  
    320320
    321321    // but a remote document can only load from the same port on the server
    322     KURL documentURL = m_doc->URL();
     322    KURL documentURL = m_doc->url();
    323323    if (documentURL.protocol().lower() == url.protocol().lower()
    324324            && documentURL.host().lower() == url.host().lower()

  • trunk/WebCore/xml/XSLImportRule.cpp

    r25754 r28639  
    8989    if (!parentSheet->href().isNull())
    9090        // use parent styleheet's URL as the base URL
    91         absHref = KURL(parentSheet->href().deprecatedString(),m_strHref.deprecatedString()).url();
     91        absHref = KURL(parentSheet->href().deprecatedString(), m_strHref.deprecatedString()).string();
    9292   
    9393    // Check for a cycle in our import chain.  If we encounter a stylesheet

  • trunk/WebCore/xml/XSLTProcessor.cpp

    r28014 r28639  
    256256    result->open();
    257257    if (sourceIsDocument) {
    258         result->setURL(ownerDocument->URL());
     258        result->setURL(ownerDocument->url());
    259259        result->setBaseURL(ownerDocument->baseURL());
    260260    }
    … …  
    294294{
    295295    if (!cachedStylesheet && stylesheetRootNode) {
    296         cachedStylesheet = new XSLStyleSheet(stylesheetRootNode->parent() ? stylesheetRootNode->parent() : stylesheetRootNode, stylesheetRootNode->document()->URL());
     296        cachedStylesheet = new XSLStyleSheet(stylesheetRootNode->parent() ? stylesheetRootNode->parent() : stylesheetRootNode, stylesheetRootNode->document()->url());
    297297        cachedStylesheet->parseString(createMarkup(stylesheetRootNode));
    298298    }
    … …  
    313313        sourceDoc = (xmlDocPtr)ownerDocument->transformSource();
    314314    if (!sourceDoc) {
    315         sourceDoc = (xmlDocPtr)xmlDocPtrForString(ownerDocument->docLoader(), createMarkup(sourceNode), sourceIsDocument ? ownerDocument->URL() : DeprecatedString());
     315        sourceDoc = (xmlDocPtr)xmlDocPtrForString(ownerDocument->docLoader(), createMarkup(sourceNode), sourceIsDocument ? ownerDocument->url() : DeprecatedString());
    316316        shouldDelete = (sourceDoc != 0);
    317317    }

  • trunk/WebKit/mac/ChangeLog

    r28626 r28639  
     12007-12-11  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Scrub URL out of the tree in preparation for renaming KURL to URL.
     6
     7        * WebCoreSupport/WebFrameLoaderClient.mm:
     8        (WebFrameLoaderClient::actionDictionary):
     9        * WebView/WebDataSource.mm:
     10        (-[WebDataSource _URL]):
     11        * WebView/WebView.mm:
     12        (-[WebView _dispatchDidReceiveIconFromWebFrame:]):
     13
    1142007-12-11  Darin Adler  <darin@apple.com>
    215

  • trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r28503 r28639  
    11221122            [NSNumber numberWithInt:mouseEvent->button()], WebActionButtonKey,
    11231123            [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
    1124             action.URL().getNSURL(), WebActionOriginalURLKey,
     1124            action.url().getNSURL(), WebActionOriginalURLKey,
    11251125            nil];
    11261126        [element release];
    … …  
    11301130        [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
    11311131        [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
    1132         action.URL().getNSURL(), WebActionOriginalURLKey,
     1132        action.url().getNSURL(), WebActionOriginalURLKey,
    11331133        nil];
    11341134}

  • trunk/WebKit/mac/WebView/WebDataSource.mm

    r26759 r28639  
    320320- (NSURL *)_URL
    321321{
    322     KURL URL = _private->loader->URL();
     322    KURL URL = _private->loader->url();
    323323    return URL.isEmpty() ? nil : URL.getNSURL();
    324324}

  • trunk/WebKit/mac/WebView/WebView.mm

    r28597 r28639  
    40404040    WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(self);
    40414041    if (implementations->didReceiveIconForFrameFunc) {
    4042         Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().url(), IntSize(16, 16));
     4042        Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().string(), IntSize(16, 16));
    40434043        if (NSImage *icon = webGetNSImage(image, NSMakeSize(16, 16)))
    40444044            CallFrameLoadDelegate(implementations->didReceiveIconForFrameFunc, self, @selector(webView:didReceiveIcon:forFrame:), icon, webFrame);

  • trunk/WebKit/win/ChangeLog

    r28633 r28639  
     12007-12-11  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Scrub URL out of the tree in preparation for renaming KURL to URL.
     6
     7        * WebFrame.cpp:
     8        (WebFrame::url):
     9        (WebFrame::dispatchWillPerformClientRedirect):
     10        (WebFrame::setTitle):
     11        (WebFrame::updateGlobalHistoryForStandardLoad):
     12        (WebFrame::updateGlobalHistoryForReload):
     13        (WebFrame::cancelledError):
     14        (WebFrame::blockedError):
     15        (WebFrame::interruptForPolicyChangeError):
     16        (WebFrame::createPlugin):
     17        * WebView.cpp:
     18        (WebView::notifyDidAddIcon):
     19
    1202007-12-10  Anders Carlsson  <andersca@apple.com>
    221

  • trunk/WebKit/win/MarshallingHelpers.cpp

    r27625 r28639  
    4848BSTR MarshallingHelpers::KURLToBSTR(const KURL& url)
    4949{
    50     String urlString(url.url());
     50    String urlString(url.string());
    5151    return SysAllocStringLen(urlString.characters(), urlString.length());
    5252}

  • trunk/WebKit/win/WebActionPropertyBag.cpp

    r23207 r28639  
    134134    } else if (isEqual(pszPropName, WebActionOriginalURLKey)) {
    135135        V_VT(pVar) = VT_BSTR;
    136         V_BSTR(pVar) = BString(m_action.URL().url()).release();
     136        V_BSTR(pVar) = BString(m_action.url().string()).release();
    137137        return S_OK;
    138138    } else if (isEqual(pszPropName, WebActionModifierFlagsKey)) {

  • trunk/WebKit/win/WebDataSource.cpp

    r25415 r28639  
    246246{
    247247    KURL unreachableURL = m_loader->unreachableURL();
    248     BString urlString((LPOLESTR)unreachableURL.url().unicode(), unreachableURL.url().length());
     248    BString urlString((LPOLESTR)unreachableURL.deprecatedString().unicode(), unreachableURL.deprecatedString().length());
    249249
    250250    *url = urlString.release();

  • trunk/WebKit/win/WebDownload.cpp

    r28092 r28639  
    103103    if (!m_download) {
    104104        ASSERT_NOT_REACHED();
    105         LOG_ERROR("WebDownload - Failed to create WebDownload from existing connection (%s)", request.url().url().ascii());
     105        LOG_ERROR("WebDownload - Failed to create WebDownload from existing connection (%s)", request.url().deprecatedString().ascii());
    106106    } else
    107         LOG(Download, "WebDownload - Created WebDownload %p from existing connection (%s)", this, request.url().url().ascii());
     107        LOG(Download, "WebDownload - Created WebDownload %p from existing connection (%s)", this, request.url().deprecatedString().ascii());
    108108
    109109    // The CFURLDownload either starts successfully and retains the CFURLConnection,
    … …  
    131131    CFURLDownloadScheduleDownloadWithRunLoop(m_download.get(), ResourceHandle::loaderRunLoop(), kCFRunLoopDefaultMode);
    132132
    133     LOG(Download, "WebDownload - Initialized download of url %s in WebDownload %p", url.url().ascii(), this);
     133    LOG(Download, "WebDownload - Initialized download of url %s in WebDownload %p", url.deprecatedString().ascii(), this);
    134134}
    135135
    … …  
    233233    CFURLDownloadScheduleDownloadWithRunLoop(m_download.get(), ResourceHandle::loaderRunLoop(), kCFRunLoopDefaultMode);
    234234
    235     LOG(Download, "WebDownload - initWithRequest complete, started download of url %s", webRequest->resourceRequest().url().url().ascii());
     235    LOG(Download, "WebDownload - initWithRequest complete, started download of url %s", webRequest->resourceRequest().url().deprecatedString().ascii());
    236236    return S_OK;
    237237}

  • trunk/WebKit/win/WebDragClient.cpp

    r26490 r28639  
    181181    bool clipLabelString = false;
    182182
    183     String urlString = url.url();
     183    String urlString = url.string();
    184184    String label = inLabel;
    185185    if (label.isEmpty()) {

  • trunk/WebKit/win/WebElementPropertyBag.cpp

    r25231 r28639  
    145145        return S_OK;
    146146    } else if (isEqual(WebElementImageURLKey, key))
    147         return convertStringToVariant(pVar, m_result->absoluteImageURL().url());
     147        return convertStringToVariant(pVar, m_result->absoluteImageURL().string());
    148148    else if (isEqual(WebElementIsSelectedKey, key)) {
    149149        V_VT(pVar) = VT_BOOL;
    … …  
    158158        return convertStringToVariant(pVar, m_result->title());
    159159    else if (isEqual(WebElementLinkURLKey, key))
    160         return convertStringToVariant(pVar, m_result->absoluteLinkURL().url());
     160        return convertStringToVariant(pVar, m_result->absoluteLinkURL().string());
    161161    else if (isEqual(WebElementLinkTargetFrameKey, key)) {
    162162        if (!m_result->targetFrame())

  • trunk/WebKit/win/WebFrame.cpp

    r28503 r28639  
    763763        return KURL();
    764764
    765     return coreFrame->loader()->URL();
     765    return coreFrame->loader()->url();
    766766}
    767767
    … …  
    15661566    COMPtr<IWebFrameLoadDelegate> frameLoadDelegate;
    15671567    if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate)))
    1568         frameLoadDelegate->willPerformClientRedirectToURL(d->webView, BString(url.url()), delay, MarshallingHelpers::CFAbsoluteTimeToDATE(fireDate), this);
     1568        frameLoadDelegate->willPerformClientRedirectToURL(d->webView, BString(url.string()), delay, MarshallingHelpers::CFAbsoluteTimeToDATE(fireDate), this);
    15691569}
    15701570
    … …  
    18271827        if (history) {
    18281828            COMPtr<IWebHistoryItem> item;
    1829             if (SUCCEEDED(history->itemForURL(BString(url.url()), &item))) {
     1829            if (SUCCEEDED(history->itemForURL(BString(url.string()), &item))) {
    18301830                COMPtr<IWebHistoryItemPrivate> itemPrivate;
    18311831                if (SUCCEEDED(item->QueryInterface(IID_IWebHistoryItemPrivate, (void**)&itemPrivate)))
    … …  
    18541854        return;
    18551855
    1856     history->addItemForURL(BString(url.url()), 0);                 
     1856    history->addItemForURL(BString(url.string()), 0);                 
    18571857}
    18581858
    18591859void WebFrame::updateGlobalHistoryForReload(const KURL& url)
    18601860{
    1861     BString urlBStr(url.url());
     1861    BString urlBStr(url.string());
    18621862
    18631863    COMPtr<WebHistory> history;
    … …  
    19301930    // FIXME: Need ChickenCat to include CFNetwork/CFURLError.h to get these values
    19311931    // Alternatively, we could create our own error domain/codes.
    1932     return ResourceError(String(WebURLErrorDomain), -999, request.url().url(), String());
     1932    return ResourceError(String(WebURLErrorDomain), -999, request.url().string(), String());
    19331933}
    19341934
    … …  
    19361936{
    19371937    // FIXME: Need to implement the String descriptions for errors in the WebKitErrorDomain and have them localized
    1938     return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().url(), String());
     1938    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().string(), String());
    19391939}
    19401940
    … …  
    19481948{
    19491949    // FIXME: Need to implement the String descriptions for errors in the WebKitErrorDomain and have them localized
    1950     return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().url(), String());
     1950    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), String());
    19511951}
    19521952
    … …  
    23752375    }
    23762376
    2377     ResourceError resourceError(String(WebKitErrorDomain), errorCode, url.url(), String());
     2377    ResourceError resourceError(String(WebKitErrorDomain), errorCode, url.string(), String());
    23782378    COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
    23792379     

  • trunk/WebKit/win/WebResource.cpp

    r22935 r28639  
    127127    }
    128128
    129     *url = BString(String(m_url.url())).release();
     129    *url = BString(String(m_url.string())).release();
    130130    return S_OK;
    131131}

  • trunk/WebKit/win/WebURLResponse.cpp

    r28092 r28639  
    343343        return E_INVALIDARG;
    344344
    345     BString url(m_response.url().url());
     345    BString url(m_response.url().string());
    346346    *result = url.release();
    347347    if (!m_response.url().isEmpty() && !*result)

  • trunk/WebKit/win/WebView.cpp

    r28633 r28639  
    21232123    String mainFrameURL;
    21242124    if (m_mainFrame)
    2125         mainFrameURL = m_mainFrame->url().url();
     2125        mainFrameURL = m_mainFrame->url().string();
    21262126
    21272127    if (!mainFrameURL.isEmpty() && mainFrameURL == String((CFStringRef)value))
Note: See TracChangeset for help on using the changeset viewer.