<!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>[198454] trunk/Source/WebCore</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/198454">198454</a></dd>

<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>

<dt>Date</dt> <dd>2016-03-18 16:59:27 -0700 (Fri, 18 Mar 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/198443">r198443</a>.

This change caused API test failures on El Capitan

Reverted changeset:

&quot;CRASH in WebCore::MediaResourceLoader::requestResource + 698&quot;

https://bugs.webkit.org/show_bug.cgi?id=155651

http://trac.webkit.org/changeset/198443</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>

<li><a href="#trunkSourceWebCoreloaderMediaResourceLoaderh">trunk/Source/WebCore/loader/MediaResourceLoader.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198453 => 198454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-18 23:53:44 UTC (rev 198453)

+++ trunk/Source/WebCore/ChangeLog        2016-03-18 23:59:27 UTC (rev 198454)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2016-03-18  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;

+

+        Unreviewed, rolling out r198443.

+

+        This change caused API test failures on El Capitan

+

+        Reverted changeset:

+

+        &quot;CRASH in WebCore::MediaResourceLoader::requestResource + 698&quot;

+        https://bugs.webkit.org/show_bug.cgi?id=155651

+        http://trac.webkit.org/changeset/198443

+

</ins><span class="cx"> 2016-03-18  Darin Adler  &lt;darin@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         ASSERTION FAILED: m_isValid == valid() in WebCore::HTMLFormControlElement::isValidFormControlElement

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (198453 => 198454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp        2016-03-18 23:53:44 UTC (rev 198453)

+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp        2016-03-18 23:59:27 UTC (rev 198454)

</span><span class="lines">@@ -1,6 +1,5 @@

</span><span class="cx"> /*

</span><span class="cx">  * Copyright (C) 2014 Igalia S.L

</del><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">@@ -40,8 +39,7 @@

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

</span><span class="cx"> MediaResourceLoader::MediaResourceLoader(Document&amp; document, const String&amp; crossOriginMode)

</span><del>-    : ContextDestructionObserver(&amp;document)

-    , m_document(&amp;document)

</del><ins>+    : m_document(document)

</ins><span class="cx">     , m_crossOriginMode(crossOriginMode)

</span><span class="cx"> {

</span><span class="cx"> }

</span><span class="lines">@@ -51,16 +49,8 @@

</span><span class="cx">     ASSERT(m_resources.isEmpty());

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void MediaResourceLoader::contextDestroyed()

-{

-    m_document = nullptr;

-}

-

</del><span class="cx"> RefPtr&lt;PlatformMediaResource&gt; MediaResourceLoader::requestResource(const ResourceRequest&amp; request, LoadOptions options)

</span><span class="cx"> {

</span><del>-    if (!m_document)

-        return nullptr;

-

</del><span class="cx">     DataBufferingPolicy bufferingPolicy = options &amp; LoadOption::BufferData ? WebCore::BufferData : WebCore::DoNotBufferData;

</span><span class="cx">     RequestOriginPolicy corsPolicy = !m_crossOriginMode.isNull() ? PotentiallyCrossOriginEnabled : UseDefaultOriginRestrictionsForType;

</span><span class="cx">     StoredCredentials allowCredentials = m_crossOriginMode.isNull() || equalLettersIgnoringASCIICase(m_crossOriginMode, &quot;use-credentials&quot;) ? AllowStoredCredentials : DoNotAllowStoredCredentials;

</span><span class="lines">@@ -70,9 +60,9 @@

</span><span class="cx">     CachedResourceRequest cacheRequest(request, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching));

</span><span class="cx"> 

</span><span class="cx">     if (!m_crossOriginMode.isNull())

</span><del>-        updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document-&gt;securityOrigin(), allowCredentials);

</del><ins>+        updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document.securityOrigin(), allowCredentials);

</ins><span class="cx"> 

</span><del>-    CachedResourceHandle&lt;CachedRawResource&gt; resource = m_document-&gt;cachedResourceLoader().requestMedia(cacheRequest);

</del><ins>+    CachedResourceHandle&lt;CachedRawResource&gt; resource = m_document.cachedResourceLoader().requestMedia(cacheRequest);

</ins><span class="cx">     if (!resource)

</span><span class="cx">         return nullptr;

</span><span class="cx"> 

</span><span class="lines">@@ -126,13 +116,10 @@

</span><span class="cx"> {

</span><span class="cx">     ASSERT_UNUSED(resource, resource == m_resource);

</span><span class="cx"> 

</span><del>-    if (!m_loader-&gt;document())

-        return;

-

</del><span class="cx">     RefPtr&lt;MediaResource&gt; protect(this);

</span><del>-    if (!m_loader-&gt;crossOriginMode().isNull() &amp;&amp; !resource-&gt;passesSameOriginPolicyCheck(*m_loader-&gt;document()-&gt;securityOrigin())) {

</del><ins>+    if (!m_loader-&gt;crossOriginMode().isNull() &amp;&amp; !resource-&gt;passesSameOriginPolicyCheck(*m_loader-&gt;document().securityOrigin())) {

</ins><span class="cx">         static NeverDestroyed&lt;const String&gt; consoleMessage(&quot;Cross-origin media resource load denied by Cross-Origin Resource Sharing policy.&quot;);

</span><del>-        m_loader-&gt;document()-&gt;addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());

</del><ins>+        m_loader-&gt;document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());

</ins><span class="cx">         m_didPassAccessControlCheck = false;

</span><span class="cx">         if (m_client)

</span><span class="cx">             m_client-&gt;accessControlCheckFailed(*this, ResourceError(errorDomainWebKitInternal, 0, response.url(), consoleMessage.get()));

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderMediaResourceLoaderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.h (198453 => 198454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.h        2016-03-18 23:53:44 UTC (rev 198453)

+++ trunk/Source/WebCore/loader/MediaResourceLoader.h        2016-03-18 23:59:27 UTC (rev 198454)

</span><span class="lines">@@ -29,7 +29,6 @@

</span><span class="cx"> #if ENABLE(VIDEO)

</span><span class="cx"> #include &quot;CachedRawResourceClient.h&quot;

</span><span class="cx"> #include &quot;CachedResourceHandle.h&quot;

</span><del>-#include &quot;ContextDestructionObserver.h&quot;

</del><span class="cx"> #include &quot;PlatformMediaResourceLoader.h&quot;

</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;

</span><span class="cx"> #include &lt;wtf/Ref.h&gt;

</span><span class="lines">@@ -41,7 +40,7 @@

</span><span class="cx"> class Document;

</span><span class="cx"> class MediaResource;

</span><span class="cx"> 

</span><del>-class MediaResourceLoader final : public PlatformMediaResourceLoader, public ContextDestructionObserver {

</del><ins>+class MediaResourceLoader final : public PlatformMediaResourceLoader {

</ins><span class="cx"> public:

</span><span class="cx">     WEBCORE_EXPORT MediaResourceLoader(Document&amp;, const String&amp; crossOriginMode);

</span><span class="cx">     WEBCORE_EXPORT virtual ~MediaResourceLoader();

</span><span class="lines">@@ -49,13 +48,11 @@

</span><span class="cx">     RefPtr&lt;PlatformMediaResource&gt; requestResource(const ResourceRequest&amp;, LoadOptions) override;

</span><span class="cx">     void removeResource(MediaResource&amp;);

</span><span class="cx"> 

</span><del>-    Document* document() { return m_document; }

</del><ins>+    Document&amp; document() { return m_document; }

</ins><span class="cx">     const String&amp; crossOriginMode() const { return m_crossOriginMode; }

</span><span class="cx"> 

</span><span class="cx"> private:

</span><del>-    void contextDestroyed() override;

-

-    Document* m_document;

</del><ins>+    Document&amp; m_document;

</ins><span class="cx">     String m_crossOriginMode;

</span><span class="cx">     HashSet&lt;MediaResource*&gt; m_resources;

</span><span class="cx"> };

</span></span></pre>

</div>

</div>

</body>

</html>