Rename LocalFrame::Script() to GetScriptController()

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 345 matching lines @@
 }
 
 DEFINE_TRACE(LocalFrame) {
   visitor->Trace(instrumenting_agents_);
   visitor->Trace(performance_monitor_);
   visitor->Trace(loader_);
   visitor->Trace(navigation_scheduler_);
   visitor->Trace(view_);
   visitor->Trace(dom_window_);
   visitor->Trace(page_popup_owner_);
-  visitor->Trace(script_);
+  visitor->Trace(script_controller_);
   visitor->Trace(editor_);
   visitor->Trace(spell_checker_);
   visitor->Trace(selection_);
   visitor->Trace(event_handler_);
   visitor->Trace(console_);
   visitor->Trace(input_method_controller_);
   Frame::Trace(visitor);
   Supplementable<LocalFrame>::Trace(visitor);
 }
 
@@ skipping 59 matching lines @@
   // - FrameLoader::detach() can fire XHR abort events
   // - Document::shutdown()'s deferred widget updates can run script.
   ScriptForbiddenScope forbid_script;
   loader_.Clear();
   if (!Client())
     return;
 
   Client()->WillBeDetached();
   // Notify ScriptController that the frame is closing, since its cleanup ends
   // up calling back to LocalFrameClient via WindowProxy.
-  Script().ClearForClose();
+  GetScriptController().ClearForClose();
   SetView(nullptr);
 
   page_->GetEventHandlerRegistry().DidRemoveAllEventHandlers(*DomWindow());
 
   DomWindow()->FrameDestroyed();
 
   // TODO: Page should take care of updating focus/scrolling instead of Frame.
   // TODO: It's unclear as to why this is called more than once, but it is,
   // so page() could be null.
   if (GetPage() && GetPage()->GetFocusController().FocusedFrame() == this)
@@ skipping 73 matching lines @@
 LocalWindowProxy* LocalFrame::WindowProxy(DOMWrapperWorld& world) {
   return ToLocalWindowProxy(Frame::GetWindowProxy(world));
 }
 
 LocalDOMWindow* LocalFrame::DomWindow() const {
   return ToLocalDOMWindow(dom_window_);
 }
 
 void LocalFrame::SetDOMWindow(LocalDOMWindow* dom_window) {
   if (dom_window)
-    Script().ClearWindowProxy();
+    GetScriptController().ClearWindowProxy();
 
   if (this->DomWindow())
     this->DomWindow()->Reset();
   dom_window_ = dom_window;
 }
 
 Document* LocalFrame::GetDocument() const {
   return DomWindow() ? DomWindow()->document() : nullptr;
 }
 
@@ skipping 324 matching lines @@
 inline LocalFrame::LocalFrame(LocalFrameClient* client,
                               Page& page,
                               FrameOwner* owner,
                               InterfaceProvider* interface_provider,
                               InterfaceRegistry* interface_registry)
     : Frame(client, page, owner, LocalWindowProxyManager::Create(*this)),
       frame_scheduler_(page.GetChromeClient().CreateFrameScheduler(
           client->GetFrameBlameContext())),
       loader_(this),
       navigation_scheduler_(NavigationScheduler::Create(this)),
-      script_(ScriptController::Create(
+      script_controller_(ScriptController::Create(
           *this,
           *static_cast<LocalWindowProxyManager*>(GetWindowProxyManager()))),
       editor_(Editor::Create(*this)),
       spell_checker_(SpellChecker::Create(*this)),
       selection_(FrameSelection::Create(*this)),
       event_handler_(new EventHandler(*this)),
       console_(FrameConsole::Create(*this)),
       input_method_controller_(InputMethodController::Create(*this)),
       navigation_disable_count_(0),
       page_zoom_factor_(ParentPageZoomFactor(this)),
@@ skipping 50 matching lines @@
   if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext())
     frame_->Client()->GetFrameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext())
     frame_->Client()->GetFrameBlameContext()->Leave();
 }
 
 }  // namespace blink