Minor clean-up on WindowProxy::disposeContext()

third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 81 matching lines @@
 }
 
 DEFINE_TRACE(WindowProxy) {
   visitor->trace(m_frame);
 }
 
 void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
   if (!isContextInitialized())
     return;
 
-  v8::HandleScope handleScope(m_isolate);
+  ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Context> context = m_scriptState->context();
   if (m_frame->isLocalFrame()) {
     LocalFrame* frame = toLocalFrame(m_frame);
     // The embedder could run arbitrary code in response to the
     // willReleaseScriptContext callback, so all disposing should happen after
     // it returns.
     frame->loader().client()->willReleaseScriptContext(context,
                                                        m_world->worldId());
     MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
   }
@@ skipping 16 matching lines @@
   m_scriptState->disposePerContextData();
 
   // It's likely that disposing the context has created a lot of
   // garbage. Notify V8 about this so it'll have a chance of cleaning
   // it up when idle.
   V8GCForContextDispose::instance().notifyContextDisposed(
       m_frame->isMainFrame());
 }
 
 void WindowProxy::clearForClose() {
-  if (!isContextInitialized())
-    return;
-
   disposeContext(DoNotDetachGlobal);
 }
 
 void WindowProxy::clearForNavigation() {
-  if (!isContextInitialized())
-    return;
-
-  ScriptState::Scope scope(m_scriptState.get());
-
   disposeContext(DetachGlobal);
 }
 
 v8::Local<v8::Object> WindowProxy::globalIfNotDetached() {
   if (!isContextInitialized())
     return v8::Local<v8::Object>();
   DCHECK(m_scriptState->contextIsValid());
   DCHECK(m_globalProxy == m_scriptState->context()->Global());
   return m_globalProxy.newLocal(m_isolate);
 }
@@ skipping 398 matching lines @@
       .ToChecked();
 }
 
 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
   if (!isContextInitialized())
     return;
   setSecurityToken(origin);
 }
 
 }  // namespace blink