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

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

Issue 2905233002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive (Closed)
Patch Set: Rebase Created 3 years, 7 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
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 175b8c6d99bb4bd15238628ebd8d7a1198cace0a..340d4d1b273595b6743cc046b70c29797e9dbe0a 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.h
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
@@ -140,7 +140,6 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
virtual void NoImageResourceToLoad() {}
bool HasPendingEvent() const;
- void UpdatedHasPendingEvent();
void DispatchPendingLoadEvent();
void DispatchPendingErrorEvent();
@@ -160,8 +159,6 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
void CrossSiteOrCSPViolationOccurred(AtomicString);
void EnqueueImageLoadingMicroTask(UpdateFromElementBehavior, ReferrerPolicy);
- void TimerFired(TimerBase*);
-
KURL ImageSourceToKURL(AtomicString) const;
// Used to determine whether to immediately initiate the load or to schedule a
@@ -178,12 +175,7 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
Member<Element> element_;
Member<ImageResourceContent> image_;
Member<ImageResource> image_resource_for_image_document_;
- // FIXME: Oilpan: We might be able to remove this Persistent hack when
- // ImageResourceClient is traceable.
- GC_PLUGIN_IGNORE("http://crbug.com/383741")
- Persistent<Element> keep_alive_;
- Timer<ImageLoader> deref_element_timer_;
AtomicString failed_load_url_;
WeakPtr<Task> pending_task_; // owned by Microtask
std::unique_ptr<IncrementLoadEventDelayCount>
@@ -213,7 +205,6 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
bool image_complete_ : 1;
bool loading_image_document_ : 1;
- bool element_is_protected_ : 1;
bool suppress_error_events_ : 1;
};
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLVideoElement.idl ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698