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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ImageResource.cpp

Issue 1610883002: Oilpan: ImageObserver needs to be a GC mixin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test compile fix Created 4 years, 11 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 { 87 {
88 WTF_LOG(Timers, "new ImageResource(ResourceRequest, Image) %p", this); 88 WTF_LOG(Timers, "new ImageResource(ResourceRequest, Image) %p", this);
89 setStatus(Cached); 89 setStatus(Cached);
90 setLoading(false); 90 setLoading(false);
91 setCustomAcceptHeader(); 91 setCustomAcceptHeader();
92 } 92 }
93 93
94 ImageResource::~ImageResource() 94 ImageResource::~ImageResource()
95 { 95 {
96 WTF_LOG(Timers, "~ImageResource %p", this); 96 WTF_LOG(Timers, "~ImageResource %p", this);
97 clearImage(); 97 clearImage();
haraken 2016/01/20 23:24:27 Can we remove this in oilpan?
sof 2016/01/21 06:14:24 Certainly can; well spotted. Removed, but leaving
98 } 98 }
99 99
100 DEFINE_TRACE(ImageResource)
101 {
102 Resource::trace(visitor);
103 ImageObserver::trace(visitor);
104 }
105
100 void ImageResource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& options) 106 void ImageResource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& options)
101 { 107 {
102 if (!fetcher || fetcher->autoLoadImages()) 108 if (!fetcher || fetcher->autoLoadImages())
103 Resource::load(fetcher, options); 109 Resource::load(fetcher, options);
104 else 110 else
105 setLoading(false); 111 setLoading(false);
106 } 112 }
107 113
108 void ImageResource::didAddClient(ResourceClient* c) 114 void ImageResource::didAddClient(ResourceClient* c)
109 { 115 {
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 return true; 460 return true;
455 return !securityOrigin->taintsCanvas(response().url()); 461 return !securityOrigin->taintsCanvas(response().url());
456 } 462 }
457 463
458 bool ImageResource::loadingMultipartContent() const 464 bool ImageResource::loadingMultipartContent() const
459 { 465 {
460 return m_loader && m_loader->loadingMultipartContent(); 466 return m_loader && m_loader->loadingMultipartContent();
461 } 467 }
462 468
463 } // namespace blink 469 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.h ('k') | third_party/WebKit/Source/core/svg/graphics/SVGImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698