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

Side by Side Diff: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

Issue 2877033002: Fix cc scrollbar layer issues with initialization, and use element ids throughout. (Closed)
Patch Set: none Created 3 years, 7 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 !layer->GetCompositedLayerMapping()->MainGraphicsLayer()) 459 !layer->GetCompositedLayerMapping()->MainGraphicsLayer())
460 return; 460 return;
461 461
462 if (!layer->GetCompositedLayerMapping() 462 if (!layer->GetCompositedLayerMapping()
463 ->MainGraphicsLayer() 463 ->MainGraphicsLayer()
464 ->PlatformLayer()) 464 ->PlatformLayer())
465 return; 465 return;
466 } 466 }
467 467
468 CompositorAnimationPlayer* compositor_player = animation.CompositorPlayer(); 468 CompositorAnimationPlayer* compositor_player = animation.CompositorPlayer();
469 compositor_player->AttachElement(CreateCompositorElementId( 469 compositor_player->AttachElement(CompositorElementIdFromDOMNodeId(
470 DOMNodeIds::IdForNode(&element), CompositorSubElementId::kPrimary)); 470 DOMNodeIds::IdForNode(&element), CompositorElementIdNamespace::kPrimary));
471 } 471 }
472 472
473 bool CompositorAnimations::ConvertTimingForCompositor( 473 bool CompositorAnimations::ConvertTimingForCompositor(
474 const Timing& timing, 474 const Timing& timing,
475 double time_offset, 475 double time_offset,
476 CompositorTiming& out, 476 CompositorTiming& out,
477 double animation_playback_rate) { 477 double animation_playback_rate) {
478 timing.AssertValid(); 478 timing.AssertValid();
479 479
480 // FIXME: Compositor does not know anything about endDelay. 480 // FIXME: Compositor does not know anything about endDelay.
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 animation->SetTimeOffset(compositor_timing.scaled_time_offset); 647 animation->SetTimeOffset(compositor_timing.scaled_time_offset);
648 animation->SetDirection(compositor_timing.direction); 648 animation->SetDirection(compositor_timing.direction);
649 animation->SetPlaybackRate(compositor_timing.playback_rate); 649 animation->SetPlaybackRate(compositor_timing.playback_rate);
650 animation->SetFillMode(compositor_timing.fill_mode); 650 animation->SetFillMode(compositor_timing.fill_mode);
651 animations.push_back(std::move(animation)); 651 animations.push_back(std::move(animation));
652 } 652 }
653 DCHECK(!animations.IsEmpty()); 653 DCHECK(!animations.IsEmpty());
654 } 654 }
655 655
656 } // namespace blink 656 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/AnimationTest.cpp ('k') | third_party/WebKit/Source/core/frame/VisualViewport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698