Make the low priority iframe flag affect all resources in cross origin iframes

Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 43 matching lines @@
         return adoptPtrWillBeNoop(new StubFrameLoaderClientWithParent(parent));
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_parent);
         EmptyFrameLoaderClient::trace(visitor);
     }
 
     Frame* parent() const override { return m_parent.get(); }
+    Frame* top() const override { return m_parent.get(); }

[Bryan McQuade, 2015/09/04 16:40:28]

looks like this isn't used - can it be removed?

[Nate Chapin, 2015/09/04 21:52:32]

Done.

 
 private:
     explicit StubFrameLoaderClientWithParent(Frame* parent)
         : m_parent(parent)
     {
     }
 
     RawPtrWillBeMember<Frame> m_parent;
 };
 
@@ skipping 345 matching lines @@
     preloadRequest.setForPreload(true);
 
     FetchRequest deferredRequest(ResourceRequest("http://www.example.com"), FetchInitiatorInfo());
     deferredRequest.setDefer(FetchRequest::LazyLoad);
 
     // Start with all experiments disabled.
     settings->setFEtchIncreaseAsyncScriptPriority(false);
     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));
 
     // Font priority with and without fetchIncreaseFontPriority()
     EXPECT_EQ(ResourceLoadPriorityMedium, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Font, request));
     settings->setFEtchIncreaseFontPriority(true);
     EXPECT_EQ(ResourceLoadPriorityHigh, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Font, request));
 
     // Basic script cases
@@ skipping 27 matching lines @@
     // Re-test deferring late scripts.
     settings->setFEtchDeferLateScripts(true);
     EXPECT_EQ(ResourceLoadPriorityMedium, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, preloadRequest));
 
     // Re-test increasing priority of async scripts. Should ignore general incraesed priorities.
     settings->setFEtchIncreaseAsyncScriptPriority(false);
     EXPECT_EQ(ResourceLoadPriorityLow, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, deferredRequest));
     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));
     settings->setFEtchIncreasePriorities(false);
     settings->setFEtchDeferLateScripts(true);
     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