Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (190769 => 190770)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-09 02:06:54 UTC (rev 190769)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-09 02:16:27 UTC (rev 190770)
@@ -1,3 +1,20 @@
+2015-10-08 Lucas Forschler <[email protected]>
+
+ Merge r189976. rdar://problem/22824652
+
+ 2015-09-18 Chris Dumez <[email protected]>
+
+ REGRESSION (r182449, Mavericks ONLY): Pages re-open empty after swiping back and scrolling on them
+ https://bugs.webkit.org/show_bug.cgi?id=149317
+ <rdar://problem/22521514>
+
+ Reviewed by Tim Horton.
+
+ Skip a couple of PageCache layout tests on Mavericks now that a PageCache
+ optimization has been disabled.
+
+ * platform/mac/TestExpectations:
+
2015-10-08 Andy Estes <[email protected]>
Merge r188150, r188517, r188844, r188845, r188851, r188852, r188880, r188881, r188988, r189193, r189289, and r190133.
Modified: branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations (190769 => 190770)
--- branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2015-10-09 02:06:54 UTC (rev 190769)
+++ branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2015-10-09 02:16:27 UTC (rev 190770)
@@ -269,6 +269,11 @@
# Font feature settings is not implemented.
css3/font-feature-settings-rendering.html
+# This feature is disabled on Mavericks.
+[ Mavericks ] http/tests/navigation/page-cache-pending-image-load.html [ Skip ]
+[ Mavericks ] http/tests/navigation/page-cache-pending-image-load-cache-partition.html [ Skip ]
+[ Mavericks ] http/tests/navigation/page-cache-xhr.html [ Skip ]
+
webkit.org/b/68278 http/tests/history/back-with-fragment-change.php [ Failure ]
# Skip because this platform does not support a paging mouse wheel event
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190769 => 190770)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-09 02:06:54 UTC (rev 190769)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-09 02:16:27 UTC (rev 190770)
@@ -1,3 +1,23 @@
+2015-10-08 Lucas Forschler <[email protected]>
+
+ Merge r189976. rdar://problem/22824652
+
+ 2015-09-18 Chris Dumez <[email protected]>
+
+ REGRESSION (r182449, Mavericks ONLY): Pages re-open empty after swiping back and scrolling on them
+ https://bugs.webkit.org/show_bug.cgi?id=149317
+ <rdar://problem/22521514>
+
+ Reviewed by Tim Horton.
+
+ Disable on Mavericks a PageCache optimization from r182449 which lets
+ into PageCache pages that only have certain types of pending loads
+ (images and XHR). This is because it has been determined via bisection
+ that this change is the one that introduced the bug on Mavericks.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::areAllLoadersPageCacheAcceptable):
+
2015-10-08 Andy Estes <[email protected]>
Merge r188150, r188517, r188844, r188845, r188851, r188852, r188880, r188881, r188988, r189193, r189289, and r190133.
Modified: branches/safari-601-branch/Source/WebCore/loader/DocumentLoader.cpp (190769 => 190770)
--- branches/safari-601-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-10-09 02:06:54 UTC (rev 190769)
+++ branches/safari-601-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-10-09 02:16:27 UTC (rev 190770)
@@ -95,6 +95,7 @@
loader->setDefersLoading(defers);
}
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
{
Vector<RefPtr<ResourceLoader>> loadersCopy;
@@ -114,6 +115,7 @@
}
return true;
}
+#endif
DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData)
: m_deferMainResourceDataLoad(true)
@@ -286,8 +288,11 @@
// loading but there are subresource loads during cancellation. This must be done before the
// frame->stopLoading() call, which may evict the CachedResources, which we rely on to check
// the type of the resource loads.
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ // Disabled on Mavericks because it seems to cause issues (rdar://problem/22521514).
if (loading && m_committed && !mainResourceLoader() && !m_subresourceLoaders.isEmpty())
m_subresourceLoadersArePageCacheAcceptable = areAllLoadersPageCacheAcceptable(m_subresourceLoaders);
+#endif
if (m_committed) {
// Attempt to stop the frame if the document loader is loading, or if it is done loading but
