<!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>[188145] 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/188145">188145</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-07 12:08:06 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/187907">r187907</a>.
https://bugs.webkit.org/show_bug.cgi?id=147789
taking a different approach to the fix (Requested by estes on
#webkit).
Reverted changeset:
"Crash when following a Google search link to Twitter with
Limit Adult Content enabled."
https://bugs.webkit.org/show_bug.cgi?id=147651
http://trac.webkit.org/changeset/187907</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188144 => 188145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-07 18:51:00 UTC (rev 188144)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 19:08:06 UTC (rev 188145)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r187907.
+ https://bugs.webkit.org/show_bug.cgi?id=147789
+
+ taking a different approach to the fix (Requested by estes on
+ #webkit).
+
+ Reverted changeset:
+
+ "Crash when following a Google search link to Twitter with
+ Limit Adult Content enabled."
+ https://bugs.webkit.org/show_bug.cgi?id=147651
+ http://trac.webkit.org/changeset/187907
+
</ins><span class="cx"> 2015-08-07 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix WinCairo build after r188130.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (188144 => 188145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-08-07 18:51:00 UTC (rev 188144)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-08-07 19:08:06 UTC (rev 188145)
</span><span class="lines">@@ -77,10 +77,6 @@
</span><span class="cx"> #include "ContentFilter.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if HAVE(PARENTAL_CONTROLS)
-#include "ParentalControlsContentFilter.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static void cancelAll(const ResourceLoaderMap& loaders)
</span><span class="lines">@@ -553,19 +549,7 @@
</span><span class="cx"> if (!redirectResponse.isNull()) {
</span><span class="cx"> // We checked application cache for initial URL, now we need to check it for redirected one.
</span><span class="cx"> ASSERT(!m_substituteData.isValid());
</span><del>-
- bool shouldTryApplicationCache = true;
-
-#if HAVE(PARENTAL_CONTROLS)
- // There are poor interactions between the ApplicationCache and parental controls (<rdar://problem/22123707>)
- // so, for now, don't use the AppCache for redirects if parental controls are enabled.
- if (ParentalControlsContentFilter::enabled())
- shouldTryApplicationCache = false;
-#endif
-
- if (shouldTryApplicationCache)
- m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
-
</del><ins>+ m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
</ins><span class="cx"> if (m_substituteData.isValid()) {
</span><span class="cx"> RELEASE_ASSERT(m_mainResource);
</span><span class="cx"> ResourceLoader* loader = m_mainResource->loader();
</span><span class="lines">@@ -1435,18 +1419,8 @@
</span><span class="cx"> if (!m_frame || m_request.isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool shouldTryApplicationCache = true;
</del><ins>+ m_applicationCacheHost->maybeLoadMainResource(m_request, m_substituteData);
</ins><span class="cx">
</span><del>-#if HAVE(PARENTAL_CONTROLS)
- // There are poor interactions between the ApplicationCache and parental controls (<rdar://problem/22123707>)
- // so, for now, don't use the AppCache for redirects if parental controls are enabled.
- if (ParentalControlsContentFilter::enabled())
- shouldTryApplicationCache = false;
-#endif
-
- if (shouldTryApplicationCache)
- m_applicationCacheHost->maybeLoadMainResource(m_request, m_substituteData);
-
</del><span class="cx"> if (m_substituteData.isValid()) {
</span><span class="cx"> m_identifierForLoadWithoutResourceLoader = m_frame->page()->progress().createUniqueIdentifier();
</span><span class="cx"> frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, m_request);
</span></span></pre>
</div>
</div>
</body>
</html>