Skip to content

Commit

Permalink
Revert of Remove unneeded DocumentLoader null check in WindowProxy. (…
Browse files Browse the repository at this point in the history
…patchset #1 id:1 of https://codereview.chromium.org/797483003/)

Reason for revert:
Test plugins/js-from-destroy.html starts crashing on Mac.
Flakiness Dashboard: http://goo.gl/YID0Ti

Original issue's description:
> Remove unneeded DocumentLoader null check in WindowProxy.
> 
> BUG=none
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=186983

TBR=haraken@chromium.org,dcarney@chromium.org,dcheng@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=none

Review URL: https://codereview.chromium.org/794113005

git-svn-id: svn://svn.chromium.org/blink/trunk@187020 bbb929c8-8fbe-4397-9dbb-9b2b20218538
  • Loading branch information
aslushnikov committed Dec 12, 2014
1 parent 66f3b7e commit c649a5a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Source/bindings/core/v8/WindowProxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ bool WindowProxy::initialize()

void WindowProxy::createContext()
{
// The documentLoader pointer could be 0 during frame shutdown.
// FIXME: Can we remove this check?
if (!m_frame->loader().documentLoader())
return;

// Create a new environment using an empty template for the shadow
// object. Reuse the global object if one has been created earlier.
v8::Handle<v8::ObjectTemplate> globalTemplate = V8Window::getShadowObjectTemplate(m_isolate);
Expand Down

0 comments on commit c649a5a

Please sign in to comment.