Changeset 81933 in webkit


Ignore:
Timestamp:
Mar 24, 2011 7:54:18 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • fast/images/embed-image-plugins-disabled.html: Removed.
  • platform/mac/fast/images/embed-image-expected.checksum:
  • platform/mac/fast/images/embed-image-expected.png:
  • platform/mac/fast/images/embed-image-expected.txt:
  • platform/mac/fast/images/embed-image-plugins-disabled-expected.checksum: Removed.
  • platform/mac/fast/images/embed-image-plugins-disabled-expected.png: Removed.
  • platform/mac/fast/images/embed-image-plugins-disabled-expected.txt: Removed.

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • html/HTMLEmbedElement.cpp: (WebCore::HTMLEmbedElement::HTMLEmbedElement):
  • html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::HTMLObjectElement): (WebCore::HTMLObjectElement::parametersForPlugin):
  • html/HTMLPlugInImageElement.cpp: (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement): (WebCore::HTMLPlugInImageElement::isImageType): (WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
  • html/HTMLPlugInImageElement.h:
  • loader/EmptyClients.h: (WebCore::EmptyFrameLoaderClient::objectContentType):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::defaultObjectContentType):
  • loader/FrameLoader.h:
  • loader/FrameLoaderClient.h:
  • loader/SubframeLoader.cpp: (WebCore::SubframeLoader::resourceWillUsePlugin): (WebCore::SubframeLoader::requestObject): (WebCore::SubframeLoader::shouldUsePlugin):
  • loader/SubframeLoader.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::objectContentType):
  • src/FrameLoaderClientImpl.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::objectContentType):
  • WebCoreSupport/FrameLoaderClientEfl.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::objectContentType):
  • WebCoreSupport/FrameLoaderClientGtk.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/FrameLoaderClientHaiku.cpp: (WebCore::FrameLoaderClientHaiku::objectContentType):
  • WebCoreSupport/FrameLoaderClientHaiku.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/WebFrameLoaderClient.h:
  • WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::objectContentType):

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::objectContentType):
  • WebCoreSupport/FrameLoaderClientQt.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebFrame.cpp: (WebFrame::objectContentType):
  • WebFrame.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebCoreSupport/FrameLoaderClientWinCE.cpp: (WebKit::FrameLoaderClientWinCE::objectContentType):
  • WebCoreSupport/FrameLoaderClientWinCE.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::objectContentType):
  • WebKitSupport/FrameLoaderClientWx.h:

2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r81916 and r81917.
http://trac.webkit.org/changeset/81916
http://trac.webkit.org/changeset/81917
https://bugs.webkit.org/show_bug.cgi?id=57071

broke a test on platforms that do not have QuickTime installed
(Requested by estes on #webkit).

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::objectContentType):
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
Location:
trunk
Files:
4 deleted
45 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r81929 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * fast/images/embed-image-plugins-disabled.html: Removed.
     12        * platform/mac/fast/images/embed-image-expected.checksum:
     13        * platform/mac/fast/images/embed-image-expected.png:
     14        * platform/mac/fast/images/embed-image-expected.txt:
     15        * platform/mac/fast/images/embed-image-plugins-disabled-expected.checksum: Removed.
     16        * platform/mac/fast/images/embed-image-plugins-disabled-expected.png: Removed.
     17        * platform/mac/fast/images/embed-image-plugins-disabled-expected.txt: Removed.
     18
    1192011-03-24  Vincent Scheib  <scheib@chromium.org>
    220
  • trunk/LayoutTests/platform/mac/fast/images/embed-image-expected.checksum

    r81916 r81933  
    1 f85b6c26e377cb0c2f3da7c3ead45a03
     1ad5bb30c7be3655a525d5f57f8731d58
  • trunk/LayoutTests/platform/mac/fast/images/embed-image-expected.txt

    r81916 r81933  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
     6      RenderImage {EMBED} at (0,0) size 38x24
    67      RenderText {#text} at (0,0) size 0x0
    7 layer at (8,8) size 38x24
    8   RenderEmbeddedObject {EMBED} at (0,0) size 38x24
  • trunk/Source/WebCore/ChangeLog

    r81932 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * html/HTMLEmbedElement.cpp:
     12        (WebCore::HTMLEmbedElement::HTMLEmbedElement):
     13        * html/HTMLObjectElement.cpp:
     14        (WebCore::HTMLObjectElement::HTMLObjectElement):
     15        (WebCore::HTMLObjectElement::parametersForPlugin):
     16        * html/HTMLPlugInImageElement.cpp:
     17        (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
     18        (WebCore::HTMLPlugInImageElement::isImageType):
     19        (WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
     20        * html/HTMLPlugInImageElement.h:
     21        * loader/EmptyClients.h:
     22        (WebCore::EmptyFrameLoaderClient::objectContentType):
     23        * loader/FrameLoader.cpp:
     24        (WebCore::FrameLoader::defaultObjectContentType):
     25        * loader/FrameLoader.h:
     26        * loader/FrameLoaderClient.h:
     27        * loader/SubframeLoader.cpp:
     28        (WebCore::SubframeLoader::resourceWillUsePlugin):
     29        (WebCore::SubframeLoader::requestObject):
     30        (WebCore::SubframeLoader::shouldUsePlugin):
     31        * loader/SubframeLoader.h:
     32
    1332011-03-24  Dimitri Glazkov  <dglazkov@chromium.org>
    234
  • trunk/Source/WebCore/html/HTMLEmbedElement.cpp

    r81916 r81933  
    33 *           (C) 1999 Antti Koivisto (koivisto@kde.org)
    44 *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
    5  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights reserved.
     5 * Copyright (C) 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights reserved.
    66 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    77 *
     
    4747
    4848inline HTMLEmbedElement::HTMLEmbedElement(const QualifiedName& tagName, Document* document, bool createdByParser)
    49     : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldPreferPlugInsForImages)
     49    : HTMLPlugInImageElement(tagName, document, createdByParser)
    5050{
    5151    ASSERT(hasTagName(embedTag));
  • trunk/Source/WebCore/html/HTMLObjectElement.cpp

    r81916 r81933  
    33 *           (C) 1999 Antti Koivisto (koivisto@kde.org)
    44 *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
    5  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
     5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    66 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    77 *
     
    4949
    5050inline HTMLObjectElement::HTMLObjectElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form, bool createdByParser)
    51     : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldNotPreferPlugInsForImages)
     51    : HTMLPlugInImageElement(tagName, document, createdByParser)
    5252    , FormAssociatedElement(form)
    5353    , m_docNamedItem(true)
     
    218218    if (url.isEmpty() && !urlParameter.isEmpty()) {
    219219        SubframeLoader* loader = document()->frame()->loader()->subframeLoader();
    220         if (loader->resourceWillUsePlugin(urlParameter, serviceType, shouldPreferPlugInsForImages()))
     220        if (loader->resourceWillUsePlugin(urlParameter, serviceType))
    221221            url = urlParameter;
    222222    }
  • trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

    r81916 r81933  
    11/*
    2  * Copyright (C) 2008, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2008 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
     
    2626#include "FrameLoaderClient.h"
    2727#include "HTMLImageLoader.h"
    28 #include "HTMLNames.h"
    2928#include "Image.h"
    3029#include "Page.h"
     
    3433namespace WebCore {
    3534
    36 HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document* document, bool createdByParser, PreferPlugInsForImagesOption preferPlugInsForImagesOption)
     35HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document* document, bool createdByParser)
    3736    : HTMLPlugInElement(tagName, document)
    3837    // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
     
    4140    // the same codepath in this class.
    4241    , m_needsWidgetUpdate(!createdByParser)
    43     , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
    4442{
    4543}
     
    6159    if (Frame* frame = document()->frame()) {
    6260        KURL completedURL = frame->loader()->completeURL(m_url);
    63         return frame->loader()->client()->objectContentType(completedURL, m_serviceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
     61        return frame->loader()->client()->objectContentType(completedURL, m_serviceType) == ObjectContentImage;
    6462    }
    6563
     
    102100        completedURL = frameLoader->completeURL(url);
    103101
    104     if (frameLoader->client()->objectContentType(completedURL, serviceType, shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin)
     102    if (frameLoader->client()->objectContentType(completedURL, serviceType) == ObjectContentNetscapePlugin)
    105103        return true;
    106104    return false;
  • trunk/Source/WebCore/html/HTMLPlugInImageElement.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
     
    3434    CreateOnlyNonNetscapePlugins,
    3535};
    36    
    37 enum PreferPlugInsForImagesOption {
    38     ShouldPreferPlugInsForImages,
    39     ShouldNotPreferPlugInsForImages
    40 };
    4136
    4237// Base class for HTMLObjectElement and HTMLEmbedElement
     
    4944    const String& serviceType() const { return m_serviceType; }
    5045    const String& url() const { return m_url; }
    51     bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }
    5246
    5347protected:
    54     HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser, PreferPlugInsForImagesOption);
     48    HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser);
    5549
    5650    bool isImageType();
     
    8276   
    8377    bool m_needsWidgetUpdate;
    84     bool m_shouldPreferPlugInsForImages;
    8578};
    8679
  • trunk/Source/WebCore/loader/EmptyClients.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Eric Seidel (eric@webkit.org)
    3  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
    44 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    55 *
     
    371371#endif
    372372
    373     virtual ObjectContentType objectContentType(const KURL&, const String&, bool) { return ObjectContentType(); }
     373    virtual ObjectContentType objectContentType(const KURL&, const String&) { return ObjectContentType(); }
    374374    virtual String overrideMediaType() const { return String(); }
    375375
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
     
    984984#endif // ENABLE(WEB_ARCHIVE)
    985985
    986 ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
     986ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const String& mimeTypeIn)
    987987{
    988988    String mimeType = mimeTypeIn;
     
    10011001        return ObjectContentFrame; // Go ahead and hope that we can display the content.
    10021002
     1003    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
     1004        return WebCore::ObjectContentImage;
     1005
    10031006#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL
    1004     bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
    1005 #else
    1006     bool plugInSupportsMIMEType = false;
     1007    if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType))
     1008        return WebCore::ObjectContentNetscapePlugin;
    10071009#endif
    1008 
    1009     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
    1010         return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? WebCore::ObjectContentNetscapePlugin : WebCore::ObjectContentImage;
    1011 
    1012     if (plugInSupportsMIMEType)
    1013         return WebCore::ObjectContentNetscapePlugin;
    10141010
    10151011    if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
  • trunk/Source/WebCore/loader/FrameLoader.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    44 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
     
    324324    bool suppressOpenerInNewFrame() const { return m_suppressOpenerInNewFrame; }
    325325
    326     static ObjectContentType defaultObjectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
     326    static ObjectContentType defaultObjectContentType(const KURL& url, const String& mimeType);
    327327
    328328    void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true);
  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    260260#endif
    261261
    262         virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages) = 0;
     262        virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0;
    263263        virtual String overrideMediaType() const = 0;
    264264
  • trunk/Source/WebCore/loader/SubframeLoader.cpp

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
     
    8989}
    9090   
    91 bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType, bool shouldPreferPlugInsForImages)
     91bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType)
    9292{
    9393    KURL completedURL;
    9494    if (!url.isEmpty())
    9595        completedURL = completeURL(url);
    96 
    9796    bool useFallback;
    98     return shouldUsePlugin(completedURL, mimeType, shouldPreferPlugInsForImages, false, useFallback);
    99 }
    100 
    101 bool SubframeLoader::requestPlugin(HTMLPlugInImageElement* ownerElement, const KURL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
    102 {
    103     Settings* settings = m_frame->settings();
    104     if ((!allowPlugins(AboutToInstantiatePlugin)
    105          // Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
    106          // as opposed to third-party code such as Flash. The user agent decides whether or not they are
    107          // permitted, rather than WebKit.
    108          && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType))
    109         || (!settings->isJavaEnabled() && MIMETypeRegistry::isJavaAppletMIMEType(mimeType)))
    110         return false;
    111 
    112     if (m_frame->document() && m_frame->document()->securityOrigin()->isSandboxed(SandboxPlugins))
    113         return false;
    114 
    115     ASSERT(ownerElement->hasTagName(objectTag) || ownerElement->hasTagName(embedTag));
    116     return loadPlugin(ownerElement, url, mimeType, paramNames, paramValues, useFallback);
    117 }
    118  
    119 bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const String& url, const AtomicString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
     97    return shouldUsePlugin(completedURL, mimeType, false, useFallback);
     98}
     99
     100bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const String& url, const AtomicString& frameName,
     101    const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
    120102{
    121103    if (url.isEmpty() && mimeType.isEmpty())
     
    133115
    134116    bool useFallback;
    135     if (shouldUsePlugin(completedURL, mimeType, ownerElement->shouldPreferPlugInsForImages(), renderer->hasFallbackContent(), useFallback))
    136         return requestPlugin(ownerElement, completedURL, mimeType, paramNames, paramValues, useFallback);
     117    if (shouldUsePlugin(completedURL, mimeType, renderer->hasFallbackContent(), useFallback)) {
     118        Settings* settings = m_frame->settings();
     119        if ((!allowPlugins(AboutToInstantiatePlugin)
     120             // Application plugins are plugins implemented by the user agent, for example Qt plugins,
     121             // as opposed to third-party code such as flash. The user agent decides whether or not they are
     122             // permitted, rather than WebKit.
     123             && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType))
     124            || (!settings->isJavaEnabled() && MIMETypeRegistry::isJavaAppletMIMEType(mimeType)))
     125            return false;
     126        if (m_frame->document() && m_frame->document()->securityOrigin()->isSandboxed(SandboxPlugins))
     127            return false;
     128
     129        ASSERT(ownerElement->hasTagName(objectTag) || ownerElement->hasTagName(embedTag));
     130        HTMLPlugInImageElement* pluginElement = static_cast<HTMLPlugInImageElement*>(ownerElement);
     131
     132        return loadPlugin(pluginElement, completedURL, mimeType, paramNames, paramValues, useFallback);
     133    }
    137134
    138135    // If the plug-in element already contains a subframe, loadOrRedirectSubframe will re-use it. Otherwise,
     
    293290}
    294291
    295 bool SubframeLoader::shouldUsePlugin(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages, bool hasFallback, bool& useFallback)
     292bool SubframeLoader::shouldUsePlugin(const KURL& url, const String& mimeType, bool hasFallback, bool& useFallback)
    296293{
    297294    if (m_frame->loader()->client()->shouldUsePluginDocument(mimeType)) {
     
    309306    }
    310307       
    311     ObjectContentType objectType = m_frame->loader()->client()->objectContentType(url, mimeType, shouldPreferPlugInsForImages);
     308    ObjectContentType objectType = m_frame->loader()->client()->objectContentType(url, mimeType);
    312309    // If an object's content can't be handled and it has no fallback, let
    313310    // it be handled as a plugin to show the broken plugin icon.
  • trunk/Source/WebCore/loader/SubframeLoader.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    44 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
     
    7878    bool containsPlugins() const { return m_containsPlugins; }
    7979   
    80     bool resourceWillUsePlugin(const String& url, const String& mimeType, bool shouldPreferPlugInsForImages);
     80    bool resourceWillUsePlugin(const String& url, const String& mimeType);
    8181
    8282private:
    83     bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
    8483    Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const AtomicString& frameName, bool lockHistory, bool lockBackForwardList);
    8584    Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer);
     
    8786        const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
    8887
    89     bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages, bool hasFallback, bool& useFallback);
     88    bool shouldUsePlugin(const KURL&, const String& mimeType, bool hasFallback, bool& useFallback);
    9089
    9190    Document* document() const;
  • trunk/Source/WebKit/chromium/ChangeLog

    r81930 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * src/FrameLoaderClientImpl.cpp:
     12        (WebKit::FrameLoaderClientImpl::objectContentType):
     13        * src/FrameLoaderClientImpl.h:
     14
    1152011-03-24  Min Qin  <qinmin@google.com>
    216
  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r81917 r81933  
    11/*
    22 * Copyright (C) 2009 Google Inc. All rights reserved.
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    14811480ObjectContentType FrameLoaderClientImpl::objectContentType(
    14821481    const KURL& url,
    1483     const String& explicitMimeType,
    1484     bool shouldPreferPlugInsForImages)
     1482    const String& explicitMimeType)
    14851483{
    14861484    // This code is based on Apple's implementation from
     
    15061504    }
    15071505
     1506    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
     1507        return ObjectContentImage;
     1508
    15081509    // If Chrome is started with the --disable-plugins switch, pluginData is 0.
    15091510    PluginData* pluginData = m_webFrame->frame()->page()->pluginData();
    1510     bool plugInSupportsMIMEType = pluginData && pluginData->supportsMimeType(mimeType);
    1511 
    1512     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
    1513         return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? ObjectContentNetscapePlugin : ObjectContentImage;
    1514 
    1515     if (plugInSupportsMIMEType)
     1511    if (pluginData && pluginData->supportsMimeType(mimeType))
    15161512        return ObjectContentNetscapePlugin;
    15171513
  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2009 Google Inc. All rights reserved.
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    199198        const Vector<WTF::String>& paramValues);
    200199    virtual WebCore::ObjectContentType objectContentType(
    201         const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     200        const WebCore::KURL& url, const WTF::String& mimeType);
    202201    virtual WTF::String overrideMediaType() const;
    203202    virtual void didPerformFirstNavigation() const;
  • trunk/Source/WebKit/efl/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     12        (WebCore::FrameLoaderClientEfl::objectContentType):
     13        * WebCoreSupport/FrameLoaderClientEfl.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    55 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
     
    400400}
    401401
    402 ObjectContentType FrameLoaderClientEfl::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
    403 {
    404     // FIXME: once plugin support is enabled, this method needs to correctly handle the 'shouldPreferPlugInsForImages' flag. See
    405     // WebCore::FrameLoader::defaultObjectContentType() for an example.
    406     UNUSED_PARAM(shouldPreferPlugInsForImages);
    407 
     402ObjectContentType FrameLoaderClientEfl::objectContentType(const KURL& url, const String& mimeType)
     403{
    408404    if (url.isEmpty() && mimeType.isEmpty())
    409405        return ObjectContentNone;
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
    55 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
     
    150150    virtual void registerForIconNotification(bool);
    151151
    152     virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
     152    virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
    153153
    154154    virtual void setMainFrameDocumentReady(bool);
  • trunk/Source/WebKit/gtk/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     12        (WebKit::FrameLoaderClient::objectContentType):
     13        * WebCoreSupport/FrameLoaderClientGtk.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r81916 r81933  
    77 *  Copyright (C) Research In Motion Limited 2009. All rights reserved.
    88 *  Copyright (C) 2010 Igalia S.L.
    9  *  Copyright (C) 2011 Apple Inc. All rights reserved.
    109 *
    1110 *  This library is free software; you can redistribute it and/or
     
    713712}
    714713
    715 ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
    716 {
    717     return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
     714ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType)
     715{
     716    return FrameLoader::defaultObjectContentType(url, mimeType);
    718717}
    719718
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
    55 *
     
    127127        virtual void registerForIconNotification(bool);
    128128
    129         virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     129        virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
    130130
    131131        virtual void setMainFrameDocumentReady(bool);
  • trunk/Source/WebKit/haiku/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/FrameLoaderClientHaiku.cpp:
     12        (WebCore::FrameLoaderClientHaiku::objectContentType):
     13        * WebCoreSupport/FrameLoaderClientHaiku.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp

    r81916 r81933  
    22 * Copyright (C) 2006 Don Gibson <dgibson77@gmail.com>
    33 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    4  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     4 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    55 * Copyright (C) 2007 Trolltech ASA
    66 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved.
     
    755755}
    756756
    757 ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
     757ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType)
    758758{
    759759    notImplemented();
  • trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved.
    55 *
     
    240240                                                          const Vector<String>& paramValues);
    241241
    242         virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
     242        virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
    243243        virtual String overrideMediaType() const;
    244244
  • trunk/Source/WebKit/mac/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/WebFrameLoaderClient.h:
     12        * WebCoreSupport/WebFrameLoaderClient.mm:
     13        (WebFrameLoaderClient::objectContentType):
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    217217#endif
    218218   
    219     virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     219    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
    220220    virtual WTF::String overrideMediaType() const;
    221221   
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    14551455}
    14561456
    1457 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
     1457ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeType)
    14581458{
    14591459    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     
    14921492        return ObjectContentFrame; // Go ahead and hope that we can display the content.
    14931493
     1494    if (MIMETypeRegistry::isSupportedImageMIMEType(type))
     1495        return ObjectContentImage;
     1496
    14941497    WebBasePluginPackage *package = [getWebView(m_webFrame.get()) _pluginForMIMEType:type];
    1495     ObjectContentType plugInType = ObjectContentNone;
    14961498    if (package) {
    14971499#if ENABLE(NETSCAPE_PLUGIN_API)
    14981500        if ([package isKindOfClass:[WebNetscapePluginPackage class]])
    1499             plugInType = ObjectContentNetscapePlugin;
    1500         else
     1501            return ObjectContentNetscapePlugin;
    15011502#endif
    1502         {
    1503             ASSERT([package isKindOfClass:[WebPluginPackage class]]);
    1504             plugInType = ObjectContentOtherPlugin;
    1505         }
    1506     }
    1507    
    1508     if (MIMETypeRegistry::isSupportedImageMIMEType(type))
    1509         return shouldPreferPlugInsForImages && plugInType != ObjectContentNone ? plugInType : ObjectContentImage;
    1510 
    1511     if (plugInType != ObjectContentNone)
    1512         return plugInType;
     1503        ASSERT([package isKindOfClass:[WebPluginPackage class]]);
     1504        return ObjectContentOtherPlugin;
     1505    }
    15131506
    15141507    if ([m_webFrame->_private->webFrameView _viewClassForMIMEType:type])
  • trunk/Source/WebKit/qt/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/FrameLoaderClientQt.cpp:
     12        (WebCore::FrameLoaderClientQt::objectContentType):
     13        * WebCoreSupport/FrameLoaderClientQt.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
    55 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
     
    13131313}
    13141314
    1315 ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
    1316 {
    1317 //    qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<mimeTypeIn;
     1315ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& _mimeType)
     1316{
     1317//    qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<_mimeType;
    13181318    QFileInfo fi(url.path());
    13191319    String extension = fi.suffix();
    1320     if (mimeTypeIn == "application/x-qt-plugin" || mimeTypeIn == "application/x-qt-styled-widget")
     1320    if (_mimeType == "application/x-qt-plugin" || _mimeType == "application/x-qt-styled-widget")
    13211321        return ObjectContentOtherPlugin;
    13221322
    1323     if (url.isEmpty() && !mimeTypeIn.length())
     1323    if (url.isEmpty() && !_mimeType.length())
    13241324        return ObjectContentNone;
    13251325
    1326     String mimeType = mimeTypeIn;
     1326    String mimeType = _mimeType;
    13271327    if (!mimeType.length())
    13281328        mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
     
    13341334        return ObjectContentFrame;
    13351335
    1336     ObjectContentType plugInType = ObjectContentNone;
     1336    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
     1337        return ObjectContentImage;
     1338
    13371339    if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType))
    1338         plugInType = ObjectContentNetscapePlugin;
    1339     else if (m_frame->page() && m_frame->page()->pluginData() && m_frame->page()->pluginData()->supportsMimeType(mimeType))
    1340         plugInType = ObjectContentOtherPlugin;
    1341        
    1342     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
    1343         return shouldPreferPlugInsForImages && plugInType != ObjectContentNone ? plugInType : ObjectContentImage;
    1344    
    1345     if (plugInType != ObjectContentNone)
    1346         return plugInType;
     1340        return ObjectContentNetscapePlugin;
     1341
     1342    if (m_frame->page() && m_frame->page()->pluginData() && m_frame->page()->pluginData()->supportsMimeType(mimeType))
     1343        return ObjectContentOtherPlugin;
    13471344
    13481345    if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
     3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
    44 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    55 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
     
    212212    virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
    213213
    214     virtual ObjectContentType objectContentType(const KURL&, const String& mimeTypeIn, bool shouldPreferPlugInsForImages);
     214    virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
    215215    virtual String overrideMediaType() const;
    216216
  • trunk/Source/WebKit/win/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebFrame.cpp:
     12        (WebFrame::objectContentType):
     13        * WebFrame.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/win/WebFrame.cpp

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
    44 *
     
    19001900}
    19011901
    1902 ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
    1903 {
    1904     return WebCore::FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
     1902ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType)
     1903{
     1904    return WebCore::FrameLoader::defaultObjectContentType(url, mimeType);
    19051905}
    19061906
  • trunk/Source/WebKit/win/WebFrame.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2006, 2007, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    342342    virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues);
    343343
    344     virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     344    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
    345345    virtual WTF::String overrideMediaType() const;
    346346
  • trunk/Source/WebKit/wince/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     12        (WebKit::FrameLoaderClientWinCE::objectContentType):
     13        * WebCoreSupport/FrameLoaderClientWinCE.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r81916 r81933  
    11/*
    22 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    184183}
    185184
    186 ObjectContentType FrameLoaderClientWinCE::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
    187 {
    188     return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
     185ObjectContentType FrameLoaderClientWinCE::objectContentType(const KURL& url, const String& mimeType)
     186{
     187    return FrameLoader::defaultObjectContentType(url, mimeType);
    189188}
    190189
  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    122121    virtual void registerForIconNotification(bool);
    123122
    124     virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     123    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
    125124
    126125    virtual void setMainFrameDocumentReady(bool);
  • trunk/Source/WebKit/wx/ChangeLog

    r81916 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebKitSupport/FrameLoaderClientWx.cpp:
     12        (WebCore::FrameLoaderClientWx::objectContentType):
     13        * WebKitSupport/FrameLoaderClientWx.h:
     14
    1152011-03-24  Andy Estes  <aestes@apple.com>
    216
  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r81916 r81933  
    11/*
    22 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * All rights reserved.
     
    872871}
    873872
    874 ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
     873ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType)
    875874{
    876875    notImplemented();
  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

    r81916 r81933  
    11/*
    22 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
    3  * Copyright (C) 2011 Apple Inc. All rights reserved.
    43 *
    54 * All rights reserved.
     
    219218        virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
    220219
    221         virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
     220        virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
    222221        virtual String overrideMediaType() const;
    223222
  • trunk/Source/WebKit2/ChangeLog

    r81928 r81933  
     12011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r81916 and r81917.
     4        http://trac.webkit.org/changeset/81916
     5        http://trac.webkit.org/changeset/81917
     6        https://bugs.webkit.org/show_bug.cgi?id=57071
     7
     8        broke a test on platforms that do not have QuickTime installed
     9        (Requested by estes on #webkit).
     10
     11        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     12        (WebKit::WebFrameLoaderClient::objectContentType):
     13        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     14
    1152011-03-24  Brady Eidson  <beidson@apple.com>
    216
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r81916 r81933  
    11/*
    2  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    12691269}
    12701270
    1271 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
     1271ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn)
    12721272{
    12731273    // FIXME: This should be merged with WebCore::FrameLoader::defaultObjectContentType when the plugin code
     
    12951295        return ObjectContentFrame;
    12961296
    1297     bool plugInSupportsMIMEType = false;
     1297    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
     1298        return WebCore::ObjectContentImage;
     1299
    12981300    if (WebPage* webPage = m_frame->page()) {
    12991301        if (PluginData* pluginData = webPage->corePage()->pluginData()) {
    13001302            if (pluginData->supportsMimeType(mimeType))
    1301                 plugInSupportsMIMEType = true;
     1303                return ObjectContentNetscapePlugin;
    13021304        }
    13031305    }
    1304    
    1305     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
    1306         return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? ObjectContentNetscapePlugin : ObjectContentImage;
    1307 
    1308     if (plugInSupportsMIMEType)
    1309         return ObjectContentNetscapePlugin;
    13101306
    13111307    if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r81916 r81933  
    11/*
    2  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    192192    virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
    193193   
    194     virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
     194    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const String& mimeType);
    195195    virtual String overrideMediaType() const;
    196196
Note: See TracChangeset for help on using the changeset viewer.