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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 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
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 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ASSERT(resource == m_image.get()); 462 ASSERT(resource == m_image.get());
463 463
464 m_imageComplete = true; 464 m_imageComplete = true;
465 465
466 // Update ImageAnimationPolicy for m_image. 466 // Update ImageAnimationPolicy for m_image.
467 if (m_image) 467 if (m_image)
468 m_image->updateImageAnimationPolicy(); 468 m_image->updateImageAnimationPolicy();
469 469
470 updateLayoutObject(); 470 updateLayoutObject();
471 471
472 if (m_image && m_image->image() && m_image->image()->isSVGImage()) 472 if (m_image && m_image->getImage() && m_image->getImage()->isSVGImage())
473 toSVGImage(m_image->image())->updateUseCounters(element()->document()); 473 toSVGImage(m_image->getImage())->updateUseCounters(element()->document() );
474 474
475 if (!m_hasPendingLoadEvent) 475 if (!m_hasPendingLoadEvent)
476 return; 476 return;
477 477
478 if (resource->errorOccurred()) { 478 if (resource->errorOccurred()) {
479 loadEventSender().cancelEvent(this); 479 loadEventSender().cancelEvent(this);
480 m_hasPendingLoadEvent = false; 480 m_hasPendingLoadEvent = false;
481 481
482 if (resource->resourceError().isAccessCheck()) 482 if (resource->resourceError().isAccessCheck())
483 crossSiteOrCSPViolationOccurred(AtomicString(resource->resourceError ().failingURL())); 483 crossSiteOrCSPViolationOccurred(AtomicString(resource->resourceError ().failingURL()));
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 626
627 void ImageLoader::elementDidMoveToNewDocument() 627 void ImageLoader::elementDidMoveToNewDocument()
628 { 628 {
629 if (m_loadDelayCounter) 629 if (m_loadDelayCounter)
630 m_loadDelayCounter->documentChanged(m_element->document()); 630 m_loadDelayCounter->documentChanged(m_element->document());
631 clearFailedLoadURL(); 631 clearFailedLoadURL();
632 setImage(0); 632 setImage(0);
633 } 633 }
634 634
635 } // namespace blink 635 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698