| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 bool BitmapImage::maybeAnimated() | 592 bool BitmapImage::maybeAnimated() |
| 593 { | 593 { |
| 594 if (m_animationFinished) | 594 if (m_animationFinished) |
| 595 return false; | 595 return false; |
| 596 if (frameCount() > 1) | 596 if (frameCount() > 1) |
| 597 return true; | 597 return true; |
| 598 | 598 |
| 599 return m_source.repetitionCount() != cAnimationNone; | 599 return m_source.repetitionCount() != cAnimationNone; |
| 600 } | 600 } |
| 601 | 601 |
| 602 void BitmapImage::advanceTime(double deltaTimeInSeconds) |
| 603 { |
| 604 if (m_desiredFrameStartTime) |
| 605 m_desiredFrameStartTime -= deltaTimeInSeconds; |
| 606 else |
| 607 m_desiredFrameStartTime = monotonicallyIncreasingTime() - deltaTimeInSec
onds; |
| 608 } |
| 609 |
| 602 void BitmapImage::advanceAnimation(Timer<BitmapImage>*) | 610 void BitmapImage::advanceAnimation(Timer<BitmapImage>*) |
| 603 { | 611 { |
| 604 internalAdvanceAnimation(false); | 612 internalAdvanceAnimation(false); |
| 605 // At this point the image region has been marked dirty, and if it's | 613 // At this point the image region has been marked dirty, and if it's |
| 606 // onscreen, we'll soon make a call to draw(), which will call | 614 // onscreen, we'll soon make a call to draw(), which will call |
| 607 // startAnimation() again to keep the animation moving. | 615 // startAnimation() again to keep the animation moving. |
| 608 } | 616 } |
| 609 | 617 |
| 610 bool BitmapImage::internalAdvanceAnimation(bool skippingFrames) | 618 bool BitmapImage::internalAdvanceAnimation(bool skippingFrames) |
| 611 { | 619 { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 | 681 |
| 674 return m_isSolidColor && !m_currentFrame; | 682 return m_isSolidColor && !m_currentFrame; |
| 675 } | 683 } |
| 676 | 684 |
| 677 Color BitmapImage::solidColor() const | 685 Color BitmapImage::solidColor() const |
| 678 { | 686 { |
| 679 return m_solidColor; | 687 return m_solidColor; |
| 680 } | 688 } |
| 681 | 689 |
| 682 } // namespace blink | 690 } // namespace blink |
| OLD | NEW |