Changeset 50891 in webkit


Ignore:
Timestamp:
Nov 12, 2009 12:03:56 PM (14 years ago)
Author:
eric@webkit.org
Message:

2009-11-12 Adam Barth <abarth>

Reviewed by Dimitri Glazkov.

[Chromium] reload-subframe-object.html fails
https://bugs.webkit.org/show_bug.cgi?id=31398

More closely match FrameLoaderClient.mm. Turns out we don't want to
use MIMETypeRegistry::getMIMETypeForPath because we can't distinguish
between application/octet-stream and lack of knowledge of the MIME
type.

Covered by reload-subframe-object.html.

  • src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::objectContentType):
Location:
trunk/WebKit/chromium
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r50889 r50891  
     12009-11-12  Adam Barth  <abarth>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        [Chromium] reload-subframe-object.html fails
     6        https://bugs.webkit.org/show_bug.cgi?id=31398
     7
     8        More closely match FrameLoaderClient.mm.  Turns out we don't want to
     9        use MIMETypeRegistry::getMIMETypeForPath because we can't distinguish
     10        between application/octet-stream and lack of knowledge of the MIME
     11        type.
     12
     13        Covered by reload-subframe-object.html.
     14
     15        * src/FrameLoaderClientImpl.cpp:
     16        (WebKit::FrameLoaderClientImpl::objectContentType):
     17
    1182009-11-12  Nate Chapin  <japhet@chromium.org>
    219
  • trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r50742 r50891  
    4848#include "PlatformString.h"
    4949#include "PluginData.h"
     50#include "PluginDataChromium.h"
    5051#include "StringExtras.h"
    5152#include "WebDataSourceImpl.h"
     
    13491350        String filename = url.lastPathComponent();
    13501351        int extensionPos = filename.reverseFind('.');
    1351         if (extensionPos >= 0)
    1352             mimeType = MIMETypeRegistry::getMIMETypeForPath(url.path());
     1352        if (extensionPos >= 0) {
     1353            String extension = filename.substring(extensionPos + 1);
     1354            mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
     1355            if (mimeType.isEmpty()) {
     1356                // If there's no mimetype registered for the extension, check to see
     1357                // if a plugin can handle the extension.
     1358                mimeType = getPluginMimeTypeFromExtension(extension);
     1359            }
     1360        }
    13531361
    13541362        if (mimeType.isEmpty())
Note: See TracChangeset for help on using the changeset viewer.