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

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

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 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
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // 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,
75 // "animationTimer", is to match the new requestAnimationFrame-based layout 75 // "animationTimer", is to match the new requestAnimationFrame-based layout
76 // approach. 76 // approach.
77 if (m_animationTimer.isActive()) 77 if (m_animationTimer.isActive())
78 return; 78 return;
79 // Schedule the 'animation' ASAP if the image does not contain any 79 // Schedule the 'animation' ASAP if the image does not contain any
80 // 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
81 // animations. Checking for pending/active animations could be more 81 // animations. Checking for pending/active animations could be more
82 // stringent. 82 // stringent.
83 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0; 83 double fireTime = m_image->hasAnimations() ? animationFrameDelay : 0;
84 m_animationTimer.startOneShot(fireTime, FROM_HERE); 84 m_animationTimer.startOneShot(fireTime, BLINK_FROM_HERE);
85 } 85 }
86 86
87 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*) 87 void SVGImageChromeClient::animationTimerFired(Timer<SVGImageChromeClient>*)
88 { 88 {
89 if (!m_image) 89 if (!m_image)
90 return; 90 return;
91 // serviceScriptedAnimations runs requestAnimationFrame callbacks, but SVG 91 // serviceScriptedAnimations runs requestAnimationFrame callbacks, but SVG
92 // images can't have any so we assert there's no script. 92 // images can't have any so we assert there's no script.
93 ScriptForbiddenScope forbidScript; 93 ScriptForbiddenScope forbidScript;
94 94
95 // As neither SVGImage nor this chrome client object are on the Oilpan heap, 95 // As neither SVGImage nor this chrome client object are on the Oilpan heap,
96 // this object's reference to the SVGImage will not be traced should a GC 96 // this object's reference to the SVGImage will not be traced should a GC
97 // strike below. Hence, we must ensure that they both remain alive for 97 // strike below. Hence, we must ensure that they both remain alive for
98 // duration of this call. 98 // duration of this call.
99 // 99 //
100 // This is cannot arise non-Oilpan as an ImageResource is an owned object 100 // This is cannot arise non-Oilpan as an ImageResource is an owned object
101 // and will be promptly released along with its (SVG)Image..and everything 101 // and will be promptly released along with its (SVG)Image..and everything
102 // below, including this object and its timer. For code simplicity, the 102 // below, including this object and its timer. For code simplicity, the
103 // object protection isn't made the conditional on Oilpan. 103 // object protection isn't made the conditional on Oilpan.
104 // 104 //
105 // TODO(oilpan): move SVGImage to the Oilpan heap and remove this protection . 105 // TODO(oilpan): move SVGImage to the Oilpan heap and remove this protection .
106 RefPtr<SVGImage> protect(m_image); 106 RefPtr<SVGImage> protect(m_image);
107 m_image->frameView()->page()->animator().serviceScriptedAnimations(monotonic allyIncreasingTime()); 107 m_image->frameView()->page()->animator().serviceScriptedAnimations(monotonic allyIncreasingTime());
108 m_image->frameView()->updateAllLifecyclePhases(); 108 m_image->frameView()->updateAllLifecyclePhases();
109 } 109 }
110 110
111 } // namespace blink 111 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698