diff options
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | blimp/BUILD.gn | 10 | ||||
| -rw-r--r-- | blimp/common/BUILD.gn | 1 | ||||
| -rw-r--r-- | blimp/common/DEPS | 3 | ||||
| -rw-r--r-- | blimp/common/compositor/blimp_layer_tree_settings.cc | 8 |
5 files changed, 24 insertions, 4 deletions
@@ -216,7 +216,6 @@ group("both_gn_and_gyp") { if (is_android) { deps += [ "//base/android/linker:chromium_android_linker", - "//blimp/client:blimp_apk", "//build/android/gyp/test:hello_world", "//build/android/rezip", "//chrome/android:chrome_public_apk", @@ -617,6 +616,7 @@ group("gn_only") { # and figure out how cross-platform they are deps += [ ":gn_mojo_targets", + "//blimp", "//chrome/browser/resources:extension_resource_demo", "//chrome/installer/util:strings", "//chrome:main_dll", @@ -700,6 +700,10 @@ group("gn_only") { } } + if (is_android) { + deps += [ "//blimp/client:blimp_apk" ] + } + if (is_mac) { deps -= [ "//mandoline:all" ] # TODO(GYP) } diff --git a/blimp/BUILD.gn b/blimp/BUILD.gn new file mode 100644 index 0000000..04b7a5b --- /dev/null +++ b/blimp/BUILD.gn @@ -0,0 +1,10 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +group("blimp") { + deps = [ + "//blimp/client:blimp_client", + "//blimp/common:blimp_common", + ] +} diff --git a/blimp/common/BUILD.gn b/blimp/common/BUILD.gn index eaf5f16..a9dfd35 100644 --- a/blimp/common/BUILD.gn +++ b/blimp/common/BUILD.gn @@ -22,5 +22,6 @@ component("blimp_common") { "//skia", "//ui/gfx/geometry", "//ui/gl", + "//ui/native_theme", ] } diff --git a/blimp/common/DEPS b/blimp/common/DEPS index 2b54cf7..e163777 100644 --- a/blimp/common/DEPS +++ b/blimp/common/DEPS @@ -7,6 +7,9 @@ include_rules = [ "+ui/gfx", "+ui/gl", + # TODO(dtrainor): Verify we still need this. + "!ui/native_theme/native_theme_switches.h", + # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp # are finalized or are pushed from the server component. See # crbug.com/527655. diff --git a/blimp/common/compositor/blimp_layer_tree_settings.cc b/blimp/common/compositor/blimp_layer_tree_settings.cc index cef7317..12a58ec 100644 --- a/blimp/common/compositor/blimp_layer_tree_settings.cc +++ b/blimp/common/compositor/blimp_layer_tree_settings.cc @@ -16,6 +16,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/buffer_types.h" #include "ui/gl/gl_switches.h" +#include "ui/native_theme/native_theme_switches.h" namespace { @@ -136,12 +137,12 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) { &settings->use_image_texture_targets); } - settings->gather_pixel_refs = false; + settings->gather_images = false; if (cmd.HasSwitch(switches::kNumRasterThreads)) { int num_raster_threads = 0; GetSwitchValueAsInt(cmd, switches::kNumRasterThreads, 0, std::numeric_limits<int>::max(), &num_raster_threads); - settings->gather_pixel_refs = num_raster_threads > 1; + settings->gather_images = num_raster_threads > 1; } if (cmd.HasSwitch(cc::switches::kTopControlsShowThreshold)) { @@ -253,7 +254,8 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) { // 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. - settings->scrollbar_show_scale_threshold = 1.05f; + // TODO(dtrainor): Update this since https://crrev.com/1267603004 landed. + // settings->scrollbar_show_scale_threshold = 1.05f; #endif if (cmd.HasSwitch(switches::kEnableLowResTiling)) |