Chromium Code Reviews| Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| index a04b435332469afe0f8459223ae42588937a4b01..e07ce408fa76de00dc2e791d51c3acdcce2e638e 100644 |
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| @@ -870,7 +870,7 @@ v8::Local<v8::Context> WebLocalFrameImpl::MainWorldScriptContext() const { |
| bool WebFrame::ScriptCanAccess(WebFrame* target) { |
| return BindingSecurity::ShouldAllowAccessToFrame( |
| - CurrentDOMWindow(MainThreadIsolate()), target->ToImplBase()->GetFrame(), |
| + CurrentDOMWindow(MainThreadIsolate()), WebFrame::CoreFrame(target), |
|
dcheng
2017/04/26 11:45:34
Is it possible to omit WebFrame:: here?
mustaq
2017/04/26 18:12:48
Done.
|
| BindingSecurity::ErrorReportOption::kDoNotReport); |
| } |
| @@ -1550,7 +1550,7 @@ WebLocalFrameImpl* WebLocalFrameImpl::CreateProvisional( |
| DCHECK(client); |
| WebLocalFrameImpl* web_frame = new WebLocalFrameImpl( |
| old_web_frame, client, interface_provider, interface_registry); |
| - Frame* old_frame = old_web_frame->ToImplBase()->GetFrame(); |
| + Frame* old_frame = ToWebRemoteFrameImpl(old_web_frame)->GetFrame(); |
| web_frame->SetParent(old_web_frame->Parent()); |
| web_frame->SetOpener(old_web_frame->Opener()); |
| // Note: this *always* temporarily sets a frame owner, even for main frames! |
| @@ -1628,7 +1628,6 @@ DEFINE_TRACE(WebLocalFrameImpl) { |
| visitor->Trace(context_menu_node_); |
| visitor->Trace(text_checker_client_); |
| WebFrame::TraceFrames(visitor, this); |
| - WebFrameImplBase::Trace(visitor); |
| } |
| void WebLocalFrameImpl::SetCoreFrame(LocalFrame* frame) { |