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 // FIXME: This should not be called after chromeDestroyed, but |
| 67 // crbug.com/350907 seems to indicate it can be. Adding this |
| 68 // ASSERT until we have a LayoutTest to reproduce this! |
| 69 ASSERT(m_image); |
| 70 if (!m_image) |
| 71 return; |
66 // Because a single SVGImage can be shared by multiple pages, we can't key | 72 // 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 | 73 // 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, | 74 // run this fake animation timer to trigger layout in SVGImages. The name, |
69 // "animationTimer", is to match the new requestAnimationFrame-based layout | 75 // "animationTimer", is to match the new requestAnimationFrame-based layout |
70 // approach. | 76 // approach. |
71 if (m_animationTimer.isActive()) | 77 if (m_animationTimer.isActive()) |
72 return; | 78 return; |
73 // Schedule the 'animation' ASAP if the image does not contain any | 79 // Schedule the 'animation' ASAP if the image does not contain any |
74 // animations, but prefer a fixed, jittery, frame-delay if there're any | 80 // animations, but prefer a fixed, jittery, frame-delay if there're any |
75 // animations. Checking for pending/active animations could be more | 81 // animations. Checking for pending/active animations could be more |
76 // stringent. | 82 // stringent. |
77 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; | 83 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; |
78 m_animationTimer.startOneShot(fireTime, FROM_HERE); | 84 m_animationTimer.startOneShot(fireTime, FROM_HERE); |
79 } | 85 } |
80 | 86 |
81 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) | 87 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) |
82 { | 88 { |
83 // In principle, we should call requestAnimationFrame callbacks here, but | 89 // In principle, we should call requestAnimationFrame callbacks here, but |
84 // we know there aren't any because script is forbidden inside SVGImages. | 90 // we know there aren't any because script is forbidden inside SVGImages. |
85 if (m_image) { | 91 if (m_image) { |
86 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre
ntTime()); | 92 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre
ntTime()); |
87 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive(); | 93 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive(); |
88 } | 94 } |
89 } | 95 } |
90 | 96 |
91 } | 97 } |
OLD | NEW |