rename blink::WebFrame::FromFrame to blink::WebFrame::FromCoreFrame

rogerwang · rogerwang · commit 7c485413ad8a · 2021-03-03T02:29:54.000-07:00
diff --git a/src/nw_custom_bindings.cc b/src/nw_custom_bindings.cc
@@ -243,7 +243,7 @@ void NWCustomBindings::EvalScript(
   }else{
     v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[0]);
     blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::ToImpl(frm);
-    web_frame = blink::WebFrame::FromFrame(iframe->ContentFrame());
+    web_frame = blink::WebFrame::FromCoreFrame(iframe->ContentFrame());
   }
 #if defined(OS_WIN)
   base::string16 jscript((WCHAR*)*v8::String::Value(isolate, args[1]));
@@ -298,7 +298,7 @@ void NWCustomBindings::EvalNWBin(
   }else{
     v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[0]);
     blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::ToImpl(frm);
-    web_frame = blink::WebFrame::FromFrame(iframe->ContentFrame());
+    web_frame = blink::WebFrame::FromCoreFrame(iframe->ContentFrame());
   }
   blink::WebLocalFrame* local_frame = web_frame->ToWebLocalFrame();
   if (args.Length() == 2 || args[2]->IsNull()) {
@@ -429,7 +429,7 @@ void NWCustomBindings::SetDevToolsJail(const v8::FunctionCallbackInfo<v8::Value>
   }else{
 	  v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[0]);
 	  blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::ToImpl(frm);
-    main_frame->setDevtoolsJail(blink::WebFrame::FromFrame(iframe->ContentFrame()));
+    main_frame->setDevtoolsJail(blink::WebFrame::FromCoreFrame(iframe->ContentFrame()));
   }
   args.GetReturnValue().Set(v8::Undefined(isolate));
   return;
diff --git a/src/renderer/nw_extensions_renderer_hooks.cc b/src/renderer/nw_extensions_renderer_hooks.cc
@@ -156,7 +156,7 @@ void WebWorkerStartThreadHook(blink::Frame* frame, const char* path, std::string
   if (frame) {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
-    blink::WebFrame* web_frame = blink::WebFrame::FromFrame(frame);
+    blink::WebFrame* web_frame = blink::WebFrame::FromCoreFrame(frame);
     blink::WebLocalFrame* local_frame = web_frame->ToWebLocalFrame();
     v8::Local<v8::Context> v8_context = local_frame->MainWorldScriptContext();
     ScriptContext* script_context =
