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

Unified Diff: ash/wm/window_animations.cc

Issue 10690168: Aura: Resize locks with --ui-enable-threaded-compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: New approach. Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index b3f80e34d66e6dc6664f20fce0dea976a1cb4046..edab8ee4e5bffe41f5b9c06a40482cf2938ce111 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -517,14 +517,14 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
base::TimeDelta::FromMilliseconds(
kBrightnessGrayscaleFadeDurationMs)));
- std::vector<ui::LayerAnimationSequence*> animations;
- animations.push_back(brightness_sequence.release());
- animations.push_back(grayscale_sequence.release());
- window->layer()->GetAnimator()->ScheduleTogether(animations);
- if (!show) {
- window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
- window->layer()->SetVisible(false);
- }
+ std::vector<ui::LayerAnimationSequence*> animations;
+ animations.push_back(brightness_sequence.release());
+ animations.push_back(grayscale_sequence.release());
+ window->layer()->GetAnimator()->ScheduleTogether(animations);
+ if (!show) {
+ window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
+ window->layer()->SetVisible(false);
+ }
}
void AnimateShowWindow_BrightnessGrayscale(aura::Window* window) {
@@ -642,10 +642,6 @@ class CrossFadeObserver : public ui::CompositorObserver,
}
// ui::CompositorObserver overrides:
- virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {
- }
- virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE {
- }
virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE {
}
virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698