Make FrameTree::uniqueName() more unique.

Source/core/page/FrameTree.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 98 matching lines @@
 }
 
 LocalFrame* FrameTree::lastChild() const
 {
     if (!m_thisFrame->loader().client())
         return 0;
     // FIXME: Temporary hack to stage converting locations that really should be Frame.
     return toLocalFrame(m_thisFrame->loader().client()->lastChild());
 }
 
+bool FrameTree::uniqueNameExists(const AtomicString& name) const
+{
+    for (LocalFrame* frame = top(); frame; frame = frame->tree().traverseNext()) {
+        if (frame->tree().uniqueName() == name)
+            return true;
+    }
+    return false;
+}
+
 AtomicString FrameTree::uniqueChildName(const AtomicString& requestedName) const
 {
-    if (!requestedName.isEmpty() && !child(requestedName) && requestedName != "_blank")
+    if (!requestedName.isEmpty() && !uniqueNameExists(requestedName) && requestedName != "_blank")
         return requestedName;
 
     // Create a repeatable name for a child about to be added to us. The name must be
     // unique within the frame tree. The string we generate includes a "path" of names
     // from the root frame down to us. For this path to be unique, each set of siblings must
     // contribute a unique name to the path, which can't collide with any HTML-assigned names.
     // We generate this path component by index in the child list along with an unlikely
     // frame name that can't be set in HTML because it collides with comment syntax.
 
     const char framePathPrefix[] = "<!--framePath ";
@@ skipping 45 matching lines @@
     return 0;
 }
 
 LocalFrame* FrameTree::scopedChild(const AtomicString& name) const
 {
     TreeScope* scope = m_thisFrame->document();
     if (!scope)
         return 0;
 
     for (LocalFrame* child = firstChild(); child; child = child->tree().nextSibling())
-        if (child->tree().uniqueName() == name && child->inScope(scope))
+        if (child->tree().name() == name && child->inScope(scope))
             return child;
     return 0;
 }
 
 inline unsigned FrameTree::scopedChildCount(TreeScope* scope) const
 {
     if (!scope)
         return 0;
 
     unsigned scopedCount = 0;
@@ skipping 21 matching lines @@
 {
     unsigned count = 0;
     for (LocalFrame* result = firstChild(); result; result = result->tree().nextSibling())
         ++count;
     return count;
 }
 
 LocalFrame* FrameTree::child(const AtomicString& name) const
 {
     for (LocalFrame* child = firstChild(); child; child = child->tree().nextSibling())
-        if (child->tree().uniqueName() == name)
+        if (child->tree().name() == name)
             return child;
     return 0;
 }
 
 LocalFrame* FrameTree::find(const AtomicString& name) const
 {
     if (name == "_self" || name == "_current" || name.isEmpty())
         return m_thisFrame;
 
     if (name == "_top")
         return top();
 
     if (name == "_parent")
         return parent() ? parent() : m_thisFrame;
 
     // Since "_blank" should never be any frame's name, the following just amounts to an optimization.
     if (name == "_blank")
         return 0;
 
     // Search subtree starting with this frame first.
     for (LocalFrame* frame = m_thisFrame; frame; frame = frame->tree().traverseNext(m_thisFrame))
-        if (frame->tree().uniqueName() == name)
+        if (frame->tree().name() == name)
             return frame;
 
     // Search the entire tree for this page next.
     Page* page = m_thisFrame->page();
 
     // The frame could have been detached from the page, so check it.
     if (!page)
         return 0;
 
     for (LocalFrame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
-        if (frame->tree().uniqueName() == name)
+        if (frame->tree().name() == name)
             return frame;
 
     // Search the entire tree of each of the other pages in this namespace.
     // FIXME: Is random order OK?
     const HashSet<Page*>& pages = Page::ordinaryPages();
     HashSet<Page*>::const_iterator end = pages.end();
     for (HashSet<Page*>::const_iterator it = pages.begin(); it != end; ++it) {
         Page* otherPage = *it;
         if (otherPage != page) {
             for (LocalFrame* frame = otherPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
-                if (frame->tree().uniqueName() == name)
+                if (frame->tree().name() == name)
                     return frame;
             }
         }
     }
 
     return 0;
 }
 
 bool FrameTree::isDescendantOf(const LocalFrame* ancestor) const
 {
@@ skipping 116 matching lines @@
 {
     if (!frame) {
         printf("Null input frame\n");
         return;
     }
 
     printFrames(frame->tree().top(), frame, 0);
 }
 
 #endif