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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 1851743002: Simplify Supplementables post Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix component build 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/Navigator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index b8e3f6c1859734364c353c7147e26de3afee9474..a3b80df0143d10b27f7c83f3f16ec5b01eb2946c 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -245,7 +245,6 @@ LocalFrame::~LocalFrame()
DEFINE_TRACE(LocalFrame)
{
visitor->trace(m_instrumentingAgents);
-#if ENABLE(OILPAN)
visitor->trace(m_loader);
visitor->trace(m_navigationScheduler);
visitor->trace(m_view);
@@ -258,10 +257,9 @@ DEFINE_TRACE(LocalFrame)
visitor->trace(m_eventHandler);
visitor->trace(m_console);
visitor->trace(m_inputMethodController);
- HeapSupplementable<LocalFrame>::trace(visitor);
-#endif
- LocalFrameLifecycleNotifier::trace(visitor);
Frame::trace(visitor);
+ LocalFrameLifecycleNotifier::trace(visitor);
+ Supplementable<LocalFrame>::trace(visitor);
}
DOMWindow* LocalFrame::domWindow() const
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/Navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698