OLD | NEW |
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" |
(...skipping 25 matching lines...) Expand all Loading... |
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( |
| 47 const gfx::Rect& damage_rect_in_dip) OVERRIDE {} |
| 48 |
46 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} | 49 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
47 | 50 |
48 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { | 51 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { |
49 return base::Closure(); | 52 return base::Closure(); |
50 } | 53 } |
51 | 54 |
52 private: | 55 private: |
53 aura::WindowTreeHost* host_; // not owned | 56 aura::WindowTreeHost* host_; // not owned |
54 | 57 |
55 DISALLOW_COPY_AND_ASSIGN(CopyHostContentLayerDelegate); | 58 DISALLOW_COPY_AND_ASSIGN(CopyHostContentLayerDelegate); |
(...skipping 14 matching lines...) Expand all Loading... |
70 } | 73 } |
71 | 74 |
72 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) { | 75 void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) { |
73 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator()); | 76 ui::ScopedLayerAnimationSettings settings(layer_->GetAnimator()); |
74 settings.SetTransitionDuration(duration); | 77 settings.SetTransitionDuration(duration); |
75 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); | 78 settings.SetPreemptionStrategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); |
76 layer_->SetOpacity(0.0f); | 79 layer_->SetOpacity(0.0f); |
77 } | 80 } |
78 | 81 |
79 } // namespace ash | 82 } // namespace ash |
OLD | NEW |