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

Side by Side Diff: third_party/WebKit/Source/core/page/FrameTree.h

Issue 1968213002: Try harder to make sure that blink::FrameTree::m_uniqueName is truly unique. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const AtomicString& name, 75 const AtomicString& name,
76 const AtomicString& fallbackName = nullAtom) const; 76 const AtomicString& fallbackName = nullAtom) const;
77 77
78 private: 78 private:
79 Frame* deepLastChild() const; 79 Frame* deepLastChild() const;
80 AtomicString calculateUniqueNameForChildFrame( 80 AtomicString calculateUniqueNameForChildFrame(
81 bool existingChildFrame, 81 bool existingChildFrame,
82 const AtomicString& name, 82 const AtomicString& name,
83 const AtomicString& fallbackName = nullAtom) const; 83 const AtomicString& fallbackName = nullAtom) const;
84 bool uniqueNameExists(const AtomicString& name) const; 84 bool uniqueNameExists(const AtomicString& name) const;
85 AtomicString ensureUniquenessOfUniqueName(const AtomicString& potentiallyUni queName) const;
86 void setUniqueName(const AtomicString&);
85 87
86 Member<Frame> m_thisFrame; 88 Member<Frame> m_thisFrame;
87 89
88 AtomicString m_name; // The actual frame name (may be empty). 90 AtomicString m_name; // The actual frame name (may be empty).
89 AtomicString m_uniqueName; 91 AtomicString m_uniqueName;
90 92
91 mutable unsigned m_scopedChildCount; 93 mutable unsigned m_scopedChildCount;
92 }; 94 };
93 95
94 } // namespace blink 96 } // namespace blink
95 97
96 #ifndef NDEBUG 98 #ifndef NDEBUG
97 // Outside the WebCore namespace for ease of invocation from gdb. 99 // Outside the WebCore namespace for ease of invocation from gdb.
98 void showFrameTree(const blink::Frame*); 100 void showFrameTree(const blink::Frame*);
99 #endif 101 #endif
100 102
101 #endif // FrameTree_h 103 #endif // FrameTree_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/page/FrameTree.cpp » ('j') | third_party/WebKit/Source/core/page/FrameTree.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698