Cleanup around LocalFrame initialization

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 245 matching lines @@
 }
 
 DEFINE_TRACE(FrameLoader) {
   visitor->Trace(frame_);
   visitor->Trace(progress_tracker_);
   visitor->Trace(document_loader_);
   visitor->Trace(provisional_document_loader_);
 }
 
 void FrameLoader::Init() {
+  ScriptForbiddenScope forbid_scripts;
   ResourceRequest initial_request(KURL(kParsedURLString, g_empty_string));
   initial_request.SetRequestContext(WebURLRequest::kRequestContextInternal);
   initial_request.SetFrameType(frame_->IsMainFrame()
                                    ? WebURLRequest::kFrameTypeTopLevel
                                    : WebURLRequest::kFrameTypeNested);
   provisional_document_loader_ =
       Client()->CreateDocumentLoader(frame_, initial_request, SubstituteData(),
                                      ClientRedirectPolicy::kNotClientRedirect);
   provisional_document_loader_->StartLoadingMainResource();
   frame_->GetDocument()->CancelParsing();
   state_machine_.AdvanceTo(
       FrameLoaderStateMachine::kDisplayingInitialEmptyDocument);
-  // Suppress finish notifications for inital empty documents, since they don't
+  // Suppress finish notifications for initial empty documents, since they don't
   // generate start notifications.
-  if (document_loader_)
-    document_loader_->SetSentDidFinishLoad();
-  // Self-suspend if created in an already suspended Page. Note that both
-  // startLoadingMainResource() and cancelParsing() may have already detached
-  // the frame, since they both fire JS events.
-  if (frame_->GetPage() && frame_->GetPage()->Suspended())
+  document_loader_->SetSentDidFinishLoad();
+  if (frame_->GetPage()->Suspended())
     SetDefersLoading(true);
   TakeObjectSnapshot();
 }
 
 LocalFrameClient* FrameLoader::Client() const {
   return static_cast<LocalFrameClient*>(frame_->Client());
 }
 
 void FrameLoader::SetDefersLoading(bool defers) {
   if (provisional_document_loader_)
@@ skipping 1448 matching lines @@
   // TODO(japhet): This is needed because the browser process DCHECKs if the
   // first entry we commit in a new frame has replacement set. It's unclear
   // whether the DCHECK is right, investigate removing this special case.
   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
                               (!Opener() || !request.Url().IsEmpty());
   loader->SetReplacesCurrentHistoryItem(replace_current_item);
   return loader;
 }
 
 }  // namespace blink