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

Side by Side Diff: ui/compositor/layer.h

Issue 2335043002: CC Animation: Move animations_ from ElementAnimations to AnimationPlayer. (Closed)
Patch Set: Clean it up harder. Rework UpdateClientAnimationState. Created 4 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_COMPOSITOR_LAYER_H_ 5 #ifndef UI_COMPOSITOR_LAYER_H_
6 #define UI_COMPOSITOR_LAYER_H_ 6 #define UI_COMPOSITOR_LAYER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 cc::TextureMailbox* mailbox, 367 cc::TextureMailbox* mailbox,
368 std::unique_ptr<cc::SingleReleaseCallback>* release_callback) override; 368 std::unique_ptr<cc::SingleReleaseCallback>* release_callback) override;
369 369
370 float device_scale_factor() const { return device_scale_factor_; } 370 float device_scale_factor() const { return device_scale_factor_; }
371 371
372 // LayerClient 372 // LayerClient
373 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo( 373 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(
374 cc::Layer* layer) override; 374 cc::Layer* layer) override;
375 void didUpdateMainThreadScrollingReasons() override; 375 void didUpdateMainThreadScrollingReasons() override;
376 376
377 // Whether this layer has animations waiting to get sent to its cc::Layer.
378 bool HasPendingThreadedAnimationsForTesting() const;
379
380 // Triggers a call to SwitchToLayer. 377 // Triggers a call to SwitchToLayer.
381 void SwitchCCLayerForTest(); 378 void SwitchCCLayerForTest();
382 379
383 const cc::Region& damaged_region_for_testing() const { 380 const cc::Region& damaged_region_for_testing() const {
384 return damaged_region_; 381 return damaged_region_;
385 } 382 }
386 383
387 private: 384 private:
388 friend class LayerOwner; 385 friend class LayerOwner;
389 386
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 // The size of the frame or texture in DIP, set when SetShowDelegatedContent 522 // The size of the frame or texture in DIP, set when SetShowDelegatedContent
526 // or SetTextureMailbox was called. 523 // or SetTextureMailbox was called.
527 gfx::Size frame_size_in_dip_; 524 gfx::Size frame_size_in_dip_;
528 525
529 DISALLOW_COPY_AND_ASSIGN(Layer); 526 DISALLOW_COPY_AND_ASSIGN(Layer);
530 }; 527 };
531 528
532 } // namespace ui 529 } // namespace ui
533 530
534 #endif // UI_COMPOSITOR_LAYER_H_ 531 #endif // UI_COMPOSITOR_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698