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

Unified Diff: blimp/client/support/compositor/blimp_layer_tree_settings.cc

Issue 2274323002: Expose Blimp dependencies to the embedder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@khushal_baseline_1
Patch Set: Fix linux build break Created 4 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: blimp/client/support/compositor/blimp_layer_tree_settings.cc
diff --git a/blimp/client/feature/compositor/blimp_layer_tree_settings.cc b/blimp/client/support/compositor/blimp_layer_tree_settings.cc
similarity index 92%
rename from blimp/client/feature/compositor/blimp_layer_tree_settings.cc
rename to blimp/client/support/compositor/blimp_layer_tree_settings.cc
index 7d087994fa67e45dedc3fc6eaec1474db34bd484..f168e58aff3f47af33821346846e944635c7b402 100644
--- a/blimp/client/feature/compositor/blimp_layer_tree_settings.cc
+++ b/blimp/client/support/compositor/blimp_layer_tree_settings.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "blimp/client/feature/compositor/blimp_layer_tree_settings.h"
+#include "blimp/client/support/compositor/blimp_layer_tree_settings.h"
#include "base/command_line.h"
#include "base/logging.h"
@@ -93,11 +93,11 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) {
settings->scrollbar_fade_resize_delay_ms = 500;
settings->scrollbar_fade_duration_ms = 300;
- // When pinching in, only show the pinch-viewport overlay scrollbars if the
- // page scale is at least some threshold away from the minimum. i.e. don't
- // show the pinch scrollbars when at minimum scale.
- // TODO(dtrainor): Update this since https://crrev.com/1267603004 landed.
- // settings->scrollbar_show_scale_threshold = 1.05f;
+// When pinching in, only show the pinch-viewport overlay scrollbars if the
+// page scale is at least some threshold away from the minimum. i.e. don't
+// show the pinch scrollbars when at minimum scale.
+// TODO(dtrainor): Update this since https://crrev.com/1267603004 landed.
+// settings->scrollbar_show_scale_threshold = 1.05f;
#endif
// Set the GpuMemoryPolicy.
@@ -152,9 +152,9 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) {
memory_policy.bytes_limit_when_visible =
memory_policy.bytes_limit_when_visible * 1024 * 1024;
// Clamp the observed value to a specific range on Android.
- memory_policy.bytes_limit_when_visible = std::max(
- memory_policy.bytes_limit_when_visible,
- static_cast<size_t>(8 * 1024 * 1024));
+ memory_policy.bytes_limit_when_visible =
+ std::max(memory_policy.bytes_limit_when_visible,
+ static_cast<size_t>(8 * 1024 * 1024));
memory_policy.bytes_limit_when_visible =
std::min(memory_policy.bytes_limit_when_visible,
static_cast<size_t>(256 * 1024 * 1024));

Powered by Google App Engine
This is Rietveld 408576698