Changeset 81933 in webkit
- Timestamp:
- Mar 24, 2011 7:54:18 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 45 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r81929 r81933 1 2011-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 1 19 2011-03-24 Vincent Scheib <scheib@chromium.org> 2 20 -
trunk/LayoutTests/platform/mac/fast/images/embed-image-expected.checksum
r81916 r81933 1 f85b6c26e377cb0c2f3da7c3ead45a03 1 ad5bb30c7be3655a525d5f57f8731d58 -
trunk/LayoutTests/platform/mac/fast/images/embed-image-expected.txt
r81916 r81933 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 5 RenderBody {BODY} at (8,8) size 784x584 6 RenderImage {EMBED} at (0,0) size 38x24 6 7 RenderText {#text} at (0,0) size 0x0 7 layer at (8,8) size 38x248 RenderEmbeddedObject {EMBED} at (0,0) size 38x24 -
trunk/Source/WebCore/ChangeLog
r81932 r81933 1 2011-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 1 33 2011-03-24 Dimitri Glazkov <dglazkov@chromium.org> 2 34 -
trunk/Source/WebCore/html/HTMLEmbedElement.cpp
r81916 r81933 3 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 4 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009 , 2011Apple Inc. All rights reserved.5 * Copyright (C) 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 7 * … … 47 47 48 48 inline HTMLEmbedElement::HTMLEmbedElement(const QualifiedName& tagName, Document* document, bool createdByParser) 49 : HTMLPlugInImageElement(tagName, document, createdByParser , ShouldPreferPlugInsForImages)49 : HTMLPlugInImageElement(tagName, document, createdByParser) 50 50 { 51 51 ASSERT(hasTagName(embedTag)); -
trunk/Source/WebCore/html/HTMLObjectElement.cpp
r81916 r81933 3 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 4 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 , 2011Apple Inc. All rights reserved.5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 7 * … … 49 49 50 50 inline HTMLObjectElement::HTMLObjectElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form, bool createdByParser) 51 : HTMLPlugInImageElement(tagName, document, createdByParser , ShouldNotPreferPlugInsForImages)51 : HTMLPlugInImageElement(tagName, document, createdByParser) 52 52 , FormAssociatedElement(form) 53 53 , m_docNamedItem(true) … … 218 218 if (url.isEmpty() && !urlParameter.isEmpty()) { 219 219 SubframeLoader* loader = document()->frame()->loader()->subframeLoader(); 220 if (loader->resourceWillUsePlugin(urlParameter, serviceType , shouldPreferPlugInsForImages()))220 if (loader->resourceWillUsePlugin(urlParameter, serviceType)) 221 221 url = urlParameter; 222 222 } -
trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp
r81916 r81933 1 1 /* 2 * Copyright (C) 2008 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2008 Apple Inc. All rights reserved. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 26 26 #include "FrameLoaderClient.h" 27 27 #include "HTMLImageLoader.h" 28 #include "HTMLNames.h"29 28 #include "Image.h" 30 29 #include "Page.h" … … 34 33 namespace WebCore { 35 34 36 HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document* document, bool createdByParser , PreferPlugInsForImagesOption preferPlugInsForImagesOption)35 HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document* document, bool createdByParser) 37 36 : HTMLPlugInElement(tagName, document) 38 37 // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay … … 41 40 // the same codepath in this class. 42 41 , m_needsWidgetUpdate(!createdByParser) 43 , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)44 42 { 45 43 } … … 61 59 if (Frame* frame = document()->frame()) { 62 60 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; 64 62 } 65 63 … … 102 100 completedURL = frameLoader->completeURL(url); 103 101 104 if (frameLoader->client()->objectContentType(completedURL, serviceType , shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin)102 if (frameLoader->client()->objectContentType(completedURL, serviceType) == ObjectContentNetscapePlugin) 105 103 return true; 106 104 return false; -
trunk/Source/WebCore/html/HTMLPlugInImageElement.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2008, 2009 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 34 34 CreateOnlyNonNetscapePlugins, 35 35 }; 36 37 enum PreferPlugInsForImagesOption {38 ShouldPreferPlugInsForImages,39 ShouldNotPreferPlugInsForImages40 };41 36 42 37 // Base class for HTMLObjectElement and HTMLEmbedElement … … 49 44 const String& serviceType() const { return m_serviceType; } 50 45 const String& url() const { return m_url; } 51 bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }52 46 53 47 protected: 54 HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser , PreferPlugInsForImagesOption);48 HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser); 55 49 56 50 bool isImageType(); … … 82 76 83 77 bool m_needsWidgetUpdate; 84 bool m_shouldPreferPlugInsForImages;85 78 }; 86 79 -
trunk/Source/WebCore/loader/EmptyClients.h
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2006 Eric Seidel (eric@webkit.org) 3 * Copyright (C) 2008, 2009, 2010 , 2011Apple Inc. All rights reserved.3 * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved. 4 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 5 5 * … … 371 371 #endif 372 372 373 virtual ObjectContentType objectContentType(const KURL&, const String& , bool) { return ObjectContentType(); }373 virtual ObjectContentType objectContentType(const KURL&, const String&) { return ObjectContentType(); } 374 374 virtual String overrideMediaType() const { return String(); } 375 375 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) … … 984 984 #endif // ENABLE(WEB_ARCHIVE) 985 985 986 ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const String& mimeTypeIn , bool shouldPreferPlugInsForImages)986 ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const String& mimeTypeIn) 987 987 { 988 988 String mimeType = mimeTypeIn; … … 1001 1001 return ObjectContentFrame; // Go ahead and hope that we can display the content. 1002 1002 1003 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) 1004 return WebCore::ObjectContentImage; 1005 1003 1006 #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; 1007 1009 #endif 1008 1009 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))1010 return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? WebCore::ObjectContentNetscapePlugin : WebCore::ObjectContentImage;1011 1012 if (plugInSupportsMIMEType)1013 return WebCore::ObjectContentNetscapePlugin;1014 1010 1015 1011 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) -
trunk/Source/WebCore/loader/FrameLoader.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 4 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. … … 324 324 bool suppressOpenerInNewFrame() const { return m_suppressOpenerInNewFrame; } 325 325 326 static ObjectContentType defaultObjectContentType(const KURL& , const String& mimeType, bool shouldPreferPlugInsForImages);326 static ObjectContentType defaultObjectContentType(const KURL& url, const String& mimeType); 327 327 328 328 void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true); -
trunk/Source/WebCore/loader/FrameLoaderClient.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 260 260 #endif 261 261 262 virtual ObjectContentType objectContentType(const KURL& , const String& mimeType, bool shouldPreferPlugInsForImages) = 0;262 virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0; 263 263 virtual String overrideMediaType() const = 0; 264 264 -
trunk/Source/WebCore/loader/SubframeLoader.cpp
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) … … 89 89 } 90 90 91 bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType , bool shouldPreferPlugInsForImages)91 bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType) 92 92 { 93 93 KURL completedURL; 94 94 if (!url.isEmpty()) 95 95 completedURL = completeURL(url); 96 97 96 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 100 bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const String& url, const AtomicString& frameName, 101 const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) 120 102 { 121 103 if (url.isEmpty() && mimeType.isEmpty()) … … 133 115 134 116 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 } 137 134 138 135 // If the plug-in element already contains a subframe, loadOrRedirectSubframe will re-use it. Otherwise, … … 293 290 } 294 291 295 bool SubframeLoader::shouldUsePlugin(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages, boolhasFallback, bool& useFallback)292 bool SubframeLoader::shouldUsePlugin(const KURL& url, const String& mimeType, bool hasFallback, bool& useFallback) 296 293 { 297 294 if (m_frame->loader()->client()->shouldUsePluginDocument(mimeType)) { … … 309 306 } 310 307 311 ObjectContentType objectType = m_frame->loader()->client()->objectContentType(url, mimeType , shouldPreferPlugInsForImages);308 ObjectContentType objectType = m_frame->loader()->client()->objectContentType(url, mimeType); 312 309 // If an object's content can't be handled and it has no fallback, let 313 310 // it be handled as a plugin to show the broken plugin icon. -
trunk/Source/WebCore/loader/SubframeLoader.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 4 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. … … 78 78 bool containsPlugins() const { return m_containsPlugins; } 79 79 80 bool resourceWillUsePlugin(const String& url, const String& mimeType , bool shouldPreferPlugInsForImages);80 bool resourceWillUsePlugin(const String& url, const String& mimeType); 81 81 82 82 private: 83 bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);84 83 Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const AtomicString& frameName, bool lockHistory, bool lockBackForwardList); 85 84 Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer); … … 87 86 const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback); 88 87 89 bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages, boolhasFallback, bool& useFallback);88 bool shouldUsePlugin(const KURL&, const String& mimeType, bool hasFallback, bool& useFallback); 90 89 91 90 Document* document() const; -
trunk/Source/WebKit/chromium/ChangeLog
r81930 r81933 1 2011-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 1 15 2011-03-24 Min Qin <qinmin@google.com> 2 16 -
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r81917 r81933 1 1 /* 2 2 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 1481 1480 ObjectContentType FrameLoaderClientImpl::objectContentType( 1482 1481 const KURL& url, 1483 const String& explicitMimeType, 1484 bool shouldPreferPlugInsForImages) 1482 const String& explicitMimeType) 1485 1483 { 1486 1484 // This code is based on Apple's implementation from … … 1506 1504 } 1507 1505 1506 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) 1507 return ObjectContentImage; 1508 1508 1509 // If Chrome is started with the --disable-plugins switch, pluginData is 0. 1509 1510 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)) 1516 1512 return ObjectContentNetscapePlugin; 1517 1513 -
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 199 198 const Vector<WTF::String>& paramValues); 200 199 virtual WebCore::ObjectContentType objectContentType( 201 const WebCore::KURL& , const WTF::String& mimeType, bool shouldPreferPlugInsForImages);200 const WebCore::KURL& url, const WTF::String& mimeType); 202 201 virtual WTF::String overrideMediaType() const; 203 202 virtual void didPerformFirstNavigation() const; -
trunk/Source/WebKit/efl/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 5 5 * Copyright (C) 2008 Collabora Ltd. All rights reserved. … … 400 400 } 401 401 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 402 ObjectContentType FrameLoaderClientEfl::objectContentType(const KURL& url, const String& mimeType) 403 { 408 404 if (url.isEmpty() && mimeType.isEmpty()) 409 405 return ObjectContentNone; -
trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 5 5 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia … … 150 150 virtual void registerForIconNotification(bool); 151 151 152 virtual ObjectContentType objectContentType(const KURL& , const String& mimeType, bool shouldPreferPlugInsForImages);152 virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); 153 153 154 154 virtual void setMainFrameDocumentReady(bool); -
trunk/Source/WebKit/gtk/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r81916 r81933 7 7 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 8 * Copyright (C) 2010 Igalia S.L. 9 * Copyright (C) 2011 Apple Inc. All rights reserved.10 9 * 11 10 * This library is free software; you can redistribute it and/or … … 713 712 } 714 713 715 ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)716 { 717 return FrameLoader::defaultObjectContentType(url, mimeType , shouldPreferPlugInsForImages);714 ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType) 715 { 716 return FrameLoader::defaultObjectContentType(url, mimeType); 718 717 } 719 718 -
trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 5 5 * … … 127 127 virtual void registerForIconNotification(bool); 128 128 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); 130 130 131 131 virtual void setMainFrameDocumentReady(bool); -
trunk/Source/WebKit/haiku/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
r81916 r81933 2 2 * Copyright (C) 2006 Don Gibson <dgibson77@gmail.com> 3 3 * 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. 5 5 * Copyright (C) 2007 Trolltech ASA 6 6 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved. … … 755 755 } 756 756 757 ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)757 ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType) 758 758 { 759 759 notImplemented(); -
trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved. 5 5 * … … 240 240 const Vector<String>& paramValues); 241 241 242 virtual ObjectContentType objectContentType(const KURL& , const String& mimeType, bool shouldPreferPlugInsForImages);242 virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); 243 243 virtual String overrideMediaType() const; 244 244 -
trunk/Source/WebKit/mac/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 217 217 #endif 218 218 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); 220 220 virtual WTF::String overrideMediaType() const; 221 221 -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 1455 1455 } 1456 1456 1457 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)1457 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeType) 1458 1458 { 1459 1459 BEGIN_BLOCK_OBJC_EXCEPTIONS; … … 1492 1492 return ObjectContentFrame; // Go ahead and hope that we can display the content. 1493 1493 1494 if (MIMETypeRegistry::isSupportedImageMIMEType(type)) 1495 return ObjectContentImage; 1496 1494 1497 WebBasePluginPackage *package = [getWebView(m_webFrame.get()) _pluginForMIMEType:type]; 1495 ObjectContentType plugInType = ObjectContentNone;1496 1498 if (package) { 1497 1499 #if ENABLE(NETSCAPE_PLUGIN_API) 1498 1500 if ([package isKindOfClass:[WebNetscapePluginPackage class]]) 1499 plugInType = ObjectContentNetscapePlugin; 1500 else 1501 return ObjectContentNetscapePlugin; 1501 1502 #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 } 1513 1506 1514 1507 if ([m_webFrame->_private->webFrameView _viewClassForMIMEType:type]) -
trunk/Source/WebKit/qt/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) 5 5 * Copyright (C) 2008 Collabora Ltd. All rights reserved. … … 1313 1313 } 1314 1314 1315 ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)1316 { 1317 // qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<< mimeTypeIn;1315 ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& _mimeType) 1316 { 1317 // qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<_mimeType; 1318 1318 QFileInfo fi(url.path()); 1319 1319 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") 1321 1321 return ObjectContentOtherPlugin; 1322 1322 1323 if (url.isEmpty() && ! mimeTypeIn.length())1323 if (url.isEmpty() && !_mimeType.length()) 1324 1324 return ObjectContentNone; 1325 1325 1326 String mimeType = mimeTypeIn;1326 String mimeType = _mimeType; 1327 1327 if (!mimeType.length()) 1328 1328 mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension); … … 1334 1334 return ObjectContentFrame; 1335 1335 1336 ObjectContentType plugInType = ObjectContentNone; 1336 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) 1337 return ObjectContentImage; 1338 1337 1339 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; 1347 1344 1348 1345 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) -
trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
r81916 r81933 1 1 /* 2 2 * 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. 4 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 5 5 * Copyright (C) 2008 Collabora Ltd. All rights reserved. … … 212 212 virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); 213 213 214 virtual ObjectContentType objectContentType(const KURL& , const String& mimeTypeIn, bool shouldPreferPlugInsForImages);214 virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); 215 215 virtual String overrideMediaType() const; 216 216 -
trunk/Source/WebKit/win/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/win/WebFrame.cpp
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 3 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 4 * … … 1900 1900 } 1901 1901 1902 ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)1903 { 1904 return WebCore::FrameLoader::defaultObjectContentType(url, mimeType , shouldPreferPlugInsForImages);1902 ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType) 1903 { 1904 return WebCore::FrameLoader::defaultObjectContentType(url, mimeType); 1905 1905 } 1906 1906 -
trunk/Source/WebKit/win/WebFrame.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2006, 2007 , 2011 Apple Inc.All rights reserved.2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 342 342 virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues); 343 343 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); 345 345 virtual WTF::String overrideMediaType() const; 346 346 -
trunk/Source/WebKit/wince/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 184 183 } 185 184 186 ObjectContentType FrameLoaderClientWinCE::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)187 { 188 return FrameLoader::defaultObjectContentType(url, mimeType , shouldPreferPlugInsForImages);185 ObjectContentType FrameLoaderClientWinCE::objectContentType(const KURL& url, const String& mimeType) 186 { 187 return FrameLoader::defaultObjectContentType(url, mimeType); 189 188 } 190 189 -
trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 122 121 virtual void registerForIconNotification(bool); 123 122 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); 125 124 126 125 virtual void setMainFrameDocumentReady(bool); -
trunk/Source/WebKit/wx/ChangeLog
r81916 r81933 1 2011-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 1 15 2011-03-24 Andy Estes <aestes@apple.com> 2 16 -
trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * All rights reserved. … … 872 871 } 873 872 874 ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType , bool shouldPreferPlugInsForImages)873 ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType) 875 874 { 876 875 notImplemented(); -
trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
r81916 r81933 1 1 /* 2 2 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> 3 * Copyright (C) 2011 Apple Inc. All rights reserved.4 3 * 5 4 * All rights reserved. … … 219 218 virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); 220 219 221 virtual ObjectContentType objectContentType(const KURL& , const String& mimeType, bool shouldPreferPlugInsForImages);220 virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); 222 221 virtual String overrideMediaType() const; 223 222 -
trunk/Source/WebKit2/ChangeLog
r81928 r81933 1 2011-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 1 15 2011-03-24 Brady Eidson <beidson@apple.com> 2 16 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r81916 r81933 1 1 /* 2 * Copyright (C) 2010 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 1269 1269 } 1270 1270 1271 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn , bool shouldPreferPlugInsForImages)1271 ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn) 1272 1272 { 1273 1273 // FIXME: This should be merged with WebCore::FrameLoader::defaultObjectContentType when the plugin code … … 1295 1295 return ObjectContentFrame; 1296 1296 1297 bool plugInSupportsMIMEType = false; 1297 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) 1298 return WebCore::ObjectContentImage; 1299 1298 1300 if (WebPage* webPage = m_frame->page()) { 1299 1301 if (PluginData* pluginData = webPage->corePage()->pluginData()) { 1300 1302 if (pluginData->supportsMimeType(mimeType)) 1301 plugInSupportsMIMEType = true;1303 return ObjectContentNetscapePlugin; 1302 1304 } 1303 1305 } 1304 1305 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))1306 return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? ObjectContentNetscapePlugin : ObjectContentImage;1307 1308 if (plugInSupportsMIMEType)1309 return ObjectContentNetscapePlugin;1310 1306 1311 1307 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
r81916 r81933 1 1 /* 2 * Copyright (C) 2010 , 2011Apple Inc. All rights reserved.2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 192 192 virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); 193 193 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); 195 195 virtual String overrideMediaType() const; 196 196
Note: See TracChangeset
for help on using the changeset viewer.