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

Side by Side Diff: Source/core/svg/graphics/SVGImageChromeClient.cpp

Issue 198943004: Testcase for crbug.com/350907 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/svg/as-image/svg-invalid-image-1-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 66 // m_image can be 0 here when the SVGImage is (invalid and) destroyed -
67 // crbug.com/350907 seems to indicate it can be. Adding this 67 // deferring destruction of it's Page, and said page contains a plugin and
68 // ASSERT until we have a LayoutTest to reproduce this! 68 // a marquee (or presumably other entity that schedules animations using
69 ASSERT(m_image); 69 // the ScriptedAnimationController). The core issue is of course the
70 // deferred destruction since it creates this race window in the first
71 // place. (Relevant test: svg/as-image/svg-invalid-image-1.html)
70 if (!m_image) 72 if (!m_image)
71 return; 73 return;
72 // Because a single SVGImage can be shared by multiple pages, we can't key 74 // Because a single SVGImage can be shared by multiple pages, we can't key
73 // our svg image layout on the page's real animation frame. Therefore, we 75 // our svg image layout on the page's real animation frame. Therefore, we
74 // run this fake animation timer to trigger layout in SVGImages. The name, 76 // run this fake animation timer to trigger layout in SVGImages. The name,
75 // "animationTimer", is to match the new requestAnimationFrame-based layout 77 // "animationTimer", is to match the new requestAnimationFrame-based layout
76 // approach. 78 // approach.
77 if (m_animationTimer.isActive()) 79 if (m_animationTimer.isActive())
78 return; 80 return;
79 // Schedule the 'animation' ASAP if the image does not contain any 81 // Schedule the 'animation' ASAP if the image does not contain any
80 // animations, but prefer a fixed, jittery, frame-delay if there're any 82 // animations, but prefer a fixed, jittery, frame-delay if there're any
81 // animations. Checking for pending/active animations could be more 83 // animations. Checking for pending/active animations could be more
82 // stringent. 84 // stringent.
83 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; 85 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0;
84 m_animationTimer.startOneShot(fireTime, FROM_HERE); 86 m_animationTimer.startOneShot(fireTime, FROM_HERE);
85 } 87 }
86 88
87 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) 89 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*)
88 { 90 {
89 // In principle, we should call requestAnimationFrame callbacks here, but 91 // In principle, we should call requestAnimationFrame callbacks here, but
90 // we know there aren't any because script is forbidden inside SVGImages. 92 // we know there aren't any because script is forbidden inside SVGImages.
91 if (m_image) { 93 if (m_image) {
92 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre ntTime()); 94 m_image->frameView()->page()->animator().serviceScriptedAnimations(curre ntTime());
93 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive(); 95 m_image->frameView()->updateLayoutAndStyleIfNeededRecursive();
94 } 96 }
95 } 97 }
96 98
97 } 99 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/as-image/svg-invalid-image-1-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698