Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / page / FrameTree.h

diff --git a/WebCore/page/FrameTree.h b/WebCore/page/FrameTree.h
index d4c8c43..58b7c1f 100644 (file)
--- a/WebCore/page/FrameTree.h
+++ b/WebCore/page/FrameTree.h
@@ -20,13 +20,13 @@
 #ifndef FrameTree_h
 #define FrameTree_h
 
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
 
 namespace WebCore {
 
     class Frame;
 
-    class FrameTree : Noncopyable {
+    class FrameTree : public Noncopyable {
     public:
         FrameTree(Frame* thisFrame, Frame* parentFrame) 
             : m_thisFrame(thisFrame)
@@ -39,6 +39,7 @@ namespace WebCore {
         ~FrameTree();
 
         const AtomicString& name() const { return m_name; }
+        const AtomicString& uniqueName() const { return m_uniqueName; }
         void setName(const AtomicString&);
         void clearName();
         Frame* parent(bool checkForDisconnectedFrame = false) const;
@@ -73,7 +74,8 @@ namespace WebCore {
         Frame* m_thisFrame;
 
         Frame* m_parent;
-        AtomicString m_name;
+        AtomicString m_name; // The actual frame name (may be empty).
+        AtomicString m_uniqueName;
 
         // FIXME: use ListRefPtr?
         RefPtr<Frame> m_nextSibling;