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

Unified Diff: Source/core/loader/ImageLoader.cpp

Issue 1174463003: Oilpan: Disable lazy seeping for ImageLoaders (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « Source/core/loader/ImageLoader.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/ImageLoader.cpp
diff --git a/Source/core/loader/ImageLoader.cpp b/Source/core/loader/ImageLoader.cpp
index 6dcc6393f82a1b435d5b2a43cc54a63910894d6a..099d88a537bba1c8a91f74c9a92b453f441556fc 100644
--- a/Source/core/loader/ImageLoader.cpp
+++ b/Source/core/loader/ImageLoader.cpp
@@ -106,25 +106,13 @@ public:
void run() override
{
- if (m_loader) {
-#if ENABLE(OILPAN)
- // Oilpan: this WebThread::Task microtask may run after the
- // loader has been GCed, but not yet lazily swept & finalized
- // (when this task's loader reference will be cleared.)
- //
- // Handle this transient condition by explicitly checking here
- // before going ahead with the update operation. Unsafe to do it
- // if so, as the objects that the loader refers to may have been
- // finalized by this time.
- if (Heap::willObjectBeLazilySwept(m_loader))
- return;
-#endif
- if (m_scriptState->contextIsValid()) {
- ScriptState::Scope scope(m_scriptState.get());
- m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP, m_updateBehavior);
- } else {
- m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP, m_updateBehavior);
- }
+ if (!m_loader)
+ return;
+ if (m_scriptState->contextIsValid()) {
+ ScriptState::Scope scope(m_scriptState.get());
+ m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP, m_updateBehavior);
+ } else {
+ m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP, m_updateBehavior);
}
}
« no previous file with comments | « Source/core/loader/ImageLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698