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

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

Issue 891263003: Keep SVGImage alive across its animation timer callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 m_animationTimer.startOneShot(fireTime, FROM_HERE); 79 m_animationTimer.startOneShot(fireTime, FROM_HERE);
80 } 80 }
81 81
82 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) 82 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*)
83 { 83 {
84 if (!m_image) 84 if (!m_image)
85 return; 85 return;
86 // serviceScriptedAnimations runs requestAnimationFrame callbacks, but SVG 86 // serviceScriptedAnimations runs requestAnimationFrame callbacks, but SVG
87 // images can't have any so we assert there's no script. 87 // images can't have any so we assert there's no script.
88 ScriptForbiddenScope forbidScript; 88 ScriptForbiddenScope forbidScript;
89 m_image->frameView()->page()->animator().serviceScriptedAnimations(monotonic allyIncreasingTime()); 89 m_image->frameView()->page()->animator().serviceScriptedAnimations(monotonic allyIncreasingTime());
haraken 2015/02/02 10:49:01 m_image is on stack and thus it's protected, isn't
sof 2015/02/02 10:51:40 Not necessarily. "this" would be, but it is not a
haraken 2015/02/02 10:55:42 ah, understood... This looks nasty and we might wa
fs 2015/02/02 11:53:47 Isn't 'this' owned by 'm_image' here though?
90
91 // If a GC strikes during the previous call and the SVG image isn't
92 // otherwise referred to, it will be finalized and m_image is cleared.
93 if (!m_image)
94 return;
95
90 m_image->frameView()->updateLayoutAndStyleForPainting(); 96 m_image->frameView()->updateLayoutAndStyleForPainting();
91 } 97 }
92 98
93 } 99 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698