<!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>[207262] branches/safari-602.2.14.0-branch</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/207262">207262</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 16:17:52 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert changes that should not have landed on the branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6022140branchJSTestsChangeLog">branches/safari-602.2.14.0-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchJSTestsstresstypedarrayslicejs">branches/safari-602.2.14.0-branch/JSTests/stress/typedarray-slice.js</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsChangeLog">branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastfilesapplybloburltoxhrexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastfilesworkersworkerapplybloburltoxhrexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cChangeLog">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerhtml">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobhtml">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobjs">branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthhtml">branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframehtml">branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html</a></li>
<li><a href="#branchessafari6022140branchSourceJavaScriptCoreChangeLog">branches/safari-602.2.14.0-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh">branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h</a></li>
<li><a href="#branchessafari6022140branchSourceJavaScriptCoreruntimeScopedArgumentsh">branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/ScopedArguments.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreChangeLog">branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoredomElementh">branches/safari-602.2.14.0-branch/Source/WebCore/dom/Element.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorefileapiFileReaderLoadercpp">branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorefileapiFileReaderLoaderh">branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlFormAssociatedElementcpp">branches/safari-602.2.14.0-branch/Source/WebCore/html/FormAssociatedElement.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlHTMLImageElementcpp">branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlHTMLPlugInImageElementcpp">branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlHTMLPlugInImageElementh">branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementcpp">branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementh">branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreloaderFrameLoadercpp">branches/safari-602.2.14.0-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreloaderSubframeLoadercpp">branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreloaderSubframeLoaderh">branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorepageDOMWindowcpp">branches/safari-602.2.14.0-branch/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorepageFramecpp">branches/safari-602.2.14.0-branch/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorepagecspContentSecurityPolicycpp">branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCorepagecspContentSecurityPolicyh">branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp">branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformgraphicstransformsTransformationMatrixh">branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">branches/safari-602.2.14.0-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformmacPlatformScreenMacmm">branches/safari-602.2.14.0-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformnetworkBlobResourceHandlecpp">branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#branchessafari6022140branchSourceWebCoreplatformnetworkBlobResourceHandleh">branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.h</a></li>
<li><a href="#branchessafari6022140branchSourceWebInspectorUIChangeLog">branches/safari-602.2.14.0-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs">branches/safari-602.2.14.0-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocChangeLog">branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocHeapcpp">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocXLargeMapcpp">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocXLargeMaph">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h</a></li>
<li><a href="#branchessafari6022140branchToolsChangeLog">branches/safari-602.2.14.0-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6022140branchJSTestsstressscopedargumentswritebarriershouldbeonscopeobjectjs">branches/safari-602.2.14.0-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastformsimagedisconnectedduringparseexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastformsimagedisconnectedduringparsehtml">branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastformsinputdisconnectedduringparseexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestsfastformsinputdisconnectedduringparsehtml">branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestshttptestssecurityresourcesanchortagwithblanktargethtml">branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestshttptestssecurityresourcespageexecutingjavascripthtml">branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/page-executing-javascript.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestshttptestssecuritywindowopenedfromsandboxediframeshouldinheritsandboxexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestshttptestssecuritywindowopenedfromsandboxediframeshouldinheritsandboxhtml">branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypeexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypehtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypeexpectedtxt">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypehtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html</a></li>
<li><a href="#branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementhtml">branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari6022140branchToolsTestWebKitAPITestsWebCoreTransformationMatrixcpp">branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6022140branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/JSTests/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/JSTests/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/JSTests/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,34 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204868. rdar://problem/28216263
-
- 2016-08-23 Keith Miller <keith_miller@apple.com>
-
- %TypedArray%.prototype.slice needs to check that the source and destination have not been detached.
- https://bugs.webkit.org/show_bug.cgi?id=161031
- <rdar://problem/27937019>
-
- Reviewed by Geoffrey Garen.
-
- * stress/typedarray-slice.js:
- (get let):
- (get try):
- (testSpeciesWithTransferring):
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204612. rdar://problem/28216278
-
- 2016-08-18 Mark Lam <mark.lam@apple.com>
-
- ScopedArguments is using the wrong owner object for a write barrier.
- https://bugs.webkit.org/show_bug.cgi?id=160976
- <rdar://problem/27328506>
-
- Reviewed by Keith Miller.
-
- * stress/scoped-arguments-write-barrier-should-be-on-scope-object.js: Added.
-
</del><span class="cx"> 2016-09-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204403. rdar://problem/27991568
</span></span></pre></div>
<a id="branchessafari6022140branchJSTestsstressscopedargumentswritebarriershouldbeonscopeobjectjs"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/JSTests/stress/scoped-arguments-write-barrier-should-be-on-scope-object.js 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-//@ runDefault
-// This test should not crash.
-
-var arr = [];
-let numberOfIterations = 1000;
-
-function captureScopedArguments(i) {
- try {
- eval("arr[" + i + "] = arguments");
- } catch(e) {
- }
-}
-
-function addPointersToEdenGenObjects(i) {
- Array.prototype.push.call(arr[i], [,,]);
-
- try {
- Array.prototype.reverse.call(arr[i])
- } catch (e) {
- }
-}
-
-for (var i = 0; i < numberOfIterations; i++) {
- captureScopedArguments(i);
-}
-
-gc(); // Promote those ScopeArguments to the old generation.
-
-for (var i = 0; i < numberOfIterations; i++) {
- addPointersToEdenGenObjects(i);
-}
-
-edenGC(); // Do eden GC to scan the remembered set which should include the ScopedArguments.
-
-gc(); // Scan the ScopedArguments again. They better not point to collected objects.
</del></span></pre></div>
<a id="branchessafari6022140branchJSTestsstresstypedarrayslicejs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/JSTests/stress/typedarray-slice.js (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/JSTests/stress/typedarray-slice.js 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/JSTests/stress/typedarray-slice.js 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -135,38 +135,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> shouldBeTrue("forEachTypedArray(subclasses, testSpeciesWithSameBuffer)");
</span><span class="cx">
</span><del>-function testSpeciesWithTransferring(unused, constructor) {
</del><span class="cx">
</span><del>- let array = new constructor(10);
- Object.defineProperty(constructor, Symbol.species, { get() {
- transferArrayBuffer(array.buffer);
- return undefined;
- }, configurable: true });
-
- try {
- array.slice(0,1);
- return false;
- } catch (e) { }
-
- array = new constructor(10);
- Object.defineProperty(constructor, Symbol.species, { get() {
- return function(len) {
- let a = new constructor(len);
- transferArrayBuffer(a.buffer);
- return a;
- }
- }, configurable: true });
-
- try {
- array.slice(0,1);
- return false;
- } catch (e) { }
-
- return true;
-}
-
-shouldBeTrue("forEachTypedArray(typedArrays, testSpeciesWithTransferring)");
-
</del><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,111 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r205190. rdar://problem/28545010
-
- 2016-08-30 Youenn Fablet <youenn@apple.com>
-
- [Fetch API] Blob not found URL should result in a network error
- https://bugs.webkit.org/show_bug.cgi?id=161381
-
- Reviewed by Sam Weinig.
-
- * fast/files/apply-blob-url-to-xhr-expected.txt:
- * fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt:
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204266. rdar://problem/28216261
-
- 2016-08-08 John Wilander <wilander@apple.com>
-
- Popups opened from a sandboxed iframe should themselves be sandboxed
- https://bugs.webkit.org/show_bug.cgi?id=134850
- <rdar://problem/27375388>
-
- Reviewed by Brent Fulgham.
-
- * http/tests/security/resources/anchor-tag-with-blank-target.html: Added.
- * http/tests/security/resources/page-executing-javascript.html: Added.
- * http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt: Added.
- * http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html: Added.
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203611. rdar://problem/28476958
-
- 2016-07-22 Daniel Bates <dabates@apple.com>
-
- CSP: object-src and plugin-types directives are not respected for plugin replacements
- https://bugs.webkit.org/show_bug.cgi?id=159761
- <rdar://problem/27365724>
-
- Reviewed by Brent Fulgham.
-
- Add layout tests to ensure that we apply the CSP object-src and plugin-types directives to content
- that loads with either the QuickTime plugin replacement or YouTube plugin replacement.
-
- * security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html: Added.
- * security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html: Added.
- * security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html: Added.
- * security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html: Added.
- * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html: Added.
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203522. rdar://problem/28476959
-
- 2016-07-21 Daniel Bates <dabates@apple.com>
-
- REGRESSION: Plugin replaced YouTube Flash videos always have the same width
- https://bugs.webkit.org/show_bug.cgi?id=159998
- <rdar://problem/27462285>
-
- Reviewed by Simon Fraser.
-
- Unskip existing iOS layout tests, update tests and expected results.
-
- * platform/ios-simulator/TestExpectations:
- * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt: Updated expected result based on the
- changes to test youtube-flash-plugin-iframe.html.
- * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt: Updated expected result
- based on the changes to test youtube-flash-plugin-iframe-no-height-or-width.html.
- * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html: Modified to check the
- width of each embedded YouTube video to ensure that we respect it (if specified).
- * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html: Substitute pseudo id -webkit-plugin-replacement
- for -apple-youtube-shadow-iframe as the later was renamed to the former in <https://trac.webkit.org/changeset/168442>.
- Fix misspelling of the word "embed" in a comment.
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203383. rdar://problem/28216264
-
- 2016-07-18 Brent Fulgham <bfulgham@apple.com>
-
- Don't associate form-associated elements with forms in other trees.
- https://bugs.webkit.org/show_bug.cgi?id=119451
- <rdar://problem/27382946>
-
- Change is based on the Blink change (patch by <adamk@chromium.org>):
- <https://chromium.googlesource.com/chromium/blink/+/0b33128be67e7845d495d5219614c02ccfe7a414>
-
- Reviewed by Chris Dumez.
-
- * fast/forms/image-disconnected-during-parse-expected.txt: Added.
- * fast/forms/image-disconnected-during-parse.html: Added.
- * fast/forms/input-disconnected-during-parse-expected.txt: Added.
- * fast/forms/input-disconnected-during-parse.html: Added.
-
</del><span class="cx"> 2016-09-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206518. rdar://problem/28505032
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastfilesapplybloburltoxhrexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> Test that XMLHttpRequest POST fails.
</span><span class="cx"> Received exception 19: NetworkError
</span><span class="cx"> Test that XMLHttpRequest GET fails after the blob URL is revoked.
</span><del>-Received exception 19: NetworkError
</del><ins>+Status: 404
+Response:
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastfilesworkersworkerapplybloburltoxhrexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> Test that XMLHttpRequest POST fails.
</span><span class="cx"> Received exception 19: NetworkError
</span><span class="cx"> Test that XMLHttpRequest GET fails after the blob URL is revoked.
</span><del>-Received exception 19: NetworkError
</del><ins>+Status: 404
+Response:
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastformsimagedisconnectedduringparseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-Image elements should not be associated with forms in different trees
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.forms[0].myimage is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastformsimagedisconnectedduringparsehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/image-disconnected-during-parse.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-<!DOCTYPE html>
-<form>
- <div id="target">
- <script>
- var d = document.getElementById('target');
- d.parentNode.removeChild(d);
- </script>
- <img name=myimage>
- </div>
-</form>
-<script src="../../resources/js-test-pre.js"></script>
-<script>
-description('Image elements should not be associated with forms in different trees');
-shouldBeUndefined('document.forms[0].myimage');
-</script>
-<script src="../../resources/js-test-post.js"></script>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastformsinputdisconnectedduringparseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-FormAssociatedElements should not be associated with forms in different trees (and should not crash)
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.forms[0].elements[0] is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsfastformsinputdisconnectedduringparsehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/fast/forms/input-disconnected-during-parse.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<form>
- <div>
- <script>
- var d = document.querySelector('div');
- d.parentNode.removeChild(d);
- </script>
- <input>
- </div>
-</form>
-<script src="../../resources/js-test-pre.js"></script>
-<script>
-description('FormAssociatedElements should not be associated with forms in different trees (and should not crash)');
-var unused = document.forms[0].elements.length;
-d = null;
-gc();
-shouldBeUndefined('document.forms[0].elements[0]');
-</script>
-<script src="../../resources/js-test-post.js"></script>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestshttptestssecurityresourcesanchortagwithblanktargethtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
- <a id="theLink" target="_blank" href="./page-executing-javascript.html">_blank page that executes JavaScript</a>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestshttptestssecurityresourcespageexecutingjavascripthtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/page-executing-javascript.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/page-executing-javascript.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/resources/page-executing-javascript.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<noscript>Pass: JavaScript was not allowed to execute.</noscript>
-<p id="output"></p>
-<script>
- document.getElementById("output").innerHTML = "Fail: JavaScript was allowed to execute.";
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestshttptestssecuritywindowopenedfromsandboxediframeshouldinheritsandboxexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Blocked script execution in 'http://127.0.0.1:8000/security/resources/page-executing-javascript.html' because the document's frame is sandboxed and the 'allow-scripts' permission is not set.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestshttptestssecuritywindowopenedfromsandboxediframeshouldinheritsandboxhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="UTF-8">
- <title>Tests that windows created from a sandboxed context inherit the same sandbox</title>
- <script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
- if (window.testRunner) {
- testRunner.setCanOpenWindows();
- testRunner.waitUntilDone();
- testRunner.setPopupBlockingEnabled(false);
- testRunner.dumpAsText();
- }
-
- function wrapUp () {
- if (window.testRunner) {
- testRunner.notifyDone();
- }
- }
-
- function run() {
- var iframeContentDocument = document.getElementById("theIframe").contentDocument,
- theLink = iframeContentDocument.getElementById("theLink"),
- clickEvent = document.createEvent("HTMLEvents");
- clickEvent.initEvent("click", true, true);
- theLink.dispatchEvent(clickEvent);
-
- setTimeout(wrapUp, 500);
- }
-</script>
-<iframe onload="run()" id="theIframe" sandbox="allow-same-origin allow-popups" src="resources/anchor-tag-with-blank-target.html"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,21 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r205190. rdar://problem/28545010
-
- 2016-08-30 Youenn Fablet <youenn@apple.com>
-
- [Fetch API] Blob not found URL should result in a network error
- https://bugs.webkit.org/show_bug.cgi?id=161381
-
- Reviewed by Sam Weinig.
-
- * web-platform-tests/fetch/api/basic/scheme-blob-expected.txt:
- * web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt:
- * web-platform-tests/fetch/api/basic/scheme-blob-worker.html:
- * web-platform-tests/fetch/api/basic/scheme-blob.html:
- * web-platform-tests/fetch/api/basic/scheme-blob.js:
- (invalidRequestMethods.forEach):
-
</del><span class="cx"> 2016-07-18 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableStream should throw a RangeError in case of NaN highWaterMark
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> PASS Fetching [GET] URL.createObjectURL(blob) is OK
</span><del>-PASS Fetching [GET] not found blob URL is KO
</del><ins>+PASS Fetching [GET] blob:http://www.localhost:8800/ is KO
</ins><span class="cx"> PASS Fetching [POST] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [OPTIONS] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [HEAD] URL.createObjectURL(blob) is KO
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> PASS Fetching [GET] URL.createObjectURL(blob) is OK
</span><del>-PASS Fetching [GET] not found blob URL is KO
</del><ins>+PASS Fetching [GET] blob:http://www.localhost:8800/ is KO
</ins><span class="cx"> PASS Fetching [POST] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [OPTIONS] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [HEAD] URL.createObjectURL(blob) is KO
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><del>- fetch_tests_from_worker(new Worker("scheme-blob.js"));
</del><ins>+ fetch_tests_from_worker(new Worker("scheme-blob.js?pipe=sub"));
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><del>-</html>
</del><ins>+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -11,6 +11,6 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script src="../resources/utils.js"></script>
</span><del>- <script src="scheme-blob.js"></script>
</del><ins>+ <script src="scheme-blob.js?pipe=sub"></script>
</ins><span class="cx"> </body>
</span><del>-</html>
</del><ins>+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -30,9 +30,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var blob2 = new Blob(["Blob's data"], { "type" : "text/plain" });
</span><del>-var blob2URL = URL.createObjectURL(blob2);
-checkKoUrl(blob2URL + "notfoundblob", "GET",
- "Fetching [GET] not found blob URL is KO");
</del><ins>+checkKoUrl("blob:http://{{domains[www]}}:{{ports[http][0]}}/", "GET",
+ "Fetching [GET] blob:http://{{domains[www]}}:{{ports[http][0]}}/ is KO");
</ins><span class="cx">
</span><span class="cx"> var invalidRequestMethods = [
</span><span class="cx"> "POST",
</span><span class="lines">@@ -43,7 +42,7 @@
</span><span class="cx"> "INVALID",
</span><span class="cx"> ];
</span><span class="cx"> invalidRequestMethods.forEach(function(method) {
</span><del>- checkKoUrl(blob2URL, method, "Fetching [" + method + "] URL.createObjectURL(blob) is KO");
</del><ins>+ checkKoUrl(URL.createObjectURL(blob2), method, "Fetching [" + method + "] URL.createObjectURL(blob) is KO");
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> done();
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/TestExpectations (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -2555,6 +2555,8 @@
</span><span class="cx">
</span><span class="cx"> # iOS tests that assert:
</span><span class="cx"> platform/ios-simulator/ios/fast/text/combining-enclosing-keycap.html
</span><ins>+platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html
+platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html
</ins><span class="cx">
</span><span class="cx"> # Kerning, Ligatures, and Printer Fonts caused these tests to fail.
</span><span class="cx"> # The following tests are reftests (and also fail on Mac):
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -16,11 +16,11 @@
</span><span class="cx"> PASS objectEmbed.tagName is "EMBED"
</span><span class="cx"> PASS objectNoEmbed.tagName is "OBJECT"
</span><span class="cx"> PASS document.querySelectorAll("iframe").length is 1
</span><del>-PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</del><ins>+PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</ins><span class="cx"> PASS normalEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><del>-PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</del><ins>+PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</ins><span class="cx"> PASS objectEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><del>-PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</del><ins>+PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</ins><span class="cx"> PASS objectNoEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><span class="cx"> Normal Embed:
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -12,16 +12,12 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-PASS getComputedStyle(embedNoHeight).width is "425px"
</del><span class="cx"> PASS getComputedStyle(embedNoHeight).height is "150px"
</span><span class="cx"> PASS getComputedStyle(embedNoWidth).width is "300px"
</span><del>-PASS getComputedStyle(embedNoWidth).height is "350px"
</del><span class="cx"> PASS getComputedStyle(embedNoWidthHeight).width is "300px"
</span><span class="cx"> PASS getComputedStyle(embedNoWidthHeight).height is "150px"
</span><del>-PASS getComputedStyle(objectNoHeight).width is "425px"
</del><span class="cx"> PASS getComputedStyle(objectNoHeight).height is "150px"
</span><span class="cx"> PASS getComputedStyle(objectNoWidth).width is "300px"
</span><del>-PASS getComputedStyle(objectNoWidth).height is "350px"
</del><span class="cx"> PASS getComputedStyle(objectNoWidthHeight).width is "300px"
</span><span class="cx"> PASS getComputedStyle(objectNoWidthHeight).height is "150px"
</span><span class="cx"> Embed without height:
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -16,12 +16,10 @@
</span><span class="cx"> {
</span><span class="cx"> setTimeout(function() {
</span><span class="cx"> embedNoHeight = document.getElementById('embed-no-height');
</span><del>- shouldBe('getComputedStyle(embedNoHeight).width', '"425px"');
- shouldBe('getComputedStyle(embedNoHeight).height', '"150px"');
</del><ins>+ shouldBe('getComputedStyle(embedNoHeight).height', '"150px"')
</ins><span class="cx">
</span><span class="cx"> embedNoWidth = document.getElementById('embed-no-width');
</span><del>- shouldBe('getComputedStyle(embedNoWidth).width', '"300px"');
- shouldBe('getComputedStyle(embedNoWidth).height', '"350px"');
</del><ins>+ shouldBe('getComputedStyle(embedNoWidth).width', '"300px"')
</ins><span class="cx">
</span><span class="cx"> embedNoWidthHeight = document.getElementById('embed-no-width-or-height');
</span><span class="cx"> shouldBe('getComputedStyle(embedNoWidthHeight).width', '"300px"');
</span><span class="lines">@@ -28,12 +26,10 @@
</span><span class="cx"> shouldBe('getComputedStyle(embedNoWidthHeight).height', '"150px"');
</span><span class="cx">
</span><span class="cx"> objectNoHeight = document.getElementById('object-no-height');
</span><del>- shouldBe('getComputedStyle(objectNoHeight).width', '"425px"');
- shouldBe('getComputedStyle(objectNoHeight).height', '"150px"');
</del><ins>+ shouldBe('getComputedStyle(objectNoHeight).height', '"150px"')
</ins><span class="cx">
</span><span class="cx"> objectNoWidth = document.getElementById('object-no-width');
</span><del>- shouldBe('getComputedStyle(objectNoWidth).width', '"300px"');
- shouldBe('getComputedStyle(objectNoWidth).height', '"350px"');
</del><ins>+ shouldBe('getComputedStyle(objectNoWidth).width', '"300px"')
</ins><span class="cx">
</span><span class="cx"> objectNoWidthHeight = document.getElementById('object-no-width-or-height');
</span><span class="cx"> shouldBe('getComputedStyle(objectNoWidthHeight).width', '"300px"');
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> objectEmbed = document.getElementById('object-embed');
</span><span class="cx"> objectNoEmbed = document.getElementById('object-no-embed');
</span><span class="cx">
</span><del>- // Test we don't change any embed/object tag to iframe.
</del><ins>+ // Test we don't change any embe/object tag to iframe.
</ins><span class="cx"> shouldBe('normalEmbed.tagName', '"EMBED"');
</span><span class="cx"> shouldBe('elinkEmbed.tagName', '"EMBED"');
</span><span class="cx"> shouldBe('objectEmbed.tagName', '"EMBED"');
</span><span class="lines">@@ -31,15 +31,15 @@
</span><span class="cx">
</span><span class="cx"> // Test we have the shadow root and the iframe player.
</span><span class="cx"> normalEmbedShadowRoot = internals.shadowRoot(normalEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</del><ins>+ shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</ins><span class="cx"> shouldBe('normalEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> objectEmbedShadowRoot = internals.shadowRoot(objectEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</del><ins>+ shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</ins><span class="cx"> shouldBe('objectEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> objectNoEmbedShadowRoot = internals.shadowRoot(objectNoEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</del><ins>+ shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</ins><span class="cx"> shouldBe('objectNoEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load yellow.mov because it does not appear in the object-src directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed id="embed" width="640" height="480" src="../../plugins/resources/yellow.mov" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because it does not appear in the object-src directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
- <embed width="425" height="350" type="application/x-shockwave-flash" src="https://www.youtube.com/v/UF8uR6Z6KLc">
-</object>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-ALERT: PASS did load plugin.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types video/quicktime">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-</script>
-</head>
-<body>
-<embed id="embed" type="video/quicktime" width="640" height="480" src="../../plugins/resources/yellow.mov" qtsrc="../../plugins/resources/orange.mov" postdomevents=true>
-<script>
-document.getElementById("embed").addEventListener("qt_begin", function () {
- alert("PASS did load plugin.");
- if (window.testRunner)
- testRunner.notifyDone();
-}, true);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc?showinfo=0
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types application/x-shockwave-flash">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-// Waiting at least 100ms seems to ensure that YouTube plugin replacement has loaded.
-window.setTimeout(function () {
- if (window.testRunner)
- testRunner.notifyDone();
-}, 100);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
- <embed width="425" height="350" type="application/x-shockwave-flash" src="https://www.youtube.com/v/UF8uR6Z6KLc">
-</object>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load yellow.mov because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load yellow.mov because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed width="640" height="480" src="../../plugins/resources/yellow.mov" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed type="video/quicktime" width="640" height="480" src="../../plugins/resources/yellow.mov" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
- <embed width="425" height="350" src="https://www.youtube.com/v/UF8uR6Z6KLc">
-</object>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
- <embed width="425" height="350" type="application/x-shockwave-flash" src="https://www.youtube.com/v/UF8uR6Z6KLc">
-</object>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari6022140branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/JavaScriptCore/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/JavaScriptCore/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/JavaScriptCore/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,34 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204868. rdar://problem/28216263
-
- 2016-08-23 Keith Miller <keith_miller@apple.com>
-
- %TypedArray%.prototype.slice needs to check that the source and destination have not been detached.
- https://bugs.webkit.org/show_bug.cgi?id=161031
- <rdar://problem/27937019>
-
- Reviewed by Geoffrey Garen.
-
- * runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
- (JSC::speciesConstruct):
- (JSC::genericTypedArrayViewProtoFuncSlice):
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204612. rdar://problem/28216278
-
- 2016-08-18 Mark Lam <mark.lam@apple.com>
-
- ScopedArguments is using the wrong owner object for a write barrier.
- https://bugs.webkit.org/show_bug.cgi?id=160976
- <rdar://problem/27328506>
-
- Reviewed by Keith Miller.
-
- * runtime/ScopedArguments.h:
- (JSC::ScopedArguments::setIndexQuickly):
-
</del><span class="cx"> 2016-09-14 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r205882. rdar://problem/28233331
</span></span></pre></div>
<a id="branchessafari6022140branchSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -69,14 +69,9 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(result)) {
- if (!view->isNeutered())
- return view;
</del><ins>+ if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(result))
+ return view;
</ins><span class="cx">
</span><del>- throwTypeError(exec, typedArrayBufferHasBeenDetachedErrorMessage);
- return nullptr;
- }
-
</del><span class="cx"> throwTypeError(exec, ASCIILiteral("species constructor did not return a TypedArray View"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -446,10 +441,6 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><del>- ASSERT(!result->isNeutered());
- if (thisObject->isNeutered())
- return throwVMTypeError(exec, typedArrayBufferHasBeenDetachedErrorMessage);
-
</del><span class="cx"> // We return early here since we don't allocate a backing store if length is 0 and memmove does not like nullptrs
</span><span class="cx"> if (!length)
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="branchessafari6022140branchSourceJavaScriptCoreruntimeScopedArgumentsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/ScopedArguments.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/ScopedArguments.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/JavaScriptCore/runtime/ScopedArguments.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(canAccessIndexQuickly(i));
</span><span class="cx"> unsigned namedLength = m_table->length();
</span><span class="cx"> if (i < namedLength)
</span><del>- m_scope->variableAt(m_table->get(i)).set(vm, m_scope.get(), value);
</del><ins>+ m_scope->variableAt(m_table->get(i)).set(vm, this, value);
</ins><span class="cx"> else
</span><span class="cx"> overflowStorage()[i - namedLength].set(vm, this, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,267 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r205197. rdar://problem/28481424
-
- 2016-08-30 Brent Fulgham <bfulgham@apple.com>
-
- Use of uninitialised memory in TransformationMatrx::blend4()
- https://bugs.webkit.org/show_bug.cgi?id=134621
- <rdar://problem/27337539>
-
- Reviewed by Dean Jackson.
-
- Change is based on the Blink change (patch by <alancutter@chromium.org>):
- <https://src.chromium.org/viewvc/blink?revision=177453&view=revision>
-
- TransformationMatrix::blend() was attempting to blend between non-invertable
- matricies. This resulted in garbage stack variables being used.
- This patch ensures that blend() will fall back to a 50% step interpolation
- when one of the sides are not invertable.
-
- Tested by new TransformationMatrix test in TestWebKitAPI.
-
- * platform/graphics/transforms/TransformationMatrix.cpp:
- (WebCore::TransformationMatrix::blend2): Properly handle failure in the
- decompose method calls.
- (WebCore::TransformationMatrix::blend4): Ditto.
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r205190. rdar://problem/28545010
-
- 2016-08-30 Youenn Fablet <youenn@apple.com>
-
- [Fetch API] Blob not found URL should result in a network error
- https://bugs.webkit.org/show_bug.cgi?id=161381
-
- Reviewed by Sam Weinig.
-
- Covered by rebased and updated tests.
-
- Raising a network error if no blob can be found from the URL.
- It is no longer notified by a 404 response.
-
- Updated FileReaderLoader to generate the correct exception.
-
- Made some clean-up in the code, in particular adding an enum class for BlobResourceHandle errors.
-
- * fileapi/FileReaderLoader.cpp:
- (WebCore::FileReaderLoader::didFail):
- (WebCore::FileReaderLoader::toErrorCode):
- (WebCore::FileReaderLoader::httpStatusCodeToErrorCode):
- * fileapi/FileReaderLoader.h:
- * platform/network/BlobResourceHandle.cpp:
- (WebCore::BlobResourceHandle::loadResourceSynchronously):
- (WebCore::BlobResourceHandle::doStart):
- (WebCore::BlobResourceHandle::didGetSize):
- (WebCore::BlobResourceHandle::readSync):
- (WebCore::BlobResourceHandle::readFileSync):
- (WebCore::BlobResourceHandle::readAsync):
- (WebCore::BlobResourceHandle::didOpen):
- (WebCore::BlobResourceHandle::didRead):
- (WebCore::BlobResourceHandle::failed):
- (WebCore::BlobResourceHandle::notifyResponse):
- (WebCore::BlobResourceHandle::notifyResponseOnError):
- (WebCore::BlobResourceHandle::notifyFail):
- * platform/network/BlobResourceHandle.h:
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204631. rdar://problem/28481427
-
- 2016-08-19 Chris Dumez <cdumez@apple.com>
-
- DumpRenderTree crashed in com.apple.WebCore: WebCore::DOMWindow::resetDOMWindowProperties + 607
- https://bugs.webkit.org/show_bug.cgi?id=160983
- <rdar://problem/26768524>
-
- Reviewed by Brent Fulgham.
-
- Update DOMWindow::frameDestroyed() to ref the window object as the crash
- traces seem to indicate it can get destroyed during the execution of this
- method. Also update the code in the ~Frame destructor to not iterate over
- the list of FrameDestructionObservers because observers remove themselves
- from the list when they get destroyed.
-
- No new tests, do not know how to reproduce.
-
- * page/DOMWindow.cpp:
- (WebCore::DOMWindow::frameDestroyed):
- * page/Frame.cpp:
- (WebCore::Frame::~Frame):
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204266. rdar://problem/28216261
-
- 2016-08-08 John Wilander <wilander@apple.com>
-
- Popups opened from a sandboxed iframe should themselves be sandboxed
- https://bugs.webkit.org/show_bug.cgi?id=134850
- <rdar://problem/27375388>
-
- Reviewed by Brent Fulgham.
-
- Test: http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html
-
- * loader/FrameLoader.cpp:
- (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
- Now copies the opener's frame loader effective sandbox flags to the
- new frame loader.
-
-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203903. rdar://problem/28476961
-
- 2016-07-28 Dean Jackson <dino@apple.com>
-
- color-gamut media query returns incorrect results
- https://bugs.webkit.org/show_bug.cgi?id=160166
- <rdar://problem/27537577>
-
- Reviewed by Darin Adler.
-
- While I was unable to reproduce the originator's issue,
- we communicated via email and it might have been related
- to a customized color space calibration on an external
- display.
-
- Anyway, I took this opportunity to update to use the
- more appropriate API for detection on macOS Sierra.
-
- Covered by the existing fast/media/mq-color-gamut.html test.
-
- * platform/mac/PlatformScreenMac.mm:
- (WebCore::screenSupportsExtendedColor): Use NSScreen canRepresentDisplayGamut.
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203792. rdar://problem/28476951
-
- 2016-07-27 Jeremy Jones <jeremyj@apple.com>
-
- Fullscreen video zoom button does not work after rotating when aspect ratio matches display.
- https://bugs.webkit.org/show_bug.cgi?id=160263
- rdar://problem/27368872
-
- Reviewed by Eric Carlson.
-
- When video and display aspect ratio match, and rotating from landscape to protrait, the transform used in layout
- will be Identity. This means checking the transform for identity is an insufficient test to see if the bounds
- need to be resolved.
-
- Instead, always attempt to resolve the bounds and do a more accurate test while doing so.
-
- * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
- (-[WebAVPlayerLayer layoutSublayers]):
- (-[WebAVPlayerLayer resolveBounds]):
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203611. rdar://problem/28476958
-
- 2016-07-22 Daniel Bates <dabates@apple.com>
-
- CSP: object-src and plugin-types directives are not respected for plugin replacements
- https://bugs.webkit.org/show_bug.cgi?id=159761
- <rdar://problem/27365724>
-
- Reviewed by Brent Fulgham.
-
- Apply the Content Security Policy (CSP) object-src and plugin-types directives to content that will
- load with a plugin replacement.
-
- Tests: security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html
- security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html
- security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html
- security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html
- security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html
- security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html
- security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html
- security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html
-
- * html/HTMLPlugInImageElement.cpp:
- (WebCore::HTMLPlugInImageElement::allowedToLoadPluginContent): Added.
- (WebCore::HTMLPlugInImageElement::requestObject): Only request loading plugin content if we
- are allowed to load such content.
- * html/HTMLPlugInImageElement.h:
- * loader/SubframeLoader.cpp:
- (WebCore::SubframeLoader::pluginIsLoadable): Removed code to check CSP as we will check CSP
- earlier in HTMLPlugInImageElement::requestObject().
- (WebCore::SubframeLoader::requestPlugin): Ditto.
- (WebCore::SubframeLoader::isPluginContentAllowedByContentSecurityPolicy): Deleted; moved implementation
- to HTMLPlugInImageElement::allowedToLoadPluginContent().
- (WebCore::SubframeLoader::requestObject): Deleted.
- * loader/SubframeLoader.h:
- * page/csp/ContentSecurityPolicy.cpp:
- (WebCore::ContentSecurityPolicy::upgradeInsecureRequestIfNeeded): Changed signature from a non-const
- function to a const function since these functions do not modify |this|.
- * page/csp/ContentSecurityPolicy.h:
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203522. rdar://problem/28476959
-
- 2016-07-21 Daniel Bates <dabates@apple.com>
-
- REGRESSION: Plugin replaced YouTube Flash videos always have the same width
- https://bugs.webkit.org/show_bug.cgi?id=159998
- <rdar://problem/27462285>
-
- Reviewed by Simon Fraser.
-
- Fixes an issue where the width of a plugin replaced YouTube video loaded via an HTML embed
- element would always have the same width regardless of value of the width attribute.
-
- For YouTube Flash videos the YouTube plugin replacement substitutes a shadow DOM subtree
- for the default renderer of an HTML embed element. The root of this shadow DOM subtree
- is an HTML div element. Currently we set inline styles on this <div> when it is instantiated.
- In particular, we set inline display and position to "inline-block" and "relative", respectively,
- and set an invalid height and width (we specify a font weight value instead of a CSS length value
- - this causes an ASSERT_NOT_REACHED() assertion failure in StyleBuilderConverter::convertLengthSizing()
- in a debug build). These styles never worked as intended and we ultimately created an inline
- renderer (ignoring display "inline-block") that had auto width and height. Instead it is sufficient
- to remove all these inline styles and create a RenderBlockFlow renderer for this <div> so that it
- renders as a block, non-replaced element to achieve the intended illusion that the <embed> is a
- single element.
-
- * html/shadow/YouTubeEmbedShadowElement.cpp: Remove unused header HTMLEmbedElement.h and include
- header RenderBlockFlow.h. Also update copyright in license block.
- (WebCore::YouTubeEmbedShadowElement::YouTubeEmbedShadowElement): Remove inline styles as these
- never worked as intended.
- (WebCore::YouTubeEmbedShadowElement::createElementRenderer): Override; create a block-flow
- renderer for us so that we layout as a block, non-replaced element.
- * html/shadow/YouTubeEmbedShadowElement.h:
-
-2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r203383. rdar://problem/28216264
-
- 2016-07-18 Brent Fulgham <bfulgham@apple.com>
-
- Don't associate form-associated elements with forms in other trees.
- https://bugs.webkit.org/show_bug.cgi?id=119451
- <rdar://problem/27382946>
-
- Change is based on the Blink change (patch by <adamk@chromium.org>):
- <https://chromium.googlesource.com/chromium/blink/+/0b33128be67e7845d495d5219614c02ccfe7a414>
-
- Reviewed by Chris Dumez.
-
- Prevent elements from being associated with forms that are not part of the same home subtree.
- This brings us in line with the WhatWG HTML specification as of September, 2013.
-
- Tests: fast/forms/image-disconnected-during-parse.html
- fast/forms/input-disconnected-during-parse.html
-
- * dom/Element.h:
- (WebCore::Node::rootElement): Added.
- * html/FormAssociatedElement.cpp:
- (WebCore::FormAssociatedElement::insertedInto): If the element is associated with a form that
- is not part of the same tree, remove the association.
- * html/HTMLImageElement.cpp:
- (WebCore::HTMLImageElement::insertedInto): Ditto.
-
</del><span class="cx"> 2016-09-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow up for <rdar://problem/28567561> Add CSS -webkit-appearance property for Apple Pay buttons
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/dom/Element.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/dom/Element.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/dom/Element.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Peter Kelly (pmk@post.com)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -147,8 +147,6 @@
</span><span class="cx"> // to the render layer and merge bindingsOffsetParent and offsetParent.
</span><span class="cx"> Element* bindingsOffsetParent();
</span><span class="cx">
</span><del>- const Element* rootElement() const;
-
</del><span class="cx"> Element* offsetParent();
</span><span class="cx"> double clientLeft();
</span><span class="cx"> double clientTop();
</span><span class="lines">@@ -665,17 +663,6 @@
</span><span class="cx"> return is<Element>(parent) ? downcast<Element>(parent) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline const Element* Element::rootElement() const
-{
- if (inDocument())
- return document().documentElement();
-
- const Element* highest = this;
- while (highest->parentElement())
- highest = highest->parentElement();
- return highest;
-}
-
</del><span class="cx"> inline bool Element::hasAttributeWithoutSynchronization(const QualifiedName& name) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(fastAttributeLookupAllowed(name));
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "FileReaderLoaderClient.h"
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><del>-#include "ResourceError.h"
</del><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="lines">@@ -228,13 +227,13 @@
</span><span class="cx"> m_client->didFinishLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FileReaderLoader::didFail(const ResourceError& error)
</del><ins>+void FileReaderLoader::didFail(const ResourceError&)
</ins><span class="cx"> {
</span><span class="cx"> // If we're aborting, do not proceed with normal error handling since it is covered in aborting code.
</span><span class="cx"> if (m_errorCode == FileError::ABORT_ERR)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- failed(toErrorCode(static_cast<BlobResourceHandle::Error>(error.errorCode())));
</del><ins>+ failed(FileError::NOT_READABLE_ERR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FileReaderLoader::failed(int errorCode)
</span><span class="lines">@@ -245,21 +244,13 @@
</span><span class="cx"> m_client->didFail(m_errorCode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FileError::ErrorCode FileReaderLoader::toErrorCode(BlobResourceHandle::Error error)
-{
- switch (error) {
- case BlobResourceHandle::Error::NotFoundError:
- return FileError::NOT_FOUND_ERR;
- default:
- return FileError::NOT_READABLE_ERR;
- }
-}
-
</del><span class="cx"> FileError::ErrorCode FileReaderLoader::httpStatusCodeToErrorCode(int httpStatusCode)
</span><span class="cx"> {
</span><span class="cx"> switch (httpStatusCode) {
</span><span class="cx"> case 403:
</span><span class="cx"> return FileError::SECURITY_ERR;
</span><ins>+ case 404:
+ return FileError::NOT_FOUND_ERR;
</ins><span class="cx"> default:
</span><span class="cx"> return FileError::NOT_READABLE_ERR;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorefileapiFileReaderLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/fileapi/FileReaderLoader.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #ifndef FileReaderLoader_h
</span><span class="cx"> #define FileReaderLoader_h
</span><span class="cx">
</span><del>-#include "BlobResourceHandle.h"
</del><span class="cx"> #include "FileError.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="lines">@@ -93,7 +92,6 @@
</span><span class="cx"> bool isCompleted() const;
</span><span class="cx">
</span><span class="cx"> static FileError::ErrorCode httpStatusCodeToErrorCode(int);
</span><del>- static FileError::ErrorCode toErrorCode(BlobResourceHandle::Error);
</del><span class="cx">
</span><span class="cx"> ReadType m_readType;
</span><span class="cx"> FileReaderLoaderClient* m_client;
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlFormAssociatedElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/FormAssociatedElement.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/FormAssociatedElement.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/FormAssociatedElement.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -75,9 +75,6 @@
</span><span class="cx"> m_formSetByParser = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_form && element.rootElement() != m_form->rootElement())
- setForm(nullptr);
-
</del><span class="cx"> if (!insertionPoint.inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLImageElement.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLImageElement.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLImageElement.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><del>-#include "NodeTraversal.h"
</del><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -308,11 +307,6 @@
</span><span class="cx"> m_form->registerImgElement(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_form && rootElement() != m_form->rootElement()) {
- m_form->removeImgElement(this);
- m_form = nullptr;
- }
-
</del><span class="cx"> if (!m_form) {
</span><span class="cx"> m_form = HTMLFormElement::findClosestFormAncestor(*this);
</span><span class="cx"> if (m_form)
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><del>-#include "ContentSecurityPolicy.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="lines">@@ -771,33 +770,8 @@
</span><span class="cx"> HTMLPlugInElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLPlugInImageElement::allowedToLoadPluginContent(const String& url, const String& mimeType) const
-{
- URL completedURL;
- if (!url.isEmpty())
- completedURL = document().completeURL(url);
-
- ASSERT(document().contentSecurityPolicy());
- const ContentSecurityPolicy& contentSecurityPolicy = *document().contentSecurityPolicy();
-
- contentSecurityPolicy.upgradeInsecureRequestIfNeeded(completedURL, ContentSecurityPolicy::InsecureRequestType::Load);
-
- String declaredMimeType = document().isPluginDocument() && document().ownerElement() ?
- document().ownerElement()->attributeWithoutSynchronization(HTMLNames::typeAttr) : attributeWithoutSynchronization(HTMLNames::typeAttr);
- bool isInUserAgentShadowTree = this->isInUserAgentShadowTree();
- return contentSecurityPolicy.allowObjectFromSource(completedURL, isInUserAgentShadowTree) && contentSecurityPolicy.allowPluginType(mimeType, declaredMimeType, completedURL, isInUserAgentShadowTree);
-}
-
</del><span class="cx"> bool HTMLPlugInImageElement::requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><del>- if (url.isEmpty() && mimeType.isEmpty())
- return false;
-
- if (!allowedToLoadPluginContent(url, mimeType)) {
- renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy);
- return false;
- }
-
</del><span class="cx"> if (HTMLPlugInElement::requestObject(url, mimeType, paramNames, paramValues))
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLPlugInImageElement.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -111,8 +111,6 @@
</span><span class="cx"> bool isPlugInImageElement() const final { return true; }
</span><span class="cx"> bool isRestartedPlugin() const final { return m_isRestartedPlugin; }
</span><span class="cx">
</span><del>- bool allowedToLoadPluginContent(const String& url, const String& mimeType) const;
-
</del><span class="cx"> void finishParsingChildren() final;
</span><span class="cx"> void didAddUserAgentShadowRoot(ShadowRoot*) final;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "YouTubeEmbedShadowElement.h"
</span><span class="cx">
</span><del>-#include "RenderBlockFlow.h"
</del><ins>+#include "HTMLEmbedElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,11 +39,11 @@
</span><span class="cx"> : HTMLDivElement(HTMLNames::divTag, document)
</span><span class="cx"> {
</span><span class="cx"> setPseudo(AtomicString("-webkit-plugin-replacement", AtomicString::ConstructFromLiteral));
</span><del>-}
</del><span class="cx">
</span><del>-RenderPtr<RenderElement> YouTubeEmbedShadowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
-{
- return createRenderer<RenderBlockFlow>(*this, WTFMove(style));
</del><ins>+ setInlineStyleProperty(CSSPropertyDisplay, CSSValueInlineBlock);
+ setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
+ setInlineStyleProperty(CSSPropertyWidth, CSSValue100);
+ setInlineStyleProperty(CSSPropertyHeight, CSSValue100);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<YouTubeEmbedShadowElement> create(Document&);
</span><span class="cx">
</span><del>- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
-
</del><span class="cx"> private:
</span><span class="cx"> YouTubeEmbedShadowElement(Document&);
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/loader/FrameLoader.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -3119,8 +3119,6 @@
</span><span class="cx"> if (!mainFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- mainFrame->loader().forceSandboxFlags(frame->loader().effectiveSandboxFlags());
-
</del><span class="cx"> if (frameName != "_blank")
</span><span class="cx"> mainFrame->tree().setName(frameName);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -108,8 +108,22 @@
</span><span class="cx"> return shouldUsePlugin(completedURL, mimeType, false, useFallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SubframeLoader::pluginIsLoadable(const URL& url, const String& mimeType)
</del><ins>+bool SubframeLoader::isPluginContentAllowedByContentSecurityPolicy(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType) const
</ins><span class="cx"> {
</span><ins>+ if (!document())
+ return true;
+
+ ASSERT(document()->contentSecurityPolicy());
+ const ContentSecurityPolicy& contentSecurityPolicy = *document()->contentSecurityPolicy();
+
+ String declaredMimeType = document()->isPluginDocument() && document()->ownerElement() ?
+ document()->ownerElement()->attributeWithoutSynchronization(HTMLNames::typeAttr) : pluginElement.attributeWithoutSynchronization(HTMLNames::typeAttr);
+ bool isInUserAgentShadowTree = pluginElement.isInUserAgentShadowTree();
+ return contentSecurityPolicy.allowObjectFromSource(url, isInUserAgentShadowTree) && contentSecurityPolicy.allowPluginType(mimeType, declaredMimeType, url, isInUserAgentShadowTree);
+}
+
+bool SubframeLoader::pluginIsLoadable(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType)
+{
</ins><span class="cx"> if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
</span><span class="cx"> if (!m_frame.settings().isJavaEnabled())
</span><span class="cx"> return false;
</span><span class="lines">@@ -126,6 +140,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!isPluginContentAllowedByContentSecurityPolicy(pluginElement, url, mimeType)) {
+ RenderEmbeddedObject* renderer = pluginElement.renderEmbeddedObject();
+ renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy);
+ return false;
+ }
+
</ins><span class="cx"> if (!m_frame.loader().mixedContentChecker().canRunInsecureContent(document()->securityOrigin(), url))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -141,7 +161,7 @@
</span><span class="cx"> if ((!allowPlugins() && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!pluginIsLoadable(url, mimeType))
</del><ins>+ if (!pluginIsLoadable(ownerElement, url, mimeType))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ASSERT(ownerElement.hasTagName(objectTag) || ownerElement.hasTagName(embedTag));
</span><span class="lines">@@ -222,6 +242,12 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!isPluginContentAllowedByContentSecurityPolicy(ownerElement, completedURL, mimeType)) {
+ RenderEmbeddedObject* renderer = ownerElement.renderEmbeddedObject();
+ renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy);
+ return false;
+ }
+
</ins><span class="cx"> // If the plug-in element already contains a subframe, loadOrRedirectSubframe will re-use it. Otherwise,
</span><span class="cx"> // it will create a new frame and set it as the RenderWidget's Widget, causing what was previously
</span><span class="cx"> // in the widget to be torn down.
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/loader/SubframeLoader.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -77,8 +77,10 @@
</span><span class="cx"> Frame* loadSubframe(HTMLFrameOwnerElement&, const URL&, const String& name, const String& referrer);
</span><span class="cx"> bool loadPlugin(HTMLPlugInImageElement&, const URL&, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
</span><span class="cx">
</span><ins>+ bool isPluginContentAllowedByContentSecurityPolicy(HTMLPlugInImageElement&, const URL&, const String& mimeType) const;
+
</ins><span class="cx"> bool shouldUsePlugin(const URL&, const String& mimeType, bool hasFallback, bool& useFallback);
</span><del>- bool pluginIsLoadable(const URL&, const String& mimeType);
</del><ins>+ bool pluginIsLoadable(HTMLPlugInImageElement&, const URL&, const String& mimeType);
</ins><span class="cx">
</span><span class="cx"> Document* document() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/page/DOMWindow.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/page/DOMWindow.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/page/DOMWindow.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -480,8 +480,6 @@
</span><span class="cx">
</span><span class="cx"> void DOMWindow::frameDestroyed()
</span><span class="cx"> {
</span><del>- Ref<DOMWindow> protectedThis(*this);
-
</del><span class="cx"> willDestroyDocumentInFrame();
</span><span class="cx"> FrameDestructionObserver::frameDestroyed();
</span><span class="cx"> resetDOMWindowProperties();
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/page/Frame.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/page/Frame.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/page/Frame.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -217,8 +217,8 @@
</span><span class="cx">
</span><span class="cx"> disconnectOwnerElement();
</span><span class="cx">
</span><del>- while (auto* destructionObserver = m_destructionObservers.takeAny())
- destructionObserver->frameDestroyed();
</del><ins>+ for (auto& observer : m_destructionObservers)
+ observer->frameDestroyed();
</ins><span class="cx">
</span><span class="cx"> if (!isMainFrame())
</span><span class="cx"> m_mainFrame.selfOnlyDeref();
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorepagecspContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContentSecurityPolicy::upgradeInsecureRequestIfNeeded(ResourceRequest& request, InsecureRequestType requestType) const
</del><ins>+void ContentSecurityPolicy::upgradeInsecureRequestIfNeeded(ResourceRequest& request, InsecureRequestType requestType)
</ins><span class="cx"> {
</span><span class="cx"> URL url = request.url();
</span><span class="cx"> upgradeInsecureRequestIfNeeded(url, requestType);
</span><span class="lines">@@ -772,7 +772,7 @@
</span><span class="cx"> request.setURL(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContentSecurityPolicy::upgradeInsecureRequestIfNeeded(URL& url, InsecureRequestType requestType) const
</del><ins>+void ContentSecurityPolicy::upgradeInsecureRequestIfNeeded(URL& url, InsecureRequestType requestType)
</ins><span class="cx"> {
</span><span class="cx"> if (!url.protocolIs("http") && !url.protocolIs("ws"))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCorepagecspContentSecurityPolicyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/page/csp/ContentSecurityPolicy.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> void setUpgradeInsecureRequests(bool);
</span><span class="cx"> bool upgradeInsecureRequests() const { return m_upgradeInsecureRequests; }
</span><span class="cx"> enum class InsecureRequestType { Load, FormSubmission, Navigation };
</span><del>- void upgradeInsecureRequestIfNeeded(ResourceRequest&, InsecureRequestType) const;
- void upgradeInsecureRequestIfNeeded(URL&, InsecureRequestType) const;
</del><ins>+ void upgradeInsecureRequestIfNeeded(ResourceRequest&, InsecureRequestType);
+ void upgradeInsecureRequestIfNeeded(URL&, InsecureRequestType);
</ins><span class="cx">
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>>&& takeNavigationRequestsToUpgrade();
</span><span class="cx"> void inheritInsecureNavigationRequestsToUpgradeFromOpener(const ContentSecurityPolicy&);
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1501,11 +1501,8 @@
</span><span class="cx"> {
</span><span class="cx"> Decomposed2Type fromDecomp;
</span><span class="cx"> Decomposed2Type toDecomp;
</span><del>- if (!from.decompose2(fromDecomp) || !decompose2(toDecomp)) {
- if (progress < 0.5)
- *this = from;
- return;
- }
</del><ins>+ from.decompose2(fromDecomp);
+ decompose2(toDecomp);
</ins><span class="cx">
</span><span class="cx"> // If x-axis of one is flipped, and y-axis of the other, convert to an unflipped rotation.
</span><span class="cx"> if ((fromDecomp.scaleX < 0 && toDecomp.scaleY < 0) || (fromDecomp.scaleY < 0 && toDecomp.scaleX < 0)) {
</span><span class="lines">@@ -1544,11 +1541,8 @@
</span><span class="cx"> {
</span><span class="cx"> Decomposed4Type fromDecomp;
</span><span class="cx"> Decomposed4Type toDecomp;
</span><del>- if (!from.decompose4(fromDecomp) || !decompose4(toDecomp)) {
- if (progress < 0.5)
- *this = from;
- return;
- }
</del><ins>+ from.decompose4(fromDecomp);
+ decompose4(toDecomp);
</ins><span class="cx">
</span><span class="cx"> blendFloat(fromDecomp.scaleX, toDecomp.scaleX, progress);
</span><span class="cx"> blendFloat(fromDecomp.scaleY, toDecomp.scaleY, progress);
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformgraphicstransformsTransformationMatrixh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> bool decompose4(Decomposed4Type&) const;
</span><span class="cx"> void recompose4(const Decomposed4Type&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void blend(const TransformationMatrix& from, double progress);
</del><ins>+ void blend(const TransformationMatrix& from, double progress);
</ins><span class="cx"> void blend2(const TransformationMatrix& from, double progress);
</span><span class="cx"> void blend4(const TransformationMatrix& from, double progress);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -269,7 +269,8 @@
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(resolveBounds) object:nil];
</span><span class="cx">
</span><del>- [self performSelector:@selector(resolveBounds) withObject:nil afterDelay:animationDuration + 0.1];
</del><ins>+ if (!CGAffineTransformIsIdentity(transform))
+ [self performSelector:@selector(resolveBounds) withObject:nil afterDelay:animationDuration + 0.1];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -282,18 +283,13 @@
</span><span class="cx"> if ([_videoSublayer superlayer] != self)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (CGRectEqualToRect(self.modelVideoLayerFrame, [self bounds]) && CGAffineTransformIsIdentity([(UIView *)[_videoSublayer delegate] transform]))
- return;
-
</del><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setAnimationDuration:0];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx">
</span><del>- if (!CGRectEqualToRect(self.modelVideoLayerFrame, [self bounds])) {
- self.modelVideoLayerFrame = [self bounds];
- ASSERT(_fullscreenInterface->model());
- _fullscreenInterface->model()->setVideoLayerFrame(self.modelVideoLayerFrame);
- }
</del><ins>+ self.modelVideoLayerFrame = [self bounds];
+ ASSERT(_fullscreenInterface->model());
+ _fullscreenInterface->model()->setVideoLayerFrame(self.modelVideoLayerFrame);
</ins><span class="cx"> [(UIView *)[_videoSublayer delegate] setTransform:CGAffineTransformIdentity];
</span><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformmacPlatformScreenMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -143,10 +143,11 @@
</span><span class="cx"> if (!widget)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ auto colorSpace = screen(widget).colorSpace.CGColorSpace;
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><del>- return [screen(widget) canRepresentDisplayGamut:NSDisplayGamutP3];
</del><ins>+ return CGColorSpaceIsWideGamutRGB(colorSpace);
</ins><span class="cx"> #else
</span><del>- auto colorSpace = screen(widget).colorSpace.CGColorSpace;
</del><span class="cx"> auto iccData = adoptCF(CGColorSpaceCopyICCProfile(colorSpace));
</span><span class="cx"> auto profile = adoptCF(ColorSyncProfileCreate(iccData.get(), nullptr));
</span><span class="cx"> return profile && ColorSyncProfileIsWideGamut(profile.get());
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -55,15 +55,24 @@
</span><span class="cx"> static const int httpOK = 200;
</span><span class="cx"> static const int httpPartialContent = 206;
</span><span class="cx"> static const int httpNotAllowed = 403;
</span><ins>+static const int httpNotFound = 404;
</ins><span class="cx"> static const int httpRequestedRangeNotSatisfiable = 416;
</span><span class="cx"> static const int httpInternalError = 500;
</span><span class="cx"> static const char* httpOKText = "OK";
</span><span class="cx"> static const char* httpPartialContentText = "Partial Content";
</span><span class="cx"> static const char* httpNotAllowedText = "Not Allowed";
</span><ins>+static const char* httpNotFoundText = "Not Found";
</ins><span class="cx"> static const char* httpRequestedRangeNotSatisfiableText = "Requested Range Not Satisfiable";
</span><span class="cx"> static const char* httpInternalErrorText = "Internal Server Error";
</span><span class="cx">
</span><span class="cx"> static const char* const webKitBlobResourceDomain = "WebKitBlobResource";
</span><ins>+enum {
+ notFoundError = 1,
+ securityError = 2,
+ rangeError = 3,
+ notReadableError = 4,
+ methodNotAllowed = 5
+};
</ins><span class="cx">
</span><span class="cx"> ///////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> // BlobResourceSynchronousLoader
</span><span class="lines">@@ -94,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> // We cannot handle the size that is more than maximum integer.
</span><span class="cx"> if (response.expectedContentLength() > INT_MAX) {
</span><del>- m_error = ResourceError(webKitBlobResourceDomain, static_cast<int>(BlobResourceHandle::Error::NotReadableError), response.url(), "File is too large");
</del><ins>+ m_error = ResourceError(webKitBlobResourceDomain, notReadableError, response.url(), "File is too large");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,7 +132,7 @@
</span><span class="cx"> void BlobResourceHandle::loadResourceSynchronously(BlobData* blobData, const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span><span class="cx"> {
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(request.httpMethod(), "get")) {
</span><del>- error = ResourceError(webKitBlobResourceDomain, static_cast<int>(Error::MethodNotAllowed), response.url(), "Request method must be GET");
</del><ins>+ error = ResourceError(webKitBlobResourceDomain, methodNotAllowed, response.url(), "Request method must be GET");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -179,17 +188,18 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (erroredOrAborted())
</del><ins>+ if (m_aborted || m_errorCode)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(firstRequest().httpMethod(), "get")) {
</span><del>- notifyFail(Error::MethodNotAllowed);
</del><ins>+ notifyFail(methodNotAllowed);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the blob data is not found, fail now.
</span><span class="cx"> if (!m_blobData) {
</span><del>- notifyFail(Error::NotFoundError);
</del><ins>+ m_errorCode = notFoundError;
+ notifyResponse();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -196,7 +206,7 @@
</span><span class="cx"> // Parse the "Range" header we care about.
</span><span class="cx"> String range = firstRequest().httpHeaderField(HTTPHeaderName::Range);
</span><span class="cx"> if (!range.isEmpty() && !parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
</span><del>- m_errorCode = Error::RangeError;
</del><ins>+ m_errorCode = rangeError;
</ins><span class="cx"> notifyResponse();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -205,7 +215,7 @@
</span><span class="cx"> getSizeForNext();
</span><span class="cx"> else {
</span><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this); // getSizeForNext calls the client
</span><del>- for (size_t i = 0; i < m_blobData->items().size() && !erroredOrAborted(); ++i)
</del><ins>+ for (size_t i = 0; i < m_blobData->items().size() && !m_aborted && !m_errorCode; ++i)
</ins><span class="cx"> getSizeForNext();
</span><span class="cx"> notifyResponse();
</span><span class="cx"> }
</span><span class="lines">@@ -251,12 +261,13 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (erroredOrAborted())
</del><ins>+ if (m_aborted || m_errorCode)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the size is -1, it means the file has been moved or changed. Fail now.
</span><span class="cx"> if (size == -1) {
</span><del>- notifyFail(Error::NotFoundError);
</del><ins>+ m_errorCode = notFoundError;
+ notifyResponse();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -318,13 +329,13 @@
</span><span class="cx"> int remaining = length;
</span><span class="cx"> while (remaining) {
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (erroredOrAborted())
</del><ins>+ if (m_aborted || m_errorCode)
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // If there is no more remaining data to read, we are done.
</span><span class="cx"> if (!m_totalRemainingSize || m_readItemCount >= m_blobData->items().size())
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> const BlobDataItem& item = m_blobData->items().at(m_readItemCount);
</span><span class="cx"> int bytesRead = 0;
</span><span class="cx"> if (item.type() == BlobDataItem::Type::Data)
</span><span class="lines">@@ -341,7 +352,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int result;
</span><del>- if (erroredOrAborted())
</del><ins>+ if (m_aborted || m_errorCode)
</ins><span class="cx"> result = -1;
</span><span class="cx"> else
</span><span class="cx"> result = length - remaining;
</span><span class="lines">@@ -390,7 +401,7 @@
</span><span class="cx"> bool success = m_stream->openForRead(item.file()->path(), item.offset() + m_currentItemReadSize, bytesToRead);
</span><span class="cx"> m_currentItemReadSize = 0;
</span><span class="cx"> if (!success) {
</span><del>- m_errorCode = Error::NotReadableError;
</del><ins>+ m_errorCode = notReadableError;
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,7 +410,7 @@
</span><span class="cx">
</span><span class="cx"> int bytesRead = m_stream->read(buf, length);
</span><span class="cx"> if (bytesRead < 0) {
</span><del>- m_errorCode = Error::NotReadableError;
</del><ins>+ m_errorCode = notReadableError;
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> if (!bytesRead) {
</span><span class="lines">@@ -418,7 +429,7 @@
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (erroredOrAborted())
</del><ins>+ if (m_aborted || m_errorCode)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If there is no more remaining data to read, we are done.
</span><span class="lines">@@ -474,7 +485,7 @@
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx">
</span><span class="cx"> if (!success) {
</span><del>- failed(Error::NotReadableError);
</del><ins>+ failed(notReadableError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -485,7 +496,7 @@
</span><span class="cx"> void BlobResourceHandle::didRead(int bytesRead)
</span><span class="cx"> {
</span><span class="cx"> if (bytesRead < 0) {
</span><del>- failed(Error::NotReadableError);
</del><ins>+ failed(notReadableError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -522,7 +533,7 @@
</span><span class="cx"> readAsync();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceHandle::failed(Error errorCode)
</del><ins>+void BlobResourceHandle::failed(int errorCode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this);
</span><span class="lines">@@ -542,7 +553,7 @@
</span><span class="cx"> if (!client())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_errorCode != Error::NoError) {
</del><ins>+ if (m_errorCode) {
</ins><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this);
</span><span class="cx"> notifyResponseOnError();
</span><span class="cx"> notifyFinish();
</span><span class="lines">@@ -579,15 +590,19 @@
</span><span class="cx">
</span><span class="cx"> void BlobResourceHandle::notifyResponseOnError()
</span><span class="cx"> {
</span><del>- ASSERT(m_errorCode != Error::NoError);
</del><ins>+ ASSERT(m_errorCode);
</ins><span class="cx">
</span><span class="cx"> ResourceResponse response(firstRequest().url(), "text/plain", 0, String());
</span><span class="cx"> switch (m_errorCode) {
</span><del>- case Error::RangeError:
</del><ins>+ case rangeError:
</ins><span class="cx"> response.setHTTPStatusCode(httpRequestedRangeNotSatisfiable);
</span><span class="cx"> response.setHTTPStatusText(httpRequestedRangeNotSatisfiableText);
</span><span class="cx"> break;
</span><del>- case Error::SecurityError:
</del><ins>+ case notFoundError:
+ response.setHTTPStatusCode(httpNotFound);
+ response.setHTTPStatusText(httpNotFoundText);
+ break;
+ case securityError:
</ins><span class="cx"> response.setHTTPStatusCode(httpNotAllowed);
</span><span class="cx"> response.setHTTPStatusText(httpNotAllowedText);
</span><span class="cx"> break;
</span><span class="lines">@@ -611,10 +626,10 @@
</span><span class="cx"> client()->didReceiveBuffer(this, SharedBuffer::create(data, bytesRead), bytesRead);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceHandle::notifyFail(Error errorCode)
</del><ins>+void BlobResourceHandle::notifyFail(int errorCode)
</ins><span class="cx"> {
</span><span class="cx"> if (client())
</span><del>- client()->didFail(this, ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), firstRequest().url(), String()));
</del><ins>+ client()->didFail(this, ResourceError(webKitBlobResourceDomain, errorCode, firstRequest().url(), String()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void doNotifyFinish(BlobResourceHandle& handle)
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebCoreplatformnetworkBlobResourceHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -55,15 +55,6 @@
</span><span class="cx">
</span><span class="cx"> bool aborted() const { return m_aborted; }
</span><span class="cx">
</span><del>- enum class Error {
- NoError = 0,
- NotFoundError = 1,
- SecurityError = 2,
- RangeError = 3,
- NotReadableError = 4,
- MethodNotAllowed = 5
- };
-
</del><span class="cx"> private:
</span><span class="cx"> BlobResourceHandle(BlobData*, const ResourceRequest&, ResourceHandleClient*, bool async);
</span><span class="cx"> virtual ~BlobResourceHandle();
</span><span class="lines">@@ -81,7 +72,7 @@
</span><span class="cx"> void getSizeForNext();
</span><span class="cx"> void seek();
</span><span class="cx"> void consumeData(const char* data, int bytesRead);
</span><del>- void failed(Error);
</del><ins>+ void failed(int errorCode);
</ins><span class="cx">
</span><span class="cx"> void readAsync();
</span><span class="cx"> void readDataAsync(const BlobDataItem&);
</span><span class="lines">@@ -94,11 +85,9 @@
</span><span class="cx"> void notifyResponseOnSuccess();
</span><span class="cx"> void notifyResponseOnError();
</span><span class="cx"> void notifyReceiveData(const char*, int);
</span><del>- void notifyFail(Error);
</del><ins>+ void notifyFail(int errorCode);
</ins><span class="cx"> void notifyFinish();
</span><span class="cx">
</span><del>- bool erroredOrAborted() const { return m_aborted || m_errorCode != Error::NoError; }
-
</del><span class="cx"> enum { kPositionNotSpecified = -1 };
</span><span class="cx">
</span><span class="cx"> RefPtr<BlobData> m_blobData;
</span><span class="lines">@@ -107,7 +96,7 @@
</span><span class="cx"> std::unique_ptr<FileStream> m_stream; // For synchronous loading.
</span><span class="cx"> Vector<char> m_buffer;
</span><span class="cx"> Vector<long long> m_itemLengthList;
</span><del>- Error m_errorCode { Error::NoError };
</del><ins>+ int m_errorCode { 0 };
</ins><span class="cx"> bool m_aborted { false };
</span><span class="cx"> long long m_rangeOffset { kPositionNotSpecified };
</span><span class="cx"> long long m_rangeEnd { kPositionNotSpecified };
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebInspectorUI/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebInspectorUI/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebInspectorUI/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,18 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204428. rdar://problem/28476954
-
- 2016-08-12 Nikita Vasilyev <nvasilyev@apple.com>
-
- Web Inspector: Command-Shift-O causes infinite loop if web page has frames
- https://bugs.webkit.org/show_bug.cgi?id=160810
-
- Reviewed by Joseph Pecoraro.
-
- * UserInterface/Views/OpenResourceDialog.js:
- (WebInspector.OpenResourceDialog.prototype._addResourcesForFrame):
- "frame" doesn't change inside the loop.
-
</del><span class="cx"> 2016-09-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r205192. rdar://problem/28097740
</span></span></pre></div>
<a id="branchessafari6022140branchSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> for (let resource of resources)
</span><span class="cx"> this._addResource(resource, suppressFilterUpdate);
</span><span class="cx">
</span><del>- frames = frames.concat(currentFrame.childFrames);
</del><ins>+ frames = frames.concat(frame.childFrames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._updateFilter();
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,35 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r204091. rdar://problem/28476960
-
- 2016-08-03 Geoffrey Garen <ggaren@apple.com>
-
- [bmalloc] Merging of XLargeRanges can leak the upper range
- https://bugs.webkit.org/show_bug.cgi?id=160403
-
- Reviewed by Michael Saboff.
-
- * bmalloc/Heap.cpp:
- (bmalloc::Heap::scavengeLargeObjects): Don't use removePhysical().
- Recorded physical size is a performance optimization. It is not the
- truth. So it might be zero even if a range contains physical pages.
-
- Instead, iterate each range in the map unconditionally.
-
- The map can shrink when we release the lock, so we must clamp our
- iterator each time through the loop.
-
- The map can grow when we release the lock, but we don't care because
- growth restarts the scavenger from the beginning.
-
- * bmalloc/XLargeMap.cpp:
- (bmalloc::XLargeMap::removePhysical): Deleted. Not used anymore.
-
- * bmalloc/XLargeMap.h:
- (bmalloc::XLargeMap::ranges): Added direct access for the sake of
- scavengeLargeObjects. (This violates our naming conventions -- I'll do
- a rename in a follow-up patch.)
-
</del><span class="cx"> 2016-07-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Update supported platforms in xcconfig files to match the sdk names.
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -131,16 +131,13 @@
</span><span class="cx">
</span><span class="cx"> void Heap::scavengeLargeObjects(std::unique_lock<StaticMutex>& lock, std::chrono::milliseconds sleepDuration)
</span><span class="cx"> {
</span><del>- auto& ranges = m_largeFree.ranges();
- for (size_t i = ranges.size(); i-- > 0; i = std::min(i, ranges.size())) {
- auto range = ranges.pop(i);
-
</del><ins>+ while (XLargeRange range = m_largeFree.removePhysical()) {
</ins><span class="cx"> lock.unlock();
</span><span class="cx"> vmDeallocatePhysicalPagesSloppy(range.begin(), range.size());
</span><span class="cx"> lock.lock();
</span><del>-
</del><ins>+
</ins><span class="cx"> range.setPhysicalSize(0);
</span><del>- ranges.push(range);
</del><ins>+ m_largeFree.add(range);
</ins><span class="cx">
</span><span class="cx"> waitUntilFalse(lock, sleepDuration, m_isAllocatingPages);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocXLargeMapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -76,4 +76,16 @@
</span><span class="cx"> m_free.push(merged);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+XLargeRange XLargeMap::removePhysical()
+{
+ auto it = std::find_if(m_free.begin(), m_free.end(), [](const XLargeRange& range) {
+ return range.physicalSize();
+ });
+
+ if (it == m_free.end())
+ return XLargeRange();
+
+ return m_free.pop(it);
+}
+
</ins><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocXLargeMaph"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> public:
</span><span class="cx"> void add(const XLargeRange&);
</span><span class="cx"> XLargeRange remove(size_t alignment, size_t);
</span><del>- Vector<XLargeRange>& ranges() { return m_free; }
</del><ins>+ XLargeRange removePhysical();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Vector<XLargeRange> m_free;
</span></span></pre></div>
<a id="branchessafari6022140branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Tools/ChangeLog (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Tools/ChangeLog 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Tools/ChangeLog 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,22 +1,3 @@
</span><del>-2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r205197. rdar://problem/28481424
-
- 2016-08-30 Brent Fulgham <bfulgham@apple.com>
-
- Use of uninitialised memory in TransformationMatrx::blend4()
- https://bugs.webkit.org/show_bug.cgi?id=134621
- <rdar://problem/27337539>
-
- Reviewed by Dean Jackson.
-
- Change is based on the Blink change (patch by <alancutter@chromium.org>):
- <https://src.chromium.org/viewvc/blink?revision=177453&view=revision>
-
- * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
- * TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp: Added.
- (TestWebKitAPI::TEST):
-
</del><span class="cx"> 2016-09-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206527. rdar://problem/28499358
</span></span></pre></div>
<a id="branchessafari6022140branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> 76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76E182DC1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp */; };
</span><span class="cx"> 76E182DF154767E600F1FADD /* auto-submitting-form.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 76E182DE15475A8300F1FADD /* auto-submitting-form.html */; };
</span><span class="cx"> 7A1458FC1AD5C07000E06772 /* mouse-button-listener.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7A1458FB1AD5C03500E06772 /* mouse-button-listener.html */; };
</span><del>- 7AD3FE8E1D76131200B169A4 /* TransformationMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */; };
</del><span class="cx"> 7AE9E5091AE5AE8B00CF874B /* test.pdf in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7AE9E5081AE5AE8B00CF874B /* test.pdf */; };
</span><span class="cx"> 7C3965061CDD74F90094DBB8 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3965051CDD74F90094DBB8 /* Color.cpp */; };
</span><span class="cx"> 7C3DB8E41D12129B00AE8CC3 /* CommandBackForward.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */; };
</span><span class="lines">@@ -903,7 +902,6 @@
</span><span class="cx"> 7A99D9931AD4A29D00373141 /* MenuTypesForMouseEvents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MenuTypesForMouseEvents.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7AA021BA1AB09EA70052953F /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7AA6A1511AAC0B31002B2ED3 /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
</span><del>- 7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformationMatrix.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 7AE9E5081AE5AE8B00CF874B /* test.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test.pdf; sourceTree = "<group>"; };
</span><span class="cx"> 7C3965051CDD74F90094DBB8 /* Color.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CommandBackForward.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -1377,7 +1375,6 @@
</span><span class="cx"> CD225C071C45A69200140761 /* ParsedContentRange.cpp */,
</span><span class="cx"> 41973B5C1AF22875006C7B36 /* SharedBuffer.cpp */,
</span><span class="cx"> CDC2C7141797089D00E627FB /* TimeRanges.cpp */,
</span><del>- 7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */,
</del><span class="cx"> 440A1D3814A0103A008A66F2 /* URL.cpp */,
</span><span class="cx"> 7C3965051CDD74F90094DBB8 /* Color.cpp */,
</span><span class="cx"> );
</span><span class="lines">@@ -2433,7 +2430,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
</span><del>- 7AD3FE8E1D76131200B169A4 /* TransformationMatrix.cpp in Sources */,
</del><span class="cx"> 2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span></span></pre></div>
<a id="branchessafari6022140branchToolsTestWebKitAPITestsWebCoreTransformationMatrixcpp"></a>
<div class="delfile"><h4>Deleted: branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp (207261 => 207262)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp 2016-10-12 23:12:52 UTC (rev 207261)
+++ branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp 2016-10-12 23:17:52 UTC (rev 207262)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (c) 2013, Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#include "config.h"
-#include <WebCore/TransformationMatrix.h>
-
-using namespace WebCore;
-
-namespace TestWebKitAPI {
-
-TEST(TransformationMatrix, NonInvertableBlend)
-{
- TransformationMatrix from;
- TransformationMatrix to(2.7133590938, 0.0, 0.0, 0.0, 0.0, 2.4645137761, 0.0, 0.0, 0.0, 0.0, 0.00, 0.01, 0.02, 0.03, 0.04, 0.05);
- TransformationMatrix result;
-
- result = to;
- result.blend(from, 0.25);
- EXPECT_TRUE(result == from);
-
- result = to;
- result.blend(from, 0.75);
- EXPECT_TRUE(result == to);
-}
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>