OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. |
4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 FrameView* frameView = toLocalFrame(m_page->mainFrame())->view(); | 579 FrameView* frameView = toLocalFrame(m_page->mainFrame())->view(); |
580 frameView->updateAllLifecyclePhasesExceptPaint(); | 580 frameView->updateAllLifecyclePhasesExceptPaint(); |
581 | 581 |
582 // For SPv2 we run updateAnimations after the paint phase, but per above | 582 // For SPv2 we run updateAnimations after the paint phase, but per above |
583 // comment we don't want to run lifecycle through to paint for SVG images. | 583 // comment we don't want to run lifecycle through to paint for SVG images. |
584 // Since we know SVG images never have composited animations we can update | 584 // Since we know SVG images never have composited animations we can update |
585 // animations directly without worrying about including | 585 // animations directly without worrying about including |
586 // PaintArtifactCompositor analysis of whether animations should be | 586 // PaintArtifactCompositor analysis of whether animations should be |
587 // composited. | 587 // composited. |
588 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | 588 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
| 589 Optional<CompositorElementIdSet> compositedElementIds; |
589 DocumentAnimations::updateAnimations(frameView->layoutView()->document(), | 590 DocumentAnimations::updateAnimations(frameView->layoutView()->document(), |
590 DocumentLifecycle::LayoutClean); | 591 DocumentLifecycle::LayoutClean, |
| 592 compositedElementIds); |
591 } | 593 } |
592 } | 594 } |
593 | 595 |
594 void SVGImage::advanceAnimationForTesting() { | 596 void SVGImage::advanceAnimationForTesting() { |
595 if (SVGSVGElement* rootElement = svgRootElement(m_page.get())) { | 597 if (SVGSVGElement* rootElement = svgRootElement(m_page.get())) { |
596 rootElement->timeContainer()->advanceFrameForTesting(); | 598 rootElement->timeContainer()->advanceFrameForTesting(); |
597 | 599 |
598 // The following triggers animation updates which can issue a new draw | 600 // The following triggers animation updates which can issue a new draw |
599 // but will not permanently change the animation timeline. | 601 // but will not permanently change the animation timeline. |
600 // TODO(pdr): Actually advance the document timeline so CSS animations | 602 // TODO(pdr): Actually advance the document timeline so CSS animations |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 } | 707 } |
706 | 708 |
707 return m_page ? SizeAvailable : SizeUnavailable; | 709 return m_page ? SizeAvailable : SizeUnavailable; |
708 } | 710 } |
709 | 711 |
710 String SVGImage::filenameExtension() const { | 712 String SVGImage::filenameExtension() const { |
711 return "svg"; | 713 return "svg"; |
712 } | 714 } |
713 | 715 |
714 } // namespace blink | 716 } // namespace blink |
OLD | NEW |