Changeset 37655 in webkit

Timestamp:

Oct 17, 2008 8:56:24 AM (16 years ago)

Author:

brettw@chromium.org

Message:

Reviewed by Timothy Hatcher.

Have ImageDocument generate its own filename for the title of images
without relying on the suggested filename from the network layer, which
may be nonexistant or not relevant.
​https://bugs.webkit.org/show_bug.cgi?id=21565

• loader/ImageDocument.cpp: (WebCore::ImageTokenizer::finish):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ImageDocument.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-15  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Have ImageDocument generate its own filename for the title of images
+        without relying on the suggested filename from the network layer, which
+        may be nonexistant or not relevant.
+        https://bugs.webkit.org/show_bug.cgi?id=21565
+
+        * loader/ImageDocument.cpp:
+        (WebCore::ImageTokenizer::finish):
+
 2008-10-17  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/loader/ImageDocument.cpp

@@ -121 +121 @@
 
         IntSize size = cachedImage->imageSize(m_doc->frame()->pageZoomFactor());
-        if (size.width())
-            m_doc->setTitle(imageTitle(cachedImage->response().suggestedFilename(), size));
+        if (size.width()) {
+            // Compute the title, we use the filename of the resource, falling
+            // back on the hostname if there is no path.
+            String fileName = m_doc->url().lastPathComponent();
+            if (fileName.isEmpty())
+                fileName = m_doc->url().host();
+            m_doc->setTitle(imageTitle(fileName, size));
+        }
 
         m_doc->imageChanged();