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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/cursor_manager_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/scoped_layer_animation_settings.h" 13 #include "ui/compositor/scoped_layer_animation_settings.h"
14 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 // ui::LayerDelegate that copies the aura host window's content to a ui::Layer. 18 // ui::LayerDelegate that copies the aura host window's content to a ui::Layer.
19 class BootSplashScreen::CopyHostContentLayerDelegate 19 class BootSplashScreen::CopyHostContentLayerDelegate
20 : public ui::LayerDelegate { 20 : public ui::LayerDelegate {
21 public: 21 public:
22 explicit CopyHostContentLayerDelegate(aura::WindowTreeHost* host) 22 explicit CopyHostContentLayerDelegate(aura::WindowTreeHost* host)
23 : host_(host) { 23 : host_(host) {
24 } 24 }
25 25
26 virtual ~CopyHostContentLayerDelegate() {} 26 virtual ~CopyHostContentLayerDelegate() {}
27 27
28 // ui::LayerDelegate overrides: 28 // ui::LayerDelegate overrides:
29 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { 29 virtual void OnPaintLayer(gfx::Canvas* canvas) override {
30 // It'd be safer to copy the area to a canvas in the constructor and then 30 // 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 31 // 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 32 // only call this before we draw our first frame) and it saves us an extra
33 // copy. 33 // copy.
34 // TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap 34 // TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap
35 // to create a zero-copy texture (when possible): 35 // to create a zero-copy texture (when possible):
36 // https://codereview.chromium.org/10543125 36 // https://codereview.chromium.org/10543125
37 #if defined(USE_X11) 37 #if defined(USE_X11)
38 ui::CopyAreaToCanvas(host_->GetAcceleratedWidget(), 38 ui::CopyAreaToCanvas(host_->GetAcceleratedWidget(),
39 host_->GetBounds(), gfx::Point(), canvas); 39 host_->GetBounds(), gfx::Point(), canvas);
40 #else 40 #else
41 // TODO(spang): Figure out what to do here. 41 // TODO(spang): Figure out what to do here.
42 NOTIMPLEMENTED(); 42 NOTIMPLEMENTED();
43 #endif 43 #endif
44 } 44 }
45 45
46 virtual void OnDelegatedFrameDamage( 46 virtual void OnDelegatedFrameDamage(
47 const gfx::Rect& damage_rect_in_dip) OVERRIDE {} 47 const gfx::Rect& damage_rect_in_dip) override {}
48 48
49 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} 49 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
50 50
51 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { 51 virtual base::Closure PrepareForLayerBoundsChange() override {
52 return base::Closure(); 52 return base::Closure();
53 } 53 }
54 54
55 private: 55 private:
56 aura::WindowTreeHost* host_; // not owned 56 aura::WindowTreeHost* host_; // not owned
57 57
58 DISALLOW_COPY_AND_ASSIGN(CopyHostContentLayerDelegate); 58 DISALLOW_COPY_AND_ASSIGN(CopyHostContentLayerDelegate);
59 }; 59 };
60 60
61 BootSplashScreen::BootSplashScreen(aura::WindowTreeHost* host) 61 BootSplashScreen::BootSplashScreen(aura::WindowTreeHost* host)
(...skipping 11 matching lines...) Expand all
73 } 73 }
74 74
75 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) { 75 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) {
76 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator()); 76 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator());
77 settings.SetTransitionDuration(duration); 77 settings.SetTransitionDuration(duration);
78 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); 78 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
79 layer_->SetOpacity(0.0f); 79 layer_->SetOpacity(0.0f);
80 } 80 }
81 81
82 } // namespace ash 82 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/cursor_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698