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

Side by Side Diff: ash/wm/boot_splash_screen_chromeos.cc

Issue 1057873004: Pass a ui::PaintContext from ui::Layer to layer delegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layer-paintcontext: mac Created 5 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/wm/boot_splash_screen_chromeos.h" 5 #include "ash/wm/boot_splash_screen_chromeos.h"
6 6
7 #include "third_party/skia/include/core/SkBitmap.h" 7 #include "third_party/skia/include/core/SkBitmap.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/base/x/x11_util.h" 10 #include "ui/base/x/x11_util.h"
11 #include "ui/compositor/layer.h" 11 #include "ui/compositor/layer.h"
12 #include "ui/compositor/layer_type.h" 12 #include "ui/compositor/layer_type.h"
13 #include "ui/compositor/paint_context.h"
13 #include "ui/compositor/scoped_layer_animation_settings.h" 14 #include "ui/compositor/scoped_layer_animation_settings.h"
14 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
15 16
16 namespace ash { 17 namespace ash {
17 18
18 // ui::LayerDelegate that copies the aura host window's content to a ui::Layer. 19 // ui::LayerDelegate that copies the aura host window's content to a ui::Layer.
19 class BootSplashScreen::CopyHostContentLayerDelegate 20 class BootSplashScreen::CopyHostContentLayerDelegate
20 : public ui::LayerDelegate { 21 : public ui::LayerDelegate {
21 public: 22 public:
22 explicit CopyHostContentLayerDelegate(aura::WindowTreeHost* host) 23 explicit CopyHostContentLayerDelegate(aura::WindowTreeHost* host)
23 : host_(host) { 24 : host_(host) {
24 } 25 }
25 26
26 ~CopyHostContentLayerDelegate() override {} 27 ~CopyHostContentLayerDelegate() override {}
27 28
28 // ui::LayerDelegate overrides: 29 // ui::LayerDelegate overrides:
29 void OnPaintLayer(gfx::Canvas* canvas) override { 30 void OnPaintLayer(const ui::PaintContext& context) override {
30 // It'd be safer to copy the area to a canvas in the constructor and then 31 // It'd be safer to copy the area to a canvas in the constructor and then
31 // copy from that canvas to this one here, but this appears to work (i.e. we 32 // copy from that canvas to this one here, but this appears to work (i.e. we
32 // only call this before we draw our first frame) and it saves us an extra 33 // only call this before we draw our first frame) and it saves us an extra
33 // copy. 34 // copy.
34 // TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap 35 // TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap
35 // to create a zero-copy texture (when possible): 36 // to create a zero-copy texture (when possible):
36 // https://codereview.chromium.org/10543125 37 // https://codereview.chromium.org/10543125
37 #if defined(USE_X11) 38 #if defined(USE_X11)
38 ui::CopyAreaToCanvas(host_->GetAcceleratedWidget(), 39 ui::CopyAreaToCanvas(host_->GetAcceleratedWidget(), host_->GetBounds(),
39 host_->GetBounds(), gfx::Point(), canvas); 40 gfx::Point(), context.canvas());
40 #else 41 #else
41 // TODO(spang): Figure out what to do here. 42 // TODO(spang): Figure out what to do here.
42 NOTIMPLEMENTED(); 43 NOTIMPLEMENTED();
43 #endif 44 #endif
44 } 45 }
45 46
46 void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {} 47 void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
47 48
48 void OnDeviceScaleFactorChanged(float device_scale_factor) override {} 49 void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
49 50
(...skipping 22 matching lines...) Expand all
72 } 73 }
73 74
74 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) { 75 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) {
75 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator()); 76 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator());
76 settings.SetTransitionDuration(duration); 77 settings.SetTransitionDuration(duration);
77 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); 78 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
78 layer_->SetOpacity(0.0f); 79 layer_->SetOpacity(0.0f);
79 } 80 }
80 81
81 } // namespace ash 82 } // namespace ash
OLDNEW
« no previous file with comments | « ash/utility/partial_screenshot_controller.cc ('k') | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698