Title: [188145] trunk/Source/WebCore
- Revision
- 188145
- Author
- [email protected]
- Date
- 2015-08-07 12:08:06 -0700 (Fri, 07 Aug 2015)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188144 => 188145)
--- 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)
@@ -1,3 +1,18 @@
+2015-08-07 Commit Queue <[email protected]>
+
+ 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
+
2015-08-07 Alex Christensen <[email protected]>
Fix WinCairo build after r188130.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (188144 => 188145)
--- 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)
@@ -77,10 +77,6 @@
#include "ContentFilter.h"
#endif
-#if HAVE(PARENTAL_CONTROLS)
-#include "ParentalControlsContentFilter.h"
-#endif
-
namespace WebCore {
static void cancelAll(const ResourceLoaderMap& loaders)
@@ -553,19 +549,7 @@
if (!redirectResponse.isNull()) {
// We checked application cache for initial URL, now we need to check it for redirected one.
ASSERT(!m_substituteData.isValid());
-
- 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);
-
+ m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
if (m_substituteData.isValid()) {
RELEASE_ASSERT(m_mainResource);
ResourceLoader* loader = m_mainResource->loader();
@@ -1435,18 +1419,8 @@
if (!m_frame || m_request.isNull())
return;
- bool shouldTryApplicationCache = true;
+ m_applicationCacheHost->maybeLoadMainResource(m_request, m_substituteData);
-#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);
-
if (m_substituteData.isValid()) {
m_identifierForLoadWithoutResourceLoader = m_frame->page()->progress().createUniqueIdentifier();
frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, m_request);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
