Changeset 224387 in webkit
- Timestamp:
- Nov 2, 2017 11:08:11 PM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r224386 r224387 1 2017-11-02 Maciej Stachowiak <mjs@apple.com> 2 3 Don't try to guess plugin MIME type from a file extension in a URL (no observable effect) 4 https://bugs.webkit.org/show_bug.cgi?id=178333 5 6 Reviewed by Darin Adler. 7 8 No test cases because I could not find an observable behavior difference, 9 even after trying many different plugin loading scenarios. 10 11 * html/HTMLPlugInImageElement.cpp: 12 (WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot): loadedMIMEType --> serviceType 13 (WebCore::HTMLPlugInImageElement::restartSimilarPlugIns): ditto 14 (WebCore::HTMLPlugInImageElement::userDidClickSnapshot): ditto 15 (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): ditto 16 * html/HTMLPlugInImageElement.h: 17 (WebCore::HTMLPlugInImageElement::loadedMimeType const): Deleted. This was the one call site 18 for mimeTypeFromURL, and is otherwise just a wrapper for SerciceType() 19 * platform/URL.cpp: 20 (WebCore::mimeTypeFromURL): Deleted. This was the only use of MIMETypeDatabase in URL. 21 * platform/URL.h: Removed declaration for mimeTypeFromURL. 22 * WebCore.order: Removed mimeTypeFromURL. 23 1 24 2017-11-02 Basuke Suzuki <Basuke.Suzuki@sony.com> 2 25 -
trunk/Source/WebCore/WebCore.order
r224277 r224387 15564 15564 __ZN7WebCore9InlineBox11extractLineEv 15565 15565 __ZN7WebCore9InlineBox10attachLineEv 15566 __ZN7WebCore15mimeTypeFromURLERKNS_4KURLE15567 15566 __ZN7WebCore22HTMLPlugInImageElement15setDisplayStateENS_17HTMLPlugInElement12DisplayStateE 15568 15567 __ZN7WebCore16HTMLQuoteElementD0Ev -
trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp
r224316 r224387 357 357 root.setResetStyleInheritance(true); 358 358 359 String mimeType = loadedMimeType();359 String mimeType = serviceType(); 360 360 361 361 auto& isolatedWorld = plugInImageElementIsolatedWorld(); … … 426 426 427 427 String plugInOrigin = m_loadedUrl.host(); 428 String mimeType = loadedMimeType();428 String mimeType = serviceType(); 429 429 Vector<Ref<HTMLPlugInImageElement>> similarPlugins; 430 430 … … 440 440 441 441 for (auto& element : descendantsOfType<HTMLPlugInImageElement>(*frame->document())) { 442 if (plugInOrigin == element.loadedUrl().host() && mimeType == element. loadedMimeType())442 if (plugInOrigin == element.loadedUrl().host() && mimeType == element.serviceType()) 443 443 similarPlugins.append(element); 444 444 } … … 461 461 String plugInOrigin = m_loadedUrl.host(); 462 462 if (document().page() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(document().page()->mainFrame().document()->baseURL().protocol().toStringWithoutCopying()) && document().page()->settings().autostartOriginPlugInSnapshottingEnabled()) 463 document().page()->plugInClient()->didStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), plugInOrigin, loadedMimeType(), document().page()->sessionID());463 document().page()->plugInClient()->didStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), plugInOrigin, serviceType(), document().page()->sessionID()); 464 464 465 465 LOG(Plugins, "%p User clicked on snapshotted plug-in. Restart.", this); … … 603 603 LOG(Plugins, "%p Plug-in URL: %s", this, m_url.utf8().data()); 604 604 LOG(Plugins, " Actual URL: %s", url.string().utf8().data()); 605 LOG(Plugins, " MIME type: %s", loadedMimeType().utf8().data());605 LOG(Plugins, " MIME type: %s", serviceType().utf8().data()); 606 606 607 607 m_loadedUrl = url; … … 665 665 } 666 666 667 if (document().page()->settings().autostartOriginPlugInSnapshottingEnabled() && document().page()->plugInClient() && document().page()->plugInClient()->shouldAutoStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), url.host(), loadedMimeType())) {667 if (document().page()->settings().autostartOriginPlugInSnapshottingEnabled() && document().page()->plugInClient() && document().page()->plugInClient()->shouldAutoStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), url.host(), serviceType())) { 668 668 LOG(Plugins, "%p Plug-in from (%s, %s) is marked to auto-start, set to play", this, document().page()->mainFrame().document()->baseURL().host().utf8().data(), url.host().utf8().data()); 669 669 m_snapshotDecision = NeverSnapshot; … … 671 671 } 672 672 673 if (m_loadedUrl.isEmpty() && ! loadedMimeType().isEmpty()) {674 LOG(Plugins, "%p Plug-in has no src URL but does have a valid mime type %s, set to play", this, loadedMimeType().utf8().data());673 if (m_loadedUrl.isEmpty() && !serviceType().isEmpty()) { 674 LOG(Plugins, "%p Plug-in has no src URL but does have a valid mime type %s, set to play", this, serviceType().utf8().data()); 675 675 m_snapshotDecision = MaySnapshotWhenContentIsSet; 676 676 return; -
trunk/Source/WebCore/html/HTMLPlugInImageElement.h
r224316 r224387 43 43 const String& url() const { return m_url; } 44 44 const URL& loadedUrl() const { return m_loadedUrl; } 45 46 String loadedMimeType() const47 {48 String mimeType = serviceType();49 if (mimeType.isEmpty())50 mimeType = mimeTypeFromURL(m_loadedUrl);51 return mimeType;52 }53 45 54 46 // Public for FrameView::addWidgetToUpdate() -
trunk/Source/WebCore/platform/URL.cpp
r223476 r224387 29 29 30 30 #include "DecodeEscapeSequences.h" 31 #include "MIMETypeRegistry.h"32 31 #include "TextEncoding.h" 33 32 #include "URLParser.h" … … 1322 1321 } 1323 1322 1324 String mimeTypeFromURL(const URL& url)1325 {1326 String decodedPath = decodeURLEscapeSequences(url.path());1327 String extension = decodedPath.substring(decodedPath.reverseFind('.') + 1);1328 1329 // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure1330 return MIMETypeRegistry::getMIMETypeForExtension(extension);1331 }1332 1333 1323 String URL::stringCenterEllipsizedToLength(unsigned length) const 1334 1324 { -
trunk/Source/WebCore/platform/URL.h
r223446 r224387 340 340 341 341 String mimeTypeFromDataURL(const String& url); 342 WEBCORE_EXPORT String mimeTypeFromURL(const URL&);343 342 344 343 // Unescapes the given string using URL escaping rules, given an optional -
trunk/Source/WebKit/ChangeLog
r224379 r224387 1 2017-11-02 Maciej Stachowiak <mjs@apple.com> 2 3 Don't try to guess plugin MIME type from a file extension in a URL (no observable effect) 4 https://bugs.webkit.org/show_bug.cgi?id=178333 5 6 Reviewed by Darin Adler. 7 8 * WebProcess/Plugins/PluginView.cpp: 9 (WebKit::PluginView::pluginDidReceiveUserInteraction): loadedMIMEType --> serviceType 10 * WebProcess/WebPage/WebPage.cpp: 11 (WebKit::WebPage::determinePrimarySnapshottedPlugIn): ditto 12 1 13 2017-11-02 Brady Eidson <beidson@apple.com> 2 14 -
trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp
r224373 r224387 1839 1839 String pageOrigin = plugInImageElement.document().page()->mainFrame().document()->baseURL().host(); 1840 1840 String pluginOrigin = plugInImageElement.loadedUrl().host(); 1841 String mimeType = plugInImageElement. loadedMimeType();1841 String mimeType = plugInImageElement.serviceType(); 1842 1842 1843 1843 WebProcess::singleton().plugInDidReceiveUserInteraction(pageOrigin, pluginOrigin, mimeType, plugInImageElement.document().page()->sessionID()); -
trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp
r224238 r224387 5251 5251 m_primaryPlugInPageOrigin = m_page->mainFrame().document()->baseURL().host(); 5252 5252 m_primaryPlugInOrigin = candidatePlugIn->loadedUrl().host(); 5253 m_primaryPlugInMimeType = candidatePlugIn-> loadedMimeType();5253 m_primaryPlugInMimeType = candidatePlugIn->serviceType(); 5254 5254 5255 5255 candidatePlugIn->setIsPrimarySnapshottedPlugIn(true); -
trunk/Source/WebKitLegacy/win/ChangeLog
r224373 r224387 1 2017-11-02 Maciej Stachowiak <mjs@apple.com> 2 3 Don't try to guess plugin MIME type from a file extension in a URL (no observable effect) 4 https://bugs.webkit.org/show_bug.cgi?id=178333 5 6 Reviewed by Darin Adler. 7 8 * WebCoreSupport/WebFrameLoaderClient.cpp: 9 (WebFrameLoaderClient::objectContentType): Remove unnecessary call to mimeTypeFromURL 10 1 11 2017-11-02 Alex Christensen <achristensen@webkit.org> 2 12 -
trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp
r223981 r224387 1055 1055 String mimeType = mimeTypeIn; 1056 1056 1057 if (mimeType.isEmpty())1058 mimeType = mimeTypeFromURL(url);1059 1060 1057 if (mimeType.isEmpty()) { 1061 1058 String decodedPath = decodeURLEscapeSequences(url.path());
Note: See TracChangeset
for help on using the changeset viewer.