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

Side by Side Diff: chrome/browser/android/vr_shell/vr_compositor.cc

Issue 2658643003: Refactor GvrDelegate ownership into GvrDelegateProvider and fix more threading violations. (Closed)
Patch Set: cleanup Created 3 years, 10 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 unified diff | Download patch
OLDNEW
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"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 layer_parent_ = layer_->parent(); 49 layer_parent_ = layer_->parent();
50 compositor_->SetRootLayer(layer_); 50 compositor_->SetRootLayer(layer_);
51 } 51 }
52 52
53 void VrCompositor::SurfaceDestroyed() { 53 void VrCompositor::SurfaceDestroyed() {
54 compositor_->SetSurface(nullptr); 54 compositor_->SetSurface(nullptr);
55 } 55 }
56 56
57 void VrCompositor::SetWindowBounds(gfx::Size size) { 57 void VrCompositor::SetWindowBounds(gfx::Size size) {
58 bounds_ = size; 58 compositor_->SetWindowBounds(size);
59 compositor_->SetWindowBounds(bounds_);
60 } 59 }
61 60
62 void VrCompositor::SurfaceChanged(jobject surface) { 61 void VrCompositor::SurfaceChanged(jobject surface) {
63 DCHECK(surface); 62 DCHECK(surface);
64 compositor_->SetSurface(surface); 63 compositor_->SetSurface(surface);
65 } 64 }
66 65
67 } // namespace vr_shell 66 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698