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

Unified Diff: ui/aura/window_tree_host.cc

Issue 2556803002: Making WTH::InitCompositor() protected instead of public. (Closed)
Patch Set: Fixing upstream. Created 4 years 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 | « ui/aura/window_tree_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host.cc
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index a1bac9be53163090c41ee54d31644ad12ae785ce..c0baf2d340be172b9f9c303620a0b5d23dc4a30d 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -66,14 +66,6 @@ void WindowTreeHost::InitHost() {
window()->Show();
}
-void WindowTreeHost::InitCompositor() {
- compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
- GetBoundsInPixels().size());
- compositor_->SetRootLayer(window()->layer());
- compositor_->SetDisplayColorSpace(
- GetICCProfileForCurrentDisplay().GetColorSpace());
-}
-
void WindowTreeHost::AddObserver(WindowTreeHostObserver* observer) {
observers_.AddObserver(observer);
}
@@ -269,6 +261,14 @@ void WindowTreeHost::CreateCompositor() {
}
}
+void WindowTreeHost::InitCompositor() {
+ compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
+ GetBoundsInPixels().size());
+ compositor_->SetRootLayer(window()->layer());
+ compositor_->SetDisplayColorSpace(
+ GetICCProfileForCurrentDisplay().GetColorSpace());
+}
+
void WindowTreeHost::OnAcceleratedWidgetAvailable() {
compositor_->SetAcceleratedWidget(GetAcceleratedWidget());
prop_.reset(new ui::ViewProp(GetAcceleratedWidget(),
« no previous file with comments | « ui/aura/window_tree_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698