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

Unified Diff: Source/bindings/core/v8/WindowProxy.cpp

Issue 834203003: Revert of Revert of Revert of Reland factor out window proxy management (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/WindowProxyManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/core/v8/WindowProxy.cpp
diff --git a/Source/bindings/core/v8/WindowProxy.cpp b/Source/bindings/core/v8/WindowProxy.cpp
index 08c719d5fbfcfaa93b0c3de76e02a86fb7f5b061..afe97dbd50974e9d62ae70881bd94998e4fdb256 100644
--- a/Source/bindings/core/v8/WindowProxy.cpp
+++ b/Source/bindings/core/v8/WindowProxy.cpp
@@ -245,7 +245,9 @@
void WindowProxy::createContext()
{
- if (!m_frame->client())
+ // This can get called after a frame is already detached...
+ // FIXME: Fix the code so we don't need this check.
+ if (m_frame->isLocalFrame() && !toLocalFrame(m_frame)->loader().documentLoader())
return;
// Create a new environment using an empty template for the shadow
« no previous file with comments | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/WindowProxyManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698