Commit cae17598 authored by Andrey Kosyakov's avatar Andrey Kosyakov Committed by Commit Bot

DevTools: get frame name from frame tree, not owner element

Bug: 823579
Change-Id: I05cc69fc17b4195a1404583ca6635b9fd0888eb7
Reviewed-on: https://chromium-review.googlesource.com/993972Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547858}
parent 85442de7
......@@ -937,15 +937,13 @@ std::unique_ptr<protocol::Page::Frame> InspectorPageAgent::BuildObjectForFrame(
.setSecurityOrigin(SecurityOrigin::Create(url)->ToRawString())
.build();
Frame* parent_frame = frame->Tree().Parent();
if (parent_frame)
if (parent_frame) {
frame_object->setParentId(IdentifiersFactory::FrameId(parent_frame));
if (frame->DeprecatedLocalOwner()) {
AtomicString name = frame->DeprecatedLocalOwner()->GetNameAttribute();
if (name.IsEmpty())
AtomicString name = frame->Tree().GetName();
if (name.IsEmpty() && frame->DeprecatedLocalOwner())
name = frame->DeprecatedLocalOwner()->getAttribute(HTMLNames::idAttr);
frame_object->setName(name);
}
if (loader && !loader->UnreachableURL().IsEmpty())
frame_object->setUnreachableUrl(loader->UnreachableURL().GetString());
return frame_object;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment