Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Removed unnecessary crbug comment. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() 807 logging::LogMessage("CONSOLE", line_no, resolved_level).stream()
808 << "\"" << message << "\", source: " << source_id << " (" << line_no 808 << "\"" << message << "\", source: " << source_id << " (" << line_no
809 << ")"; 809 << ")";
810 } 810 }
811 } 811 }
812 812
813 void RenderFrameHostImpl::OnCreateChildFrame( 813 void RenderFrameHostImpl::OnCreateChildFrame(
814 int new_routing_id, 814 int new_routing_id,
815 blink::WebTreeScopeType scope, 815 blink::WebTreeScopeType scope,
816 const std::string& frame_name, 816 const std::string& frame_name,
817 const std::string& frame_unique_name,
817 blink::WebSandboxFlags sandbox_flags, 818 blink::WebSandboxFlags sandbox_flags,
818 const blink::WebFrameOwnerProperties& frame_owner_properties) { 819 const blink::WebFrameOwnerProperties& frame_owner_properties) {
820 // TODO(lukasza): Call ReceivedBadMessage when |frame_unique_name| is empty?
821 DCHECK(!frame_unique_name.empty());
822
819 // It is possible that while a new RenderFrameHost was committed, the 823 // It is possible that while a new RenderFrameHost was committed, the
820 // RenderFrame corresponding to this host sent an IPC message to create a 824 // RenderFrame corresponding to this host sent an IPC message to create a
821 // frame and it is delivered after this host is swapped out. 825 // frame and it is delivered after this host is swapped out.
822 // Ignore such messages, as we know this RenderFrameHost is going away. 826 // Ignore such messages, as we know this RenderFrameHost is going away.
823 if (rfh_state_ != RenderFrameHostImpl::STATE_DEFAULT || 827 if (rfh_state_ != RenderFrameHostImpl::STATE_DEFAULT ||
824 frame_tree_node_->current_frame_host() != this) 828 frame_tree_node_->current_frame_host() != this)
825 return; 829 return;
826 830
827 frame_tree_->AddFrame(frame_tree_node_, GetProcess()->GetID(), new_routing_id, 831 frame_tree_->AddFrame(frame_tree_node_, GetProcess()->GetID(), new_routing_id,
828 scope, frame_name, sandbox_flags, 832 scope, frame_name, frame_unique_name, sandbox_flags,
829 frame_owner_properties); 833 frame_owner_properties);
830 } 834 }
831 835
832 void RenderFrameHostImpl::OnDetach() { 836 void RenderFrameHostImpl::OnDetach() {
833 frame_tree_->RemoveFrame(frame_tree_node_); 837 frame_tree_->RemoveFrame(frame_tree_node_);
834 } 838 }
835 839
836 void RenderFrameHostImpl::OnFrameFocused() { 840 void RenderFrameHostImpl::OnFrameFocused() {
837 frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance()); 841 frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
838 } 842 }
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 1405
1402 void RenderFrameHostImpl::OnDidAccessInitialDocument() { 1406 void RenderFrameHostImpl::OnDidAccessInitialDocument() {
1403 delegate_->DidAccessInitialDocument(); 1407 delegate_->DidAccessInitialDocument();
1404 } 1408 }
1405 1409
1406 void RenderFrameHostImpl::OnDidChangeOpener(int32_t opener_routing_id) { 1410 void RenderFrameHostImpl::OnDidChangeOpener(int32_t opener_routing_id) {
1407 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id, 1411 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id,
1408 GetSiteInstance()); 1412 GetSiteInstance());
1409 } 1413 }
1410 1414
1411 void RenderFrameHostImpl::OnDidChangeName(const std::string& name) { 1415 void RenderFrameHostImpl::OnDidChangeName(const std::string& name,
1416 const std::string& unique_name) {
1412 std::string old_name = frame_tree_node()->frame_name(); 1417 std::string old_name = frame_tree_node()->frame_name();
1413 frame_tree_node()->SetFrameName(name); 1418 frame_tree_node()->SetFrameName(name, unique_name);
1414 if (old_name.empty() && !name.empty()) 1419 if (old_name.empty() && !name.empty())
1415 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); 1420 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame();
1416 delegate_->DidChangeName(this, name); 1421 delegate_->DidChangeName(this, name);
1417 } 1422 }
1418 1423
1419 void RenderFrameHostImpl::OnEnforceStrictMixedContentChecking() { 1424 void RenderFrameHostImpl::OnEnforceStrictMixedContentChecking() {
1420 frame_tree_node()->SetEnforceStrictMixedContentChecking(true); 1425 frame_tree_node()->SetEnforceStrictMixedContentChecking(true);
1421 } 1426 }
1422 1427
1423 void RenderFrameHostImpl::OnDidAssignPageId(int32_t page_id) { 1428 void RenderFrameHostImpl::OnDidAssignPageId(int32_t page_id) {
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 *dst = src; 2557 *dst = src;
2553 2558
2554 if (src.routing_id != -1) 2559 if (src.routing_id != -1)
2555 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2560 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2556 2561
2557 if (src.parent_routing_id != -1) 2562 if (src.parent_routing_id != -1)
2558 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2563 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2559 } 2564 }
2560 2565
2561 } // namespace content 2566 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698