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

Unified Diff: Source/core/frame/DOMWindow.cpp

Issue 211373002: Oilpan: move DOMWindow object to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: setNativeInfoForInnerGlobalObject() -> setNativeInfoForHiddenWrapper() Created 6 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 | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/DOMWindow.cpp
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp
index a9c7d4dbf82096893986cf498a685d28b312a72e..05ca4e5203330c3594091597ef0da06b2a2da03d 100644
--- a/Source/core/frame/DOMWindow.cpp
+++ b/Source/core/frame/DOMWindow.cpp
@@ -112,9 +112,9 @@ namespace WebCore {
class PostMessageTimer FINAL : public SuspendableTimer {
public:
- PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace)
+ PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtrWillBeRawPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace)
: SuspendableTimer(window.document())
- , m_window(window)
+ , m_window(&window)
, m_message(message)
, m_origin(sourceOrigin)
, m_source(source)
@@ -126,7 +126,7 @@ public:
PassRefPtr<MessageEvent> event()
{
- return MessageEvent::create(m_channels.release(), m_message, m_origin, String(), m_source);
+ return MessageEvent::create(m_channels.release(), m_message, m_origin, String(), m_source.get());
}
SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); }
@@ -139,10 +139,10 @@ private:
// This object is deleted now.
}
- RefPtr<DOMWindow> m_window;
+ RefPtrWillBePersistent<DOMWindow> m_window;
RefPtr<SerializedScriptValue> m_message;
String m_origin;
- RefPtr<DOMWindow> m_source;
+ RefPtrWillBePersistent<DOMWindow> m_source;
OwnPtr<MessagePortChannelArray> m_channels;
RefPtr<SecurityOrigin> m_targetOrigin;
RefPtr<ScriptCallStack> m_stackTrace;
@@ -1760,7 +1760,7 @@ bool DOMWindow::isInsecureScriptAccess(DOMWindow& callingWindow, const String& u
return true;
}
-PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
+PassRefPtrWillBeRawPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
DOMWindow* callingWindow, DOMWindow* enteredWindow)
{
if (!isCurrentlyDisplayedInFrame())
@@ -1866,5 +1866,23 @@ PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier()
return DOMWindowLifecycleNotifier::create(this);
}
+void DOMWindow::trace(Visitor* visitor)
+{
+ visitor->trace(m_screen);
+ visitor->trace(m_history);
+ visitor->trace(m_locationbar);
+ visitor->trace(m_menubar);
+ visitor->trace(m_personalbar);
+ visitor->trace(m_scrollbars);
+ visitor->trace(m_statusbar);
+ visitor->trace(m_toolbar);
+ visitor->trace(m_console);
+ visitor->trace(m_navigator);
+ visitor->trace(m_location);
+ visitor->trace(m_sessionStorage);
+ visitor->trace(m_localStorage);
+ visitor->trace(m_applicationCache);
+ visitor->trace(m_performance);
+}
} // namespace WebCore
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698