Rename LocalFrame::Script() to GetScriptController()

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 128 matching lines @@
   // Root of the layout tree for the document contained in this frame.
   LayoutView* ContentLayoutObject() const;
   LayoutViewItem ContentLayoutItem() const;
 
   Editor& GetEditor() const;
   EventHandler& GetEventHandler() const;
   FrameLoader& Loader() const;
   NavigationScheduler& GetNavigationScheduler() const;
   FrameSelection& Selection() const;
   InputMethodController& GetInputMethodController() const;
-  ScriptController& Script() const;
+  ScriptController& GetScriptController() const;
   SpellChecker& GetSpellChecker() const;
   FrameConsole& Console() const;
 
   // This method is used to get the highest level LocalFrame in this
   // frame's in-process subtree.
   // FIXME: This is a temporary hack to support RemoteFrames, and callers
   // should be updated to avoid storing things on the main frame.
   LocalFrame* LocalFrameRoot();
 
   // Note that the result of this function should not be cached: a frame is
@@ skipping 96 matching lines @@
 
   mutable FrameLoader loader_;
   Member<NavigationScheduler> navigation_scheduler_;
 
   // Cleared by LocalFrame::detach(), so as to keep the observable lifespan
   // of LocalFrame::view().
   Member<FrameView> view_;
   // Usually 0. Non-null if this is the top frame of PagePopup.
   Member<Element> page_popup_owner_;
 
-  const Member<ScriptController> script_;
+  const Member<ScriptController> script_controller_;
   const Member<Editor> editor_;
   const Member<SpellChecker> spell_checker_;
   const Member<FrameSelection> selection_;
   const Member<EventHandler> event_handler_;
   const Member<FrameConsole> console_;
   const Member<InputMethodController> input_method_controller_;
 
   int navigation_disable_count_;
 
   float page_zoom_factor_;
@@ skipping 14 matching lines @@
 
 inline NavigationScheduler& LocalFrame::GetNavigationScheduler() const {
   ASSERT(navigation_scheduler_);
   return *navigation_scheduler_.Get();
 }
 
 inline FrameView* LocalFrame::View() const {
   return view_.Get();
 }
 
-inline ScriptController& LocalFrame::Script() const {
-  return *script_;
+inline ScriptController& LocalFrame::GetScriptController() const {
+  return *script_controller_;
 }
 
 inline FrameSelection& LocalFrame::Selection() const {
   return *selection_;
 }
 
 inline Editor& LocalFrame::GetEditor() const {
   return *editor_;
 }
 
@@ skipping 64 matching lines @@
   explicit ScopedFrameBlamer(LocalFrame*);
   ~ScopedFrameBlamer();
 
  private:
   Member<LocalFrame> frame_;
 };
 
 }  // namespace blink
 
 #endif  // LocalFrame_h