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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/resource_scheduler_unittest.cc

Issue 465363003: ResourceScheduler get visual signal from RenderViewHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do not throttle when should not Created 6 years, 4 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 | « content/browser/loader/resource_scheduler.cc ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_scheduler_unittest.cc
diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
index 3de46c5ceca922241f01daddac2d21e2b9713f59..ae8120424b307f247f833e04198e7ba81a1fd410 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -6,6 +6,7 @@
#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/timer/mock_timer.h"
#include "base/timer/timer.h"
@@ -19,12 +20,16 @@
#include "content/public/browser/resource_throttle.h"
#include "content/public/common/process_type.h"
#include "content/public/common/resource_type.h"
+#include "content/public/test/mock_render_process_host.h"
+#include "content/public/test/test_browser_context.h"
+#include "content/test/test_web_contents.h"
#include "net/base/host_port_pair.h"
#include "net/base/request_priority.h"
#include "net/http/http_server_properties_impl.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/latency_info.h"
namespace content {
@@ -146,9 +151,8 @@ class ResourceSchedulerTest : public testing::Test {
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId, kRouteId);
- scheduler_.OnVisibilityChanged(kChildId, kRouteId, true);
- scheduler_.OnClientCreated(kBackgroundChildId, kBackgroundRouteId);
+ scheduler_.OnClientCreated(kChildId, kRouteId, true);
+ scheduler_.OnClientCreated(kBackgroundChildId, kBackgroundRouteId, false);
context_.set_http_server_properties(http_server_properties_.GetWeakPtr());
}
@@ -639,7 +643,7 @@ TEST_F(ResourceSchedulerTest, ThrottledClientCreation) {
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
EXPECT_TRUE(scheduler_.should_throttle());
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
EXPECT_EQ(ResourceScheduler::THROTTLED,
scheduler_.GetClientStateForTesting(kBackgroundChildId2,
@@ -1023,8 +1027,8 @@ TEST_F(ResourceSchedulerTest,
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(kChildId2, kRouteId2, true);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
@@ -1079,8 +1083,8 @@ TEST_F(ResourceSchedulerTest,
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
scheduler_.OnVisibilityChanged(kChildId, kRouteId, false);
@@ -1136,8 +1140,8 @@ TEST_F(ResourceSchedulerTest,
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(kChildId2, kRouteId2, true);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
@@ -1191,8 +1195,8 @@ TEST_F(ResourceSchedulerTest,
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(kChildId2, kRouteId2, true);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
@@ -1247,13 +1251,12 @@ TEST_F(ResourceSchedulerTest, UnloadedClientBecomesHiddenCorrectlyUnthrottles) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
// 2 visible, 2 hidden
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
EXPECT_FALSE(scheduler_.active_clients_loaded());
EXPECT_EQ(ResourceScheduler::THROTTLED,
scheduler_.GetClientStateForTesting(kBackgroundChildId,
@@ -1316,8 +1319,8 @@ TEST_F(ResourceSchedulerTest, UnloadedClientBecomesSilentCorrectlyUnthrottles) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
scheduler_.OnAudibilityChanged(kChildId, kRouteId, true);
@@ -1386,12 +1389,11 @@ TEST_F(ResourceSchedulerTest, LoadedClientBecomesHiddenCorrectlyThrottles) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
scheduler_.OnLoadingStateChanged(kChildId2, kRouteId2, true);
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
// 2 visible, 2 hidden
EXPECT_FALSE(scheduler_.active_clients_loaded());
EXPECT_EQ(ResourceScheduler::THROTTLED,
@@ -1455,8 +1457,8 @@ TEST_F(ResourceSchedulerTest, LoadedClientBecomesSilentCorrectlyThrottles) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, false);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
scheduler_.OnLoadingStateChanged(
kBackgroundChildId2, kBackgroundRouteId2, true);
scheduler_.OnLoadingStateChanged(kChildId2, kRouteId2, true);
@@ -1526,11 +1528,10 @@ TEST_F(ResourceSchedulerTest, HiddenLoadedChangesCorrectlyStayThrottled) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
// 1 visible and 2 hidden loading, 1 visible loaded
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
scheduler_.OnLoadingStateChanged(kChildId, kRouteId, true);
EXPECT_FALSE(scheduler_.active_clients_loaded());
EXPECT_EQ(ResourceScheduler::THROTTLED,
@@ -1597,9 +1598,8 @@ TEST_F(ResourceSchedulerTest, PartialVisibleClientLoadedDoesNotUnthrottle) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
// 2 visible loading, 1 hidden loading, 1 hidden loaded
scheduler_.OnLoadingStateChanged(
@@ -1652,9 +1652,8 @@ TEST_F(ResourceSchedulerTest, FullVisibleLoadedCorrectlyUnthrottle) {
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
// 1 visible and 1 hidden loaded, 1 visible and 1 hidden loading
scheduler_.OnLoadingStateChanged(
@@ -1719,9 +1718,8 @@ TEST_F(ResourceSchedulerTest,
// TODO(aiolos): remove when throttling and coalescing have both landed
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
false /* should_coalesce */);
- scheduler_.OnClientCreated(kChildId2, kRouteId2);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
- scheduler_.OnVisibilityChanged(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kChildId2, kRouteId2, true);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
// 1 visible and 1 hidden loaded, 1 visible and 1 hidden loading
scheduler_.OnLoadingStateChanged(
@@ -1857,7 +1855,7 @@ TEST_F(ResourceSchedulerTest, CoalescedClientBecomesAudibleStopsTimer) {
TEST_F(ResourceSchedulerTest, LastCoalescedClientDeletionStopsTimer) {
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
true /* should_coalesce */);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
EXPECT_FALSE(mock_timer_->IsRunning());
scheduler_.OnLoadingStateChanged(kChildId, kRouteId, true);
EXPECT_FALSE(mock_timer_->IsRunning());
@@ -1880,13 +1878,13 @@ TEST_F(ResourceSchedulerTest, LastCoalescedClientDeletionStopsTimer) {
EXPECT_FALSE(mock_timer_->IsRunning());
// To avoid errors on test tear down.
- scheduler_.OnClientCreated(kBackgroundChildId, kBackgroundRouteId);
+ scheduler_.OnClientCreated(kBackgroundChildId, kBackgroundRouteId, false);
}
TEST_F(ResourceSchedulerTest, LastCoalescedClientStartsLoadingStopsTimer) {
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
true /* should_coalesce */);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
EXPECT_FALSE(mock_timer_->IsRunning());
scheduler_.OnLoadingStateChanged(kChildId, kRouteId, true);
EXPECT_FALSE(mock_timer_->IsRunning());
@@ -1917,7 +1915,7 @@ TEST_F(ResourceSchedulerTest, LastCoalescedClientStartsLoadingStopsTimer) {
TEST_F(ResourceSchedulerTest, LastCoalescedClientBecomesVisibleStopsTimer) {
scheduler_.SetThrottleOptionsForTesting(true /* should_throttle */,
true /* should_coalesce */);
- scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2);
+ scheduler_.OnClientCreated(kBackgroundChildId2, kBackgroundRouteId2, false);
EXPECT_FALSE(mock_timer_->IsRunning());
scheduler_.OnLoadingStateChanged(kChildId, kRouteId, true);
EXPECT_FALSE(mock_timer_->IsRunning());
@@ -2098,6 +2096,67 @@ TEST_F(ResourceSchedulerTest, CoalescedRequestsWaitForNextTimer) {
EXPECT_TRUE(low->started());
}
+TEST_F(ResourceSchedulerTest, GetVisualSignalFromRenderViewHost) {
+ scoped_ptr<MockRenderProcessHostFactory> render_process_host_factory;
+ scoped_ptr<TestBrowserContext> browser_context;
+ scoped_ptr<TestWebContents> web_contents_1;
+ scoped_ptr<TestWebContents> web_contents_2;
+
+ render_process_host_factory.reset(new MockRenderProcessHostFactory());
+ browser_context.reset(new TestBrowserContext());
+ scoped_refptr<SiteInstance> site_instance_1 =
+ SiteInstance::Create(browser_context.get());
+ scoped_refptr<SiteInstance> site_instance_2 =
+ SiteInstance::Create(browser_context.get());
+ SiteInstanceImpl::set_render_process_host_factory(
+ render_process_host_factory.get());
+
+ web_contents_1.reset(
+ TestWebContents::Create(browser_context.get(), site_instance_1.get()));
+ web_contents_2.reset(
+ TestWebContents::Create(browser_context.get(), site_instance_2.get()));
+ base::RunLoop().RunUntilIdle();
+
+ RenderViewHostImpl* rvh1 = web_contents_1->GetRenderViewHost();
+ RenderViewHostImpl* rvh2 = web_contents_2->GetRenderViewHost();
+ ResourceScheduler* scheduler = ResourceDispatcherHostImpl::Get()->scheduler();
+
+ // Check initial visibility is set correctly.
+ EXPECT_EQ(scheduler->IsClientVisibleForTesting(rvh1->GetProcess()->GetID(),
+ rvh1->GetRoutingID()),
+ !rvh1->is_hidden());
+ EXPECT_EQ(scheduler->IsClientVisibleForTesting(rvh2->GetProcess()->GetID(),
+ rvh1->GetRoutingID()),
+ !rvh2->is_hidden());
+
+ // 1 visible, 1 hidden
+ rvh1->WasShown(ui::LatencyInfo());
+ rvh2->WasHidden();
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_TRUE(scheduler->IsClientVisibleForTesting(rvh1->GetProcess()->GetID(),
+ rvh1->GetRoutingID()));
+ EXPECT_FALSE(scheduler->IsClientVisibleForTesting(rvh2->GetProcess()->GetID(),
+ rvh2->GetRoutingID()));
+
+ // Flip the visibility and check again.
+ rvh1->WasHidden();
+ rvh2->WasShown(ui::LatencyInfo());
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_FALSE(scheduler->IsClientVisibleForTesting(rvh1->GetProcess()->GetID(),
+ rvh1->GetRoutingID()));
+ EXPECT_TRUE(scheduler->IsClientVisibleForTesting(rvh2->GetProcess()->GetID(),
+ rvh2->GetRoutingID()));
+ // Clean up.
+ web_contents_1.reset();
+ web_contents_2.reset();
+ base::RunLoop().RunUntilIdle();
+
+ browser_context.reset();
+ render_process_host_factory.reset();
+}
+
} // unnamed namespace
} // namespace content
« no previous file with comments | « content/browser/loader/resource_scheduler.cc ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698