Changeset 156550 in webkit for trunk/Source/WebCore/page/PageSerializer.cpp

Timestamp:

Sep 27, 2013, 9:39:41 AM (12 years ago)

Author:

Darin Adler

Message:

rename KURL to URL
​https://bugs.webkit.org/show_bug.cgi?id=16214

Reviewed by Andreas Kling.

Source/WebCore:

• many files: Renamed, using script.

Source/WebKit:

• WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Let the script to try to rename here.

Source/WebKit/blackberry:

• many files: Renamed, using script.

Source/WebKit/efl:

• many files: Renamed, using script.

Source/WebKit/gtk:

• many files: Renamed, using script.

Source/WebKit/mac:

• many files: Renamed, using script.

Source/WebKit/qt:

• many files: Renamed, using script.

Source/WebKit/win:

• many files: Renamed, using script.

Source/WebKit/wince:

• many files: Renamed, using script.

Source/WebKit2:

• many files: Renamed, using script.

Tools:

• many files: Renamed, using script.

File:

• trunk/Source/WebCore/page/PageSerializer.cpp (modified) (10 diffs)

trunk/Source/WebCore/page/PageSerializer.cpp

@@ -157 +157 @@
         return;
 
-    KURL url = frame->document()->url();
+    URL url = frame->document()->url();
     if (url.isValid() && !url.isBlankURL())
         return;
@@ -176 +176 @@
 }
 
-PageSerializer::Resource::Resource(const KURL& url, const String& mimeType, PassRefPtr<SharedBuffer> data)
+PageSerializer::Resource::Resource(const URL& url, const String& mimeType, PassRefPtr<SharedBuffer> data)
     : url(url)
     , mimeType(mimeType)
@@ -197 +197 @@
 {
     Document* document = frame->document();
-    KURL url = document->url();
+    URL url = document->url();
     if (!url.isValid() || url.isBlankURL()) {
         // For blank frames we generate a fake URL so they can be referenced by their containing frame.
@@ -235 +235 @@
         if (isHTMLImageElement(element)) {
             HTMLImageElement* imageElement = toHTMLImageElement(element);
-            KURL url = document->completeURL(imageElement->getAttribute(HTMLNames::srcAttr));
+            URL url = document->completeURL(imageElement->getAttribute(HTMLNames::srcAttr));
             CachedImage* cachedImage = imageElement->cachedImage();
             addImageToResources(cachedImage, imageElement->renderer(), url);
@@ -241 +241 @@
             HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(element);
             if (CSSStyleSheet* sheet = linkElement->sheet()) {
-                KURL url = document->completeURL(linkElement->getAttribute(HTMLNames::hrefAttr));
+                URL url = document->completeURL(linkElement->getAttribute(HTMLNames::hrefAttr));
                 serializeCSSStyleSheet(sheet, url);
                 ASSERT(m_resourceURLs.contains(url));
@@ -247 +247 @@
         } else if (isHTMLStyleElement(element)) {
             if (CSSStyleSheet* sheet = toHTMLStyleElement(element)->sheet())
-                serializeCSSStyleSheet(sheet, KURL());
+                serializeCSSStyleSheet(sheet, URL());
         }
     }
@@ -255 +255 @@
 }
 
-void PageSerializer::serializeCSSStyleSheet(CSSStyleSheet* styleSheet, const KURL& url)
+void PageSerializer::serializeCSSStyleSheet(CSSStyleSheet* styleSheet, const URL& url)
 {
     StringBuilder cssText;
@@ -270 +270 @@
         if (rule->type() == CSSRule::IMPORT_RULE) {
             CSSImportRule* importRule = static_cast<CSSImportRule*>(rule);
-            KURL importURL = document->completeURL(importRule->href());
+            URL importURL = document->completeURL(importRule->href());
             if (m_resourceURLs.contains(importURL))
                 continue;
@@ -292 +292 @@
 }
 
-void PageSerializer::addImageToResources(CachedImage* image, RenderObject* imageRenderer, const KURL& url)
+void PageSerializer::addImageToResources(CachedImage* image, RenderObject* imageRenderer, const URL& url)
 {
     if (!url.isValid() || m_resourceURLs.contains(url))
@@ -341 +341 @@
         CachedImage* image = static_cast<StyleCachedImage*>(styleImage)->cachedImage();
 
-        KURL url = document->completeURL(image->url());
+        URL url = document->completeURL(image->url());
         addImageToResources(image, 0, url);
     }
 }
 
-KURL PageSerializer::urlForBlankFrame(Frame* frame)
-{
-    HashMap<Frame*, KURL>::iterator iter = m_blankFrameURLs.find(frame);
+URL PageSerializer::urlForBlankFrame(Frame* frame)
+{
+    HashMap<Frame*, URL>::iterator iter = m_blankFrameURLs.find(frame);
     if (iter != m_blankFrameURLs.end())
         return iter->value;
     String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
-    KURL fakeURL(ParsedURLString, url);
+    URL fakeURL(ParsedURLString, url);
     m_blankFrameURLs.add(frame, fakeURL);