summaryrefslogtreecommitdiffstats
path: root/blimp
diff options
context:
space:
mode:
authorjbroman <jbroman@chromium.org>2015-11-18 15:17:14 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-18 23:18:53 +0000
commit49fa12e81e620e6af4b411841a98518cc45f67f8 (patch)
treea8b7203fdc96a118354e9eb765f98e146e673ac0 /blimp
parentb519d0d44c91e854fd2b78e81a179b9c93624927 (diff)
downloadchromium_src-49fa12e81e620e6af4b411841a98518cc45f67f8.zip
chromium_src-49fa12e81e620e6af4b411841a98518cc45f67f8.tar.gz
chromium_src-49fa12e81e620e6af4b411841a98518cc45f67f8.tar.bz2
Move cc::LayerSettings to cc/layers/layer_settings.h.
It's somewhat confusing to have to find it in cc/trees/layer_tree_settings.h. CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=dtrainor@chromium.org,piman@chromium.org Review URL: https://codereview.chromium.org/1462613002 Cr-Commit-Position: refs/heads/master@{#360441}
Diffstat (limited to 'blimp')
-rw-r--r--blimp/client/compositor/blimp_compositor.cc1
-rw-r--r--blimp/client/compositor/test/dummy_layer_driver.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/blimp/client/compositor/blimp_compositor.cc b/blimp/client/compositor/blimp_compositor.cc
index 5f2b1fa..96bad8c 100644
--- a/blimp/client/compositor/blimp_compositor.cc
+++ b/blimp/client/compositor/blimp_compositor.cc
@@ -18,6 +18,7 @@
#include "blimp/client/compositor/test/dummy_layer_driver.h"
#include "blimp/common/compositor/blimp_task_graph_runner.h"
#include "cc/layers/layer.h"
+#include "cc/layers/layer_settings.h"
#include "cc/output/output_surface.h"
#include "cc/trees/layer_tree_host.h"
#include "ui/gl/gl_surface.h"
diff --git a/blimp/client/compositor/test/dummy_layer_driver.cc b/blimp/client/compositor/test/dummy_layer_driver.cc
index 306dd70..f3968ff 100644
--- a/blimp/client/compositor/test/dummy_layer_driver.cc
+++ b/blimp/client/compositor/test/dummy_layer_driver.cc
@@ -9,6 +9,7 @@
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "cc/layers/layer.h"
+#include "cc/layers/layer_settings.h"
#include "cc/layers/solid_color_layer.h"
#include "cc/trees/layer_tree_settings.h"
#include "ui/gfx/geometry/size.h"