| 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..edd2aa4b288ab92726a4d7c8154ae6e32e22105e 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()), target->GetFrame(),
|
| 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 = 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,13 +1628,16 @@ 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) {
|
| frame_ = frame;
|
| }
|
|
|
| +void WebLocalFrameImpl::InitializeCoreFrame(Page& page) {
|
| + InitializeCoreFrame(page, 0, g_null_atom);
|
| +}
|
| +
|
| void WebLocalFrameImpl::InitializeCoreFrame(Page& page,
|
| FrameOwner* owner,
|
| const AtomicString& name) {
|
|
|