| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 void SVGImageChromeClient::invalidateContentsAndRootView(const IntRect& r) | 57 void SVGImageChromeClient::invalidateContentsAndRootView(const IntRect& r) |
| 58 { | 58 { |
| 59 // If m_image->m_page is null, we're being destructed, don't fire changedInR
ect() in that case. | 59 // If m_image->m_page is null, we're being destructed, don't fire changedInR
ect() in that case. |
| 60 if (m_image && m_image->imageObserver() && m_image->m_page) | 60 if (m_image && m_image->imageObserver() && m_image->m_page) |
| 61 m_image->imageObserver()->changedInRect(m_image, r); | 61 m_image->imageObserver()->changedInRect(m_image, r); |
| 62 } | 62 } |
| 63 | 63 |
| 64 void SVGImageChromeClient::scheduleAnimation() | 64 void SVGImageChromeClient::scheduleAnimation() |
| 65 { | 65 { |
| 66 if (!m_image) |
| 67 return; |
| 68 |
| 66 // Because a single SVGImage can be shared by multiple pages, we can't key | 69 // Because a single SVGImage can be shared by multiple pages, we can't key |
| 67 // our svg image layout on the page's real animation frame. Therefore, we | 70 // our svg image layout on the page's real animation frame. Therefore, we |
| 68 // run this fake animation timer to trigger layout in SVGImages. The name, | 71 // run this fake animation timer to trigger layout in SVGImages. The name, |
| 69 // "animationTimer", is to match the new requestAnimationFrame-based layout | 72 // "animationTimer", is to match the new requestAnimationFrame-based layout |
| 70 // approach. | 73 // approach. |
| 71 if (m_animationTimer.isActive()) | 74 if (m_animationTimer.isActive()) |
| 72 return; | 75 return; |
| 73 // Schedule the 'animation' ASAP if the image does not contain any | 76 // Schedule the 'animation' ASAP if the image does not contain any |
| 74 // animations, but prefer a fixed, jittery, frame-delay if there're any | 77 // animations, but prefer a fixed, jittery, frame-delay if there're any |
| 75 // animations. Checking for pending/active animations could be more | 78 // animations. Checking for pending/active animations could be more |
| 76 // stringent. | 79 // stringent. |
| 77 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; | 80 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; |
| 78 m_animationTimer.startOneShot(fireTime); | 81 m_animationTimer.startOneShot(fireTime); |
| 79 } | 82 } |
| 80 | 83 |
| 81 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) | 84 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) |
| 82 { | 85 { |
| 83 // In principle, we should call requestAnimationFrame callbacks here, but | 86 // In principle, we should call requestAnimationFrame callbacks here, but |
| 84 // we know there aren't any because script is forbidden inside SVGImages. | 87 // we know there aren't any because script is forbidden inside SVGImages. |
| 85 if (m_image) { | 88 if (m_image) { |
| 86 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre
ntTime()); | 89 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre
ntTime()); |
| 87 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive(); | 90 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive(); |
| 88 } | 91 } |
| 89 } | 92 } |
| 90 | 93 |
| 91 } | 94 } |
| OLD | NEW |