Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1391)

Unified Diff: Source/core/loader/FrameFetchContextTest.cpp

Issue 1328763002: Make the low priority iframe flag affect all resources in cross origin iframes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase + remove unused top() override Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameFetchContextTest.cpp
diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp
index 2d764a62852fa9a42c111cfce7ef291775571558..f1aef3701849bd1e6c611d6eaccdfb57978544e1 100644
--- a/Source/core/loader/FrameFetchContextTest.cpp
+++ b/Source/core/loader/FrameFetchContextTest.cpp
@@ -431,7 +431,6 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments)
settings->setFEtchIncreaseFontPriority(false);
settings->setFEtchDeferLateScripts(false);
settings->setFEtchIncreasePriorities(false);
- settings->setLowPriorityIframes(false);
// Base case, no priority change. Note that this triggers m_imageFetched, which will matter for setFetchDeferLateScripts() case below.
EXPECT_EQ(ResourceLoadPriorityLow, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityLow, Resource::Image, request));
@@ -479,12 +478,6 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments)
settings->setFEtchIncreaseAsyncScriptPriority(true);
EXPECT_EQ(ResourceLoadPriorityMedium, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, deferredRequest));
- // Set up a child frame, test main resource load with and without setLowPriorityIframes()
- FrameFetchContext* childFetchContext = createChildFrame();
- EXPECT_EQ(ResourceLoadPriorityVeryHigh, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request));
- settings->setLowPriorityIframes(true);
- EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request));
-
// Ensure we don't go out of bounds
settings->setFEtchIncreasePriorities(true);
EXPECT_EQ(ResourceLoadPriorityVeryHigh, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::Script, request));
@@ -493,4 +486,21 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments)
EXPECT_EQ(ResourceLoadPriorityVeryLow, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryLow, Resource::Script, preloadRequest));
}
+TEST_F(FrameFetchContextTest, ModifyPriorityForLowPriorityIframes)
+{
+ Settings* settings = document->frame()->settings();
+ settings->setLowPriorityIframes(false);
+ FetchRequest request(ResourceRequest("http://www.example.com"), FetchInitiatorInfo());
+ FrameFetchContext* childFetchContext = createChildFrame();
+
+ // No low priority iframes, expect default values.
+ EXPECT_EQ(ResourceLoadPriorityVeryHigh, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request));
+ EXPECT_EQ(ResourceLoadPriorityMedium, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, request));
+
+ // Low priority iframes enabled, everything should be low priority
+ settings->setLowPriorityIframes(true);
+ EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request));
+ EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, request));
+}
+
} // namespace
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698