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

Side by Side Diff: Source/core/loader/ImageLoader.cpp

Issue 892783003: Check the condition for animation policy of bitmapImage on notifyFinished. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move updating policy to ImageLoader 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 | « Source/core/fetch/ImageResource.cpp ('k') | Source/platform/graphics/BitmapImage.h » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 382
383 void ImageLoader::notifyFinished(Resource* resource) 383 void ImageLoader::notifyFinished(Resource* resource)
384 { 384 {
385 WTF_LOG(Timers, "ImageLoader::notifyFinished %p; m_hasPendingLoadEvent=%d", 385 WTF_LOG(Timers, "ImageLoader::notifyFinished %p; m_hasPendingLoadEvent=%d",
386 this, m_hasPendingLoadEvent); 386 this, m_hasPendingLoadEvent);
387 387
388 ASSERT(m_failedLoadURL.isEmpty()); 388 ASSERT(m_failedLoadURL.isEmpty());
389 ASSERT(resource == m_image.get()); 389 ASSERT(resource == m_image.get());
390 390
391 m_imageComplete = true; 391 m_imageComplete = true;
392
393 // Update ImageAnimationPolicy for m_image.
394 if (m_image)
395 m_image->updateImageAnimationPolicy();
396
392 updateRenderer(); 397 updateRenderer();
393 398
394 if (!m_hasPendingLoadEvent) 399 if (!m_hasPendingLoadEvent)
395 return; 400 return;
396 401
397 if (resource->errorOccurred()) { 402 if (resource->errorOccurred()) {
398 loadEventSender().cancelEvent(this); 403 loadEventSender().cancelEvent(this);
399 m_hasPendingLoadEvent = false; 404 m_hasPendingLoadEvent = false;
400 405
401 if (resource->resourceError().isAccessCheck()) 406 if (resource->resourceError().isAccessCheck())
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 #endif 589 #endif
585 } 590 }
586 591
587 #if ENABLE(OILPAN) 592 #if ENABLE(OILPAN)
588 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 593 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
589 { 594 {
590 m_loader.willRemoveClient(m_client); 595 m_loader.willRemoveClient(m_client);
591 } 596 }
592 #endif 597 #endif
593 } 598 }
OLDNEW
« no previous file with comments | « Source/core/fetch/ImageResource.cpp ('k') | Source/platform/graphics/BitmapImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698