<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207484] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207484">207484</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-18 13:31:07 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207443">r207443</a>.
https://bugs.webkit.org/show_bug.cgi?id=163616
"Caused 5% PLT regression" (Requested by krollin on #webkit).
Reverted changeset:
"Crash in ASCIICaseInsensitiveHash::hash() when a response has
a null MIME type"
https://bugs.webkit.org/show_bug.cgi?id=163476
http://trac.webkit.org/changeset/207443</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaLoadDataWithNilMIMETypemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-18 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207443.
+ https://bugs.webkit.org/show_bug.cgi?id=163616
+
+ "Caused 5% PLT regression" (Requested by krollin on #webkit).
+
+ Reverted changeset:
+
+ "Crash in ASCIICaseInsensitiveHash::hash() when a response has
+ a null MIME type"
+ https://bugs.webkit.org/show_bug.cgi?id=163476
+ http://trac.webkit.org/changeset/207443
+
</ins><span class="cx"> 2016-10-18 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build for platforms where HAVE(LINK_PREVIEW) is false
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -1294,9 +1294,8 @@
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame*)
</span><span class="cx"> {
</span><del>- auto& coreFrame = *m_frame->coreFrame();
- const ResourceResponse& response = coreFrame.loader().documentLoader()->response();
- m_frameHasCustomContentProvider = m_frame->isMainFrame() && m_frame->page()->shouldUseCustomContentProviderForResponse(response, coreFrame);
</del><ins>+ const ResourceResponse& response = m_frame->coreFrame()->loader().documentLoader()->response();
+ m_frameHasCustomContentProvider = m_frame->isMainFrame() && m_frame->page()->shouldUseCustomContentProviderForResponse(response);
</ins><span class="cx"> m_frameCameFromPageCache = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1311,51 +1310,49 @@
</span><span class="cx"> bool shouldDisableScrolling = isMainFrame && !webPage->mainFrameIsScrollable();
</span><span class="cx"> bool shouldHideScrollbars = shouldDisableScrolling;
</span><span class="cx"> IntRect fixedVisibleContentRect;
</span><del>- auto& coreFrame = *m_frame->coreFrame();
</del><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>- if (FrameView* frameView = coreFrame.view())
- fixedVisibleContentRect = frameView->fixedVisibleContentRect();
</del><ins>+ if (m_frame->coreFrame()->view())
+ fixedVisibleContentRect = m_frame->coreFrame()->view()->fixedVisibleContentRect();
</ins><span class="cx"> if (shouldUseFixedLayout)
</span><span class="cx"> shouldHideScrollbars = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- const ResourceResponse& response = coreFrame.loader().documentLoader()->response();
- m_frameHasCustomContentProvider = isMainFrame && webPage->shouldUseCustomContentProviderForResponse(response, coreFrame);
</del><ins>+ const ResourceResponse& response = m_frame->coreFrame()->loader().documentLoader()->response();
+ m_frameHasCustomContentProvider = isMainFrame && webPage->shouldUseCustomContentProviderForResponse(response);
</ins><span class="cx"> m_frameCameFromPageCache = false;
</span><span class="cx">
</span><span class="cx"> ScrollbarMode defaultScrollbarMode = shouldHideScrollbars ? ScrollbarAlwaysOff : ScrollbarAuto;
</span><span class="cx">
</span><del>- coreFrame.createView(webPage->size(), backgroundColor, isTransparent,
</del><ins>+ m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
</ins><span class="cx"> webPage->fixedLayoutSize(), fixedVisibleContentRect, shouldUseFixedLayout,
</span><span class="cx"> defaultScrollbarMode, /* lock */ shouldHideScrollbars, defaultScrollbarMode, /* lock */ shouldHideScrollbars);
</span><span class="cx">
</span><del>- FrameView* frameView = coreFrame.view();
</del><span class="cx"> if (int minimumLayoutWidth = webPage->minimumLayoutSize().width()) {
</span><span class="cx"> int minimumLayoutHeight = std::max(webPage->minimumLayoutSize().height(), 1);
</span><span class="cx"> int maximumSize = std::numeric_limits<int>::max();
</span><del>- frameView->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
</del><ins>+ m_frame->coreFrame()->view()->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
</ins><span class="cx">
</span><span class="cx"> if (webPage->autoSizingShouldExpandToViewHeight())
</span><del>- frameView->setAutoSizeFixedMinimumHeight(webPage->size().height());
</del><ins>+ m_frame->coreFrame()->view()->setAutoSizeFixedMinimumHeight(webPage->size().height());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- frameView->setProhibitsScrolling(shouldDisableScrolling);
- frameView->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
</del><ins>+ m_frame->coreFrame()->view()->setProhibitsScrolling(shouldDisableScrolling);
+ m_frame->coreFrame()->view()->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- frameView->setViewExposedRect(webPage->drawingArea()->viewExposedRect());
</del><ins>+ m_frame->coreFrame()->view()->setViewExposedRect(webPage->drawingArea()->viewExposedRect());
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- frameView->setDelegatesScrolling(true);
</del><ins>+ m_frame->coreFrame()->view()->setDelegatesScrolling(true);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (webPage->scrollPinningBehavior() != DoNotPin)
</span><del>- frameView->setScrollPinningBehavior(webPage->scrollPinningBehavior());
</del><ins>+ m_frame->coreFrame()->view()->setScrollPinningBehavior(webPage->scrollPinningBehavior());
</ins><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> if (shouldUseFixedLayout) {
</span><del>- frameView->setDelegatesScrolling(shouldUseFixedLayout);
- frameView->setPaintsEntireContents(shouldUseFixedLayout);
</del><ins>+ m_frame->coreFrame()->view()->setDelegatesScrolling(shouldUseFixedLayout);
+ m_frame->coreFrame()->view()->setPaintsEntireContents(shouldUseFixedLayout);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -4577,12 +4577,11 @@
</span><span class="cx"> frameView->setScrollingPerformanceLoggingEnabled(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPage::canPluginHandleResponse(const ResourceResponse& response, const Frame& mainFrame)
</del><ins>+bool WebPage::canPluginHandleResponse(const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- ASSERT(mainFrame.isMainFrame());
</del><span class="cx"> uint32_t pluginLoadPolicy;
</span><del>- bool allowOnlyApplicationPlugins = !mainFrame.loader().subframeLoader().allowPlugins();
</del><ins>+ bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins();
</ins><span class="cx">
</span><span class="cx"> uint64_t pluginProcessToken;
</span><span class="cx"> String newMIMEType;
</span><span class="lines">@@ -4594,19 +4593,14 @@
</span><span class="cx"> return !isBlockedPlugin && pluginProcessToken;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(response);
</span><del>- UNUSED_PARAM(mainFrame);
</del><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPage::shouldUseCustomContentProviderForResponse(const ResourceResponse& response, const Frame& mainFrame)
</del><ins>+bool WebPage::shouldUseCustomContentProviderForResponse(const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> // If a plug-in exists that claims to support this response, it should take precedence over the custom content provider.
</span><del>- if (canPluginHandleResponse(response, mainFrame))
- return false;
-
- auto& mimeType = response.mimeType();
- return mimeType.isNull() ? false : m_mimeTypesWithCustomContentProviders.contains(mimeType);
</del><ins>+ return m_mimeTypesWithCustomContentProviders.contains(response.mimeType()) && !canPluginHandleResponse(response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -5031,7 +5025,7 @@
</span><span class="cx"> if (MIMETypeRegistry::canShowMIMEType(MIMEType))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!MIMEType.isNull() && m_mimeTypesWithCustomContentProviders.contains(MIMEType))
</del><ins>+ if (m_mimeTypesWithCustomContentProviders.contains(MIMEType))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> const PluginData& pluginData = m_page->pluginData();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -844,7 +844,8 @@
</span><span class="cx"> uint64_t nativeWindowHandle() { return m_nativeWindowHandle; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldUseCustomContentProviderForResponse(const WebCore::ResourceResponse&, const WebCore::Frame& mainFrame);
</del><ins>+ bool shouldUseCustomContentProviderForResponse(const WebCore::ResourceResponse&);
+ bool canPluginHandleResponse(const WebCore::ResourceResponse& response);
</ins><span class="cx">
</span><span class="cx"> bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
</span><span class="cx"> void setAsynchronousPluginInitializationEnabled(bool enabled) { m_asynchronousPluginInitializationEnabled = enabled; }
</span><span class="lines">@@ -1226,8 +1227,6 @@
</span><span class="cx"> void setResourceCachingDisabled(bool);
</span><span class="cx"> void setUserInterfaceLayoutDirection(uint32_t);
</span><span class="cx">
</span><del>- bool canPluginHandleResponse(const WebCore::ResourceResponse&, const WebCore::Frame& mainFrame);
-
</del><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::Page> m_page;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Tools/ChangeLog 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-18 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207443.
+ https://bugs.webkit.org/show_bug.cgi?id=163616
+
+ "Caused 5% PLT regression" (Requested by krollin on #webkit).
+
+ Reverted changeset:
+
+ "Crash in ASCIICaseInsensitiveHash::hash() when a response has
+ a null MIME type"
+ https://bugs.webkit.org/show_bug.cgi?id=163476
+ http://trac.webkit.org/changeset/207443
+
</ins><span class="cx"> 2016-10-18 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Resolve constraints and enumerate devices in the UI process
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -425,7 +425,6 @@
</span><span class="cx"> 9B4F8FA7159D52DD002D9F94 /* HTMLCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */; };
</span><span class="cx"> 9C64DC321D76198A004B598E /* YouTubePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */; };
</span><span class="cx"> A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */; };
</span><del>- A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */ = {isa = PBXBuildFile; fileRef = A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */; };
</del><span class="cx"> A13EBBAA1B87428D00097110 /* WebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBA91B87428D00097110 /* WebProcessPlugIn.mm */; };
</span><span class="cx"> A13EBBAB1B87434600097110 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
</span><span class="cx"> A13EBBB01B87436F00097110 /* BundleParametersPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBAE1B87436F00097110 /* BundleParametersPlugIn.mm */; };
</span><span class="lines">@@ -1055,7 +1054,6 @@
</span><span class="cx"> 9B79164F1BD89D0D00D50B8F /* FirstResponderScrollingPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FirstResponderScrollingPosition.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubePluginReplacement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFiltering.mm; sourceTree = "<group>"; };
</span><del>- A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoadDataWithNilMIMEType.mm; sourceTree = "<group>"; };
</del><span class="cx"> A13EBB491B87339E00097110 /* TestWebKitAPI.wkbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestWebKitAPI.wkbundle; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A13EBB521B87346600097110 /* WebProcessPlugIn.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcessPlugIn.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A13EBB541B8734E000097110 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="lines">@@ -1429,7 +1427,6 @@
</span><span class="cx"> 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */,
</span><span class="cx"> 0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
</span><span class="cx"> 9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
</span><del>- A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */,
</del><span class="cx"> );
</span><span class="cx"> name = "WebKit2 Cocoa";
</span><span class="cx"> path = WebKit2Cocoa;
</span><span class="lines">@@ -2398,7 +2395,6 @@
</span><span class="cx"> 37B47E301D64E7CA005F4EFF /* WKObject.mm in Sources */,
</span><span class="cx"> 7CCE7EC01A411A7E00447C4C /* FragmentNavigation.mm in Sources */,
</span><span class="cx"> 7CCE7EF61A411AE600447C4C /* FrameMIMETypeHTML.cpp in Sources */,
</span><del>- A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */,
</del><span class="cx"> 7CCE7EF71A411AE600447C4C /* FrameMIMETypePNG.cpp in Sources */,
</span><span class="cx"> 7C83E0BD1D0A650C00FEBCF3 /* FullscreenTopContentInset.mm in Sources */,
</span><span class="cx"> CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaLoadDataWithNilMIMETypemm"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm (207483 => 207484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm 2016-10-18 20:30:53 UTC (rev 207483)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm 2016-10-18 20:31:07 UTC (rev 207484)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#if WK_API_ENABLED
-
-#import "TestNavigationDelegate.h"
-#import <WebKit/WebKit.h>
-#import <wtf/RetainPtr.h>
-
-TEST(WebKit2, LoadDataWithNilMIMEType)
-{
- auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect]);
- NSString *mimeType = nil;
- [webView loadData:[@"test" dataUsingEncoding:NSUTF8StringEncoding] MIMEType:mimeType characterEncodingName:@"UTF-8" baseURL:[NSURL URLWithString:@"about:blank"]];
- [webView _test_waitForDidFinishNavigation];
-}
-
-#endif // WK_API_ENABLED
</del></span></pre>
</div>
</div>
</body>
</html>