Rename LocalFrame::Script() to GetScriptController()

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 657 matching lines @@
     return;
   SubframeLoadingDisabler disabler(GetFrame()->GetDocument());
   GetFrame()->Loader().DispatchUnloadEvent();
 }
 
 void WebLocalFrameImpl::ExecuteScript(const WebScriptSource& source) {
   DCHECK(GetFrame());
   TextPosition position(OrdinalNumber::FromOneBasedInt(source.start_line),
                         OrdinalNumber::First());
   v8::HandleScope handle_scope(ToIsolate(GetFrame()));
-  GetFrame()->Script().ExecuteScriptInMainWorld(
+  GetFrame()->GetScriptController().ExecuteScriptInMainWorld(
       ScriptSourceCode(source.code, source.url, position));
 }
 
 void WebLocalFrameImpl::ExecuteScriptInIsolatedWorld(
     int world_id,
     const WebScriptSource* sources_in,
     unsigned num_sources) {
   DCHECK(GetFrame());
   CHECK_GT(world_id, 0);
   CHECK_LT(world_id, DOMWrapperWorld::kEmbedderWorldIdLimit);
 
   HeapVector<ScriptSourceCode> sources =
       CreateSourcesVector(sources_in, num_sources);
   v8::HandleScope handle_scope(ToIsolate(GetFrame()));
-  GetFrame()->Script().ExecuteScriptInIsolatedWorld(world_id, sources, 0);
+  GetFrame()->GetScriptController().ExecuteScriptInIsolatedWorld(world_id,
+                                                                 sources, 0);
 }
 
 void WebLocalFrameImpl::SetIsolatedWorldSecurityOrigin(
     int world_id,
     const WebSecurityOrigin& security_origin) {
   DCHECK(GetFrame());
   DOMWrapperWorld::SetIsolatedWorldSecurityOrigin(world_id,
                                                   security_origin.Get());
 }
 
@@ skipping 44 matching lines @@
     return;
   V8GCController::CollectGarbage(v8::Isolate::GetCurrent());
 }
 
 v8::Local<v8::Value> WebLocalFrameImpl::ExecuteScriptAndReturnValue(
     const WebScriptSource& source) {
   DCHECK(GetFrame());
 
   TextPosition position(OrdinalNumber::FromOneBasedInt(source.start_line),
                         OrdinalNumber::First());
-  return GetFrame()->Script().ExecuteScriptInMainWorldAndReturnValue(
-      ScriptSourceCode(source.code, source.url, position));
+  return GetFrame()
+      ->GetScriptController()
+      .ExecuteScriptInMainWorldAndReturnValue(
+          ScriptSourceCode(source.code, source.url, position));
 }
 
 void WebLocalFrameImpl::RequestExecuteScriptAndReturnValue(
     const WebScriptSource& source,
     bool user_gesture,
     WebScriptExecutionCallback* callback) {
   DCHECK(GetFrame());
 
   RefPtr<DOMWrapperWorld> main_world = &DOMWrapperWorld::MainWorld();
   SuspendableScriptExecutor* executor = SuspendableScriptExecutor::Create(
@@ skipping 22 matching lines @@
     WebVector<v8::Local<v8::Value>>* results) {
   DCHECK(GetFrame());
   CHECK_GT(world_id, 0);
   CHECK_LT(world_id, DOMWrapperWorld::kEmbedderWorldIdLimit);
 
   HeapVector<ScriptSourceCode> sources =
       CreateSourcesVector(sources_in, num_sources);
 
   if (results) {
     Vector<v8::Local<v8::Value>> script_results;
-    GetFrame()->Script().ExecuteScriptInIsolatedWorld(world_id, sources,
-                                                      &script_results);
+    GetFrame()->GetScriptController().ExecuteScriptInIsolatedWorld(
+        world_id, sources, &script_results);
     WebVector<v8::Local<v8::Value>> v8_results(script_results.size());
     for (unsigned i = 0; i < script_results.size(); i++)
       v8_results[i] =
           v8::Local<v8::Value>::New(ToIsolate(GetFrame()), script_results[i]);
     results->Swap(v8_results);
   } else {
     v8::HandleScope handle_scope(ToIsolate(GetFrame()));
-    GetFrame()->Script().ExecuteScriptInIsolatedWorld(world_id, sources, 0);
+    GetFrame()->GetScriptController().ExecuteScriptInIsolatedWorld(world_id,
+                                                                   sources, 0);
   }
 }
 
 void WebLocalFrameImpl::RequestExecuteScriptInIsolatedWorld(
     int world_id,
     const WebScriptSource* sources_in,
     unsigned num_sources,
     bool user_gesture,
     ScriptExecutionType option,
     WebScriptExecutionCallback* callback) {
@@ skipping 1111 matching lines @@
   if (SchemeRegistry::ShouldTreatURLSchemeAsNotAllowingJavascriptURLs(
           GetFrame()->GetDocument()->Url().Protocol()))
     return;
 
   String script = DecodeURLEscapeSequences(
       url.GetString().Substring(strlen("javascript:")));
   UserGestureIndicator gesture_indicator(DocumentUserGestureToken::Create(
       GetFrame()->GetDocument(), UserGestureToken::kNewGesture));
   v8::HandleScope handle_scope(ToIsolate(GetFrame()));
   v8::Local<v8::Value> result =
-      GetFrame()->Script().ExecuteScriptInMainWorldAndReturnValue(
+      GetFrame()->GetScriptController().ExecuteScriptInMainWorldAndReturnValue(
           ScriptSourceCode(script));
   if (result.IsEmpty() || !result->IsString())
     return;
   String script_result = ToCoreString(v8::Local<v8::String>::Cast(result));
   if (!GetFrame()->GetNavigationScheduler().LocationChangePending())
     GetFrame()->Loader().ReplaceDocumentWhileExecutingJavaScriptURL(
         script_result, owner_document);
 }
 
 HitTestResult WebLocalFrameImpl::HitTestResultForVisualViewportPos(
@@ skipping 604 matching lines @@
 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const {
   return *text_checker_client_;
 }
 
 void WebLocalFrameImpl::SetTextCheckClient(
     WebTextCheckClient* text_check_client) {
   text_check_client_ = text_check_client;
 }
 
 }  // namespace blink