Changeset 147024 in webkit

Timestamp:

Mar 27, 2013 5:02:59 PM (11 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] Populate the mime type of the WebContext for images
​https://bugs.webkit.org/show_bug.cgi?id=113272

Reviewed by George Staikos.

PR 278967

Populate the mime type using the file extension reported by the image
decoder. This way we benefit from file type sniffing, instead of
relying on the mime type reported by the resource response.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::webContext):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -2319 +2319 @@
             context.setFlag(Platform::WebContext::IsImage);
             // FIXME: At the mean time, we only show "Save Image" when the image data is available.
-            if (CachedResource* cachedResource = imageElement->cachedImage()) {
-                if (cachedResource->isLoaded() && cachedResource->resourceBuffer()) {
+            if (CachedImage* cachedImage = imageElement->cachedImage()) {
+                if (cachedImage->isLoaded() && cachedImage->resourceBuffer()) {
                     String url = stripLeadingAndTrailingHTMLSpaces(imageElement->getAttribute(HTMLNames::srcAttr).string());
                     context.setSrc(node->document()->completeURL(url).string());
+
+                    String mimeType = cachedImage->response().mimeType();
+                    if (mimeType.isEmpty()) {
+                        StringBuilder builder;
+                        String extension = cachedImage->image()->filenameExtension();
+                        builder.append("image/");
+                        if (extension.isEmpty())
+                            builder.append("unknown");
+                        else if (extension == "jpg")
+                            builder.append("jpeg");
+                        else
+                            builder.append(extension);
+                        mimeType = builder.toString();
+                    }
+                    context.setMimeType(mimeType);
                 }
             }
@@ -5168 +5183 @@
     if (!database)
         return;
-    
+
     Vector<String> pluginDirectories = database->pluginDirectories();
     if (path.empty() || pluginDirectories.contains(String(path)))

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-03-27  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Populate the mime type of the WebContext for images
+        https://bugs.webkit.org/show_bug.cgi?id=113272
+
+        Reviewed by George Staikos.
+
+        PR 278967
+
+        Populate the mime type using the file extension reported by the image
+        decoder. This way we benefit from file type sniffing, instead of
+        relying on the mime type reported by the resource response.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::webContext):
+
 2013-03-26  Hayato Ito  <hayato@chromium.org>