OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/vr_shell/vr_compositor.h" | 5 #include "chrome/browser/android/vr_shell/vr_compositor.h" |
6 | 6 |
7 #include "cc/layers/layer.h" | 7 #include "cc/layers/layer.h" |
8 #include "content/public/browser/android/compositor.h" | 8 #include "content/public/browser/android/compositor.h" |
9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
10 #include "third_party/skia/include/core/SkColor.h" | 10 #include "third_party/skia/include/core/SkColor.h" |
11 #include "ui/android/window_android.h" | 11 #include "ui/android/view_android.h" |
12 | 12 |
13 namespace vr_shell { | 13 namespace vr_shell { |
14 | 14 |
15 VrCompositor::VrCompositor(ui::WindowAndroid* window, bool transparent) | 15 VrCompositor::VrCompositor(ui::ViewRoot* view_root, bool transparent) |
16 : background_color_(SK_ColorWHITE), | 16 : background_color_(SK_ColorWHITE), transparent_(transparent) { |
17 transparent_(transparent) { | 17 compositor_.reset(content::Compositor::Create(this, view_root)); |
18 compositor_.reset(content::Compositor::Create(this, window)); | |
19 compositor_->SetHasTransparentBackground(transparent); | 18 compositor_->SetHasTransparentBackground(transparent); |
20 } | 19 } |
21 | 20 |
22 VrCompositor::~VrCompositor() { | 21 VrCompositor::~VrCompositor() { |
23 if (layer_) | 22 if (layer_) |
24 RestoreLayer(); | 23 RestoreLayer(); |
25 } | 24 } |
26 | 25 |
27 void VrCompositor::UpdateLayerTreeHost() {} | 26 void VrCompositor::UpdateLayerTreeHost() {} |
28 | 27 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 void VrCompositor::SetWindowBounds(gfx::Size size) { | 60 void VrCompositor::SetWindowBounds(gfx::Size size) { |
62 compositor_->SetWindowBounds(size); | 61 compositor_->SetWindowBounds(size); |
63 } | 62 } |
64 | 63 |
65 void VrCompositor::SurfaceChanged(jobject surface) { | 64 void VrCompositor::SurfaceChanged(jobject surface) { |
66 DCHECK(surface); | 65 DCHECK(surface); |
67 compositor_->SetSurface(surface); | 66 compositor_->SetSurface(surface); |
68 } | 67 } |
69 | 68 |
70 } // namespace vr_shell | 69 } // namespace vr_shell |
OLD | NEW |