Move unique name generation and tracking into //content.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 527 matching lines @@
   WebLocalFrame::close();
 
   m_client = nullptr;
 
   if (m_devToolsAgent)
     m_devToolsAgent.clear();
 
   m_selfKeepAlive.clear();
 }
 
-WebString WebLocalFrameImpl::uniqueName() const {
-  return frame()->tree().uniqueName();
-}
-
 WebString WebLocalFrameImpl::assignedName() const {
   return frame()->tree().name();
 }
 
 void WebLocalFrameImpl::setName(const WebString& name) {
   frame()->tree().setName(name);
 }
 
 WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const {
   // The URL to the icon may be in the header. As such, only
@@ skipping 963 matching lines @@
   // Note: this *always* temporarily sets a frame owner, even for main frames!
   // When a core Frame is created with no owner, it attempts to set itself as
   // the main frame of the Page. However, this is a provisional frame, and may
   // disappear, so Page::m_mainFrame can't be updated just yet.
   FrameOwner* tempOwner = DummyFrameOwner::create();
   // TODO(dcheng): This block is very similar to initializeCoreFrame. Try to
   // reuse it here.
   LocalFrame* frame = LocalFrame::create(webFrame->m_localFrameClientImpl.get(),
                                          oldFrame->page(), tempOwner,
                                          interfaceProvider, interfaceRegistry);
-  // Set the name and unique name directly, bypassing any of the normal logic
-  // to calculate unique name.
-  frame->tree().setPrecalculatedName(
-      toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name(),
-      toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().uniqueName());
+  frame->tree().setName(
+      toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name());
   webFrame->setCoreFrame(frame);
 
   frame->setOwner(oldFrame->owner());
 
   if (frame->owner() && frame->owner()->isRemote())
     toRemoteFrameOwner(frame->owner())
         ->setSandboxFlags(static_cast<SandboxFlags>(flags));
 
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
@@ skipping 51 matching lines @@
   WebFrame::traceFrames(visitor, this);
   WebFrameImplBase::trace(visitor);
 }
 
 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
   m_frame = frame;
 }
 
 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
                                             FrameOwner* owner,
-                                            const AtomicString& name,
-                                            const AtomicString& uniqueName) {
+                                            const AtomicString& name) {
   setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(),
                                   host ? &host->page() : nullptr, owner,
                                   m_interfaceProvider, m_interfaceRegistry));
-  frame()->tree().setPrecalculatedName(name, uniqueName);
+  frame()->tree().setName(name);
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame()->init();
   if (frame()) {
     if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() &&
         !parent() && !opener() &&
         frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) {
       frame()->document()->getSecurityOrigin()->grantUniversalAccess();
     }
@@ skipping 27 matching lines @@
   WebFrameOwnerProperties ownerProperties(
       ownerElement->browsingContextContainerName(),
       ownerElement->scrollingMode(), ownerElement->marginWidth(),
       ownerElement->marginHeight(), ownerElement->allowFullscreen(),
       ownerElement->allowPaymentRequest(), ownerElement->csp(),
       ownerElement->allowedFeatures());
   // FIXME: Using subResourceAttributeName as fallback is not a perfect
   // solution. subResourceAttributeName returns just one attribute name. The
   // element might not have the attribute, and there might be other attributes
   // which can identify the element.
-  AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame(
-      name,
-      ownerElement->getAttribute(ownerElement->subResourceAttributeName()));
   WebLocalFrameImpl* webframeChild =
       toWebLocalFrameImpl(m_client->createChildFrame(
-          this, scope, name, uniqueName,
+          this, scope, name,
+          ownerElement->getAttribute(ownerElement->subResourceAttributeName()),
           static_cast<WebSandboxFlags>(ownerElement->getSandboxFlags()),
           ownerProperties));
   if (!webframeChild)
     return nullptr;
 
-  webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name,
-                                     uniqueName);
+  webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name);
   // Initializing the core frame may cause the new child to be detached, since
   // it may dispatch a load event in the parent.
   if (!webframeChild->parent())
     return nullptr;
 
   // If we're moving in the back/forward list, we might want to replace the
   // content of this child frame with whatever was there at that point.
   HistoryItem* childItem = nullptr;
   if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) &&
       !frame()->document()->loadEventFinished())
@@ skipping 829 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink