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

Side by Side Diff: Source/WebCore/svg/graphics/SVGImage.cpp

Issue 12310113: Merge 143640 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/svg/animation/SMILTimeContainer.cpp ('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) 2006 Eric Seidel <eric@webkit.org> 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 Frame* frame = m_page->mainFrame(); 274 Frame* frame = m_page->mainFrame();
275 SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->r ootElement(); 275 SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->r ootElement();
276 if (!rootElement) 276 if (!rootElement)
277 return; 277 return;
278 rootElement->pauseAnimations(); 278 rootElement->pauseAnimations();
279 } 279 }
280 280
281 void SVGImage::resetAnimation() 281 void SVGImage::resetAnimation()
282 { 282 {
283 stopAnimation(); 283 stopAnimation();
284 startAnimation();
285 } 284 }
286 285
287 bool SVGImage::dataChanged(bool allDataReceived) 286 bool SVGImage::dataChanged(bool allDataReceived)
288 { 287 {
289 // Don't do anything if is an empty image. 288 // Don't do anything if is an empty image.
290 if (!data()->size()) 289 if (!data()->size())
291 return true; 290 return true;
292 291
293 if (allDataReceived) { 292 if (allDataReceived) {
294 static FrameLoaderClient* dummyFrameLoaderClient = new EmptyFrameLoader Client; 293 static FrameLoaderClient* dummyFrameLoaderClient = new EmptyFrameLoader Client;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 { 336 {
338 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceImage); 337 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceImage);
339 Image::reportMemoryUsage(memoryObjectInfo); 338 Image::reportMemoryUsage(memoryObjectInfo);
340 info.addMember(m_chromeClient, "chromeClient"); 339 info.addMember(m_chromeClient, "chromeClient");
341 info.addMember(m_page, "page"); 340 info.addMember(m_page, "page");
342 } 341 }
343 342
344 } 343 }
345 344
346 #endif // ENABLE(SVG) 345 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/svg/animation/SMILTimeContainer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698