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

Unified Diff: third_party/WebKit/Source/core/loader/ImageLoader.h

Issue 2344563002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive
Patch Set: fix Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/ImageLoader.h
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.h b/third_party/WebKit/Source/core/loader/ImageLoader.h
index 4898446af2cdcee88aef2c42cc7d63b547deb88d..6fce9b95a1ca6f4f83cf78478f1745550fc35bb0 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.h
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
@@ -134,8 +134,6 @@ private:
void crossSiteOrCSPViolationOccurred(AtomicString);
void enqueueImageLoadingMicroTask(UpdateFromElementBehavior, ReferrerPolicy);
- void timerFired(TimerBase*);
-
KURL imageSourceToKURL(AtomicString) const;
// Used to determine whether to immediately initiate the load
@@ -151,12 +149,7 @@ private:
Member<Element> m_element;
Member<ImageResource> m_image;
- // FIXME: Oilpan: We might be able to remove this Persistent hack when
- // ImageResourceClient is traceable.
- GC_PLUGIN_IGNORE("http://crbug.com/383741")
- Persistent<Element> m_keepAlive;
- Timer<ImageLoader> m_derefElementTimer;
AtomicString m_failedLoadURL;
WeakPtr<Task> m_pendingTask; // owned by Microtask
std::unique_ptr<IncrementLoadEventDelayCount> m_loadDelayCounter;
@@ -164,7 +157,6 @@ private:
bool m_hasPendingErrorEvent : 1;
bool m_imageComplete : 1;
bool m_loadingImageDocument : 1;
- bool m_elementIsProtected : 1;
bool m_suppressErrorEvents : 1;
};
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698