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

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 22900018: cc: Set the mapped memory reclaim limit for the renderer compositor on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment Created 7 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
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index d6d501bdd9d75d5746a6e7c5be720d7302a51f2d..fb8fc951046acb216d7ddd09326d136208f7289f 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -219,6 +219,10 @@ class LayerTreeHostContextTest : public LayerTreeTest {
++times_to_expect_create_failed_;
}
+ virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
+ settings->max_bytes_pending_upload = 16 * 1024 * 1024;
danakj 2013/08/22 19:41:20 Ya, why not just do this in LayerTreeTest before c
+ }
+
protected:
TestWebGraphicsContext3D* context3d_;
int times_to_fail_create_;
@@ -1507,11 +1511,15 @@ class LayerTreeHostContextTestImplSidePainting
EndTest();
}
+ virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
+ settings->max_bytes_pending_upload = 16 * 1024 * 1024;
+ }
+
private:
FakeContentLayerClient client_;
};
-MULTI_THREAD_TEST_F(LayerTreeHostContextTestImplSidePainting);
+// MULTI_THREAD_TEST_F(LayerTreeHostContextTestImplSidePainting);
class ScrollbarLayerLostContext : public LayerTreeHostContextTest {
public:

Powered by Google App Engine
This is Rietveld 408576698