[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 15:18:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 949216b44ec05ca817915da5d4f60619eba49aea
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 30 06:13:22 2010 +0000
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout tests regressions on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::name):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout tests regressions on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* Api/qwebframe.cpp:
(QWebFrame::frameName):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout tests regressions on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* webkit/webkitwebframe.cpp:
(webkit_web_frame_get_name):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* WebFrame.cpp:
(WebFrame::name):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* WebView/WebFrame.mm:
(-[WebFrame name]):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* ewk/ewk_frame.cpp:
(ewk_frame_name_get):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
Test: fast/frames/iframe-set-inner-html.html
* html/HTMLFrameElementBase.cpp:
(WebCore::HTMLFrameElementBase::openURL):
(WebCore::HTMLFrameElementBase::setName):
* html/HTMLFrameElementBase.h:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::mainResource):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURLIntoChildFrame):
(WebCore::FrameLoader::commitProvisionalLoad):
* loader/HistoryController.cpp:
(WebCore::HistoryController::saveDocumentState):
(WebCore::HistoryController::restoreDocumentState):
(WebCore::HistoryController::createItem):
(WebCore::HistoryController::currentFramesMatchItem):
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::progressCompleted):
* loader/archive/cf/LegacyWebArchive.cpp:
(WebCore::LegacyWebArchive::create):
* page/FrameTree.cpp:
(WebCore::FrameTree::setName):
(WebCore::FrameTree::clearName):
(WebCore::FrameTree::uniqueChildName):
(WebCore::FrameTree::child):
(WebCore::FrameTree::find):
* page/FrameTree.h:
(WebCore::FrameTree::name):
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* fast/frames/frame-element-name-expected.txt:
* fast/frames/iframe-set-inner-html-expected.txt: Copied from LayoutTests/fast/frames/iframe-set-inner-html-expected.txt.
* fast/frames/iframe-set-inner-html.html: Copied from LayoutTests/fast/frames/iframe-set-inner-html.html.
* fast/frames/resources/frame-element-name-left.html:
* fast/frames/resources/frame-element-name-right.html:
2010-10-29 Daniel Bates <dbates at rim.com>
No review, rolling out 70971.
http://trac.webkit.org/changeset/70971
https://bugs.webkit.org/show_bug.cgi?id=6751
Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
it caused layout test failures on all bots. In particular, the
child count in a generated frame name differs after this patch. We need
to look into this further.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::name):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70976 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 459fe2e..87a8652 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,22 @@
2010-10-29 Daniel Bates <dbates at rim.com>
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * fast/frames/frame-element-name-expected.txt:
+ * fast/frames/iframe-set-inner-html-expected.txt: Copied from LayoutTests/fast/frames/iframe-set-inner-html-expected.txt.
+ * fast/frames/iframe-set-inner-html.html: Copied from LayoutTests/fast/frames/iframe-set-inner-html.html.
+ * fast/frames/resources/frame-element-name-left.html:
+ * fast/frames/resources/frame-element-name-right.html:
+
+2010-10-29 Daniel Bates <dbates at rim.com>
+
Reviewed by Adam Barth.
For unnamed frames, window.name returns a generated name
diff --git a/LayoutTests/fast/frames/frame-element-name-expected.txt b/LayoutTests/fast/frames/frame-element-name-expected.txt
index 8d6a136..efcb192 100644
--- a/LayoutTests/fast/frames/frame-element-name-expected.txt
+++ b/LayoutTests/fast/frames/frame-element-name-expected.txt
@@ -4,12 +4,10 @@
Frame: 'left'
--------
PASS escape(window.frameElement.name) is "left"
-PASS escape(window.name) is "left"
--------
Frame: '<!--framePath //<!--frame1-->-->'
--------
PASS escape(window.frameElement.name) is ""
-PASS escape(window.name) is ""
diff --git a/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt b/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt
new file mode 100644
index 0000000..63dd172
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt
@@ -0,0 +1,3 @@
+
+This tests that inserting two <iframe> elements using innerHTML actually causes two frames with unique names to be created.
+SUCCESS
diff --git a/LayoutTests/fast/frames/iframe-set-inner-html.html b/LayoutTests/fast/frames/iframe-set-inner-html.html
new file mode 100644
index 0000000..e8cded4
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-set-inner-html.html
@@ -0,0 +1,30 @@
+<html>
+<script>
+function runTest() {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ var c = document.getElementById('container');
+ var r = document.getElementById('result');
+
+ c.innerHTML = "<span><iframe></iframe><iframe></iframe></span>"
+
+ if (window.frames.length != 2) {
+ r.innerHTML = 'FAILURE - number of frames should be 2, was ' + window.frames.length;
+ return;
+ }
+
+ if (window.frames[0].name == window.frames[1].name) {
+ r.innerHTML = 'FAILURE - both windows had tne same name'
+ return;
+ }
+
+ r.innerHTML = 'SUCCESS';
+}
+</script>
+<body onload="runTest()">
+<div id="container"></div>
+<div>This tests that inserting two <iframe> elements using innerHTML actually causes two frames with unique names to be created.</div>
+<div id="result">FAILURE</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/frames/resources/frame-element-name-left.html b/LayoutTests/fast/frames/resources/frame-element-name-left.html
index da9d9e1..3c0c59d 100644
--- a/LayoutTests/fast/frames/resources/frame-element-name-left.html
+++ b/LayoutTests/fast/frames/resources/frame-element-name-left.html
@@ -7,6 +7,5 @@
<div id="console"></div>
<script>
shouldBeEqualToString("escape(window.frameElement.name)", "left");
-shouldBeEqualToString("escape(window.name)", "left");
</script>
</body>
diff --git a/LayoutTests/fast/frames/resources/frame-element-name-right.html b/LayoutTests/fast/frames/resources/frame-element-name-right.html
index 6ab8dfa..c09bb59 100644
--- a/LayoutTests/fast/frames/resources/frame-element-name-right.html
+++ b/LayoutTests/fast/frames/resources/frame-element-name-right.html
@@ -7,6 +7,5 @@
<div id="console"></div>
<script>
shouldBeEqualToString("escape(window.frameElement.name)", "");
-shouldBeEqualToString("escape(window.name)", "");
</script>
</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8a4c568..b2e5a69 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,44 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ Test: fast/frames/iframe-set-inner-html.html
+
+ * html/HTMLFrameElementBase.cpp:
+ (WebCore::HTMLFrameElementBase::openURL):
+ (WebCore::HTMLFrameElementBase::setName):
+ * html/HTMLFrameElementBase.h:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::mainResource):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadURLIntoChildFrame):
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::saveDocumentState):
+ (WebCore::HistoryController::restoreDocumentState):
+ (WebCore::HistoryController::createItem):
+ (WebCore::HistoryController::currentFramesMatchItem):
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::progressStarted):
+ (WebCore::ProgressTracker::progressCompleted):
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ (WebCore::LegacyWebArchive::create):
+ * page/FrameTree.cpp:
+ (WebCore::FrameTree::setName):
+ (WebCore::FrameTree::clearName):
+ (WebCore::FrameTree::uniqueChildName):
+ (WebCore::FrameTree::child):
+ (WebCore::FrameTree::find):
+ * page/FrameTree.h:
+ (WebCore::FrameTree::name):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebCore/html/HTMLFrameElementBase.cpp b/WebCore/html/HTMLFrameElementBase.cpp
index cba82a2..d153845 100644
--- a/WebCore/html/HTMLFrameElementBase.cpp
+++ b/WebCore/html/HTMLFrameElementBase.cpp
@@ -92,6 +92,8 @@ bool HTMLFrameElementBase::isURLAllowed() const
void HTMLFrameElementBase::openURL(bool lockHistory, bool lockBackForwardList)
{
+ ASSERT(!m_frameName.isEmpty());
+
if (!isURLAllowed())
return;
@@ -153,6 +155,9 @@ void HTMLFrameElementBase::setName()
m_frameName = getAttribute(nameAttr);
if (m_frameName.isNull())
m_frameName = getIdAttribute();
+
+ if (Frame* parentFrame = document()->frame())
+ m_frameName = parentFrame->tree()->uniqueChildName(m_frameName);
}
void HTMLFrameElementBase::setNameAndOpenURL()
diff --git a/WebCore/html/HTMLFrameElementBase.h b/WebCore/html/HTMLFrameElementBase.h
index 2a363c2..ef25f30 100644
--- a/WebCore/html/HTMLFrameElementBase.h
+++ b/WebCore/html/HTMLFrameElementBase.h
@@ -71,7 +71,7 @@ private:
void openURL(bool lockHistory = true, bool lockBackForwardList = true);
AtomicString m_URL;
- AtomicString m_frameName; // The actual frame name (may be empty).
+ AtomicString m_frameName;
ScrollbarMode m_scrolling;
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp
index 19a55ef..30b80eb 100644
--- a/WebCore/loader/DocumentLoader.cpp
+++ b/WebCore/loader/DocumentLoader.cpp
@@ -491,7 +491,7 @@ PassRefPtr<ArchiveResource> DocumentLoader::mainResource() const
if (!mainResourceBuffer)
mainResourceBuffer = SharedBuffer::create();
- return ArchiveResource::create(mainResourceBuffer, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->uniqueName());
+ return ArchiveResource::create(mainResourceBuffer, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->name());
}
PassRefPtr<ArchiveResource> DocumentLoader::subresource(const KURL& url) const
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 3322069..b90b18c 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -928,7 +928,7 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer,
// 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.
if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType)) {
- HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
+ HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->name());
if (childItem) {
// Use the original URL to ensure we get all the side-effects, such as
// onLoad handlers, of any redirects that happened. An example of where
@@ -939,7 +939,7 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer,
}
}
- RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
+ RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->name());
if (subframeArchive)
childFrame->loader()->loadArchive(subframeArchive.release());
@@ -1832,7 +1832,7 @@ void FrameLoader::commitProvisionalLoad()
RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(history()->provisionalItem()) : 0;
RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
- LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame->tree()->uniqueName().string().utf8().data(), m_URL.string().utf8().data(),
+ LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame->tree()->name().string().utf8().data(), m_URL.string().utf8().data(),
pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoader>");
// Check to see if we need to cache the page we are navigating away from into the back/forward cache.
@@ -1880,7 +1880,7 @@ void FrameLoader::commitProvisionalLoad()
didOpenURL(url);
}
- LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->uniqueName().string().utf8().data(), m_URL.string().utf8().data());
+ LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->name().string().utf8().data(), m_URL.string().utf8().data());
if (m_loadType == FrameLoadTypeStandard && m_documentLoader->isClientRedirect())
history()->updateForClientRedirect();
diff --git a/WebCore/loader/HistoryController.cpp b/WebCore/loader/HistoryController.cpp
index 07bece7..31f4889 100644
--- a/WebCore/loader/HistoryController.cpp
+++ b/WebCore/loader/HistoryController.cpp
@@ -149,7 +149,7 @@ void HistoryController::saveDocumentState()
ASSERT(document);
if (item->isCurrentDocument(document)) {
- LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
+ LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->name().string().utf8().data(), item);
item->setDocumentState(document->formElementsState());
}
}
@@ -188,7 +188,7 @@ void HistoryController::restoreDocumentState()
if (!itemToRestore)
return;
- LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
+ LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->name().string().utf8().data(), itemToRestore);
doc->setStateForNewFormElements(itemToRestore->documentState());
}
@@ -480,10 +480,10 @@ PassRefPtr<HistoryItem> HistoryController::createItem(bool useOriginal)
originalURL = blankURL();
Frame* parentFrame = m_frame->tree()->parent();
- String parent = parentFrame ? parentFrame->tree()->uniqueName() : "";
+ String parent = parentFrame ? parentFrame->tree()->name() : "";
String title = documentLoader ? documentLoader->title() : "";
- RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->uniqueName(), parent, title);
+ RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->name(), parent, title);
item->setOriginalURLString(originalURL.string());
if (!unreachableURL.isEmpty() || !documentLoader || documentLoader->response().httpStatusCode() >= 400)
@@ -598,7 +598,7 @@ void HistoryController::recursiveGoToItem(HistoryItem* item, HistoryItem* fromIt
// Helper method that determines whether the current frame tree matches given history item's.
bool HistoryController::currentFramesMatchItem(HistoryItem* item) const
{
- if ((!m_frame->tree()->uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->uniqueName() != item->target())
+ if ((!m_frame->tree()->name().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->name() != item->target())
return false;
const HistoryItemVector& childItems = item->children();
diff --git a/WebCore/loader/ProgressTracker.cpp b/WebCore/loader/ProgressTracker.cpp
index 6bc2055..561e6bc 100644
--- a/WebCore/loader/ProgressTracker.cpp
+++ b/WebCore/loader/ProgressTracker.cpp
@@ -101,7 +101,7 @@ void ProgressTracker::reset()
void ProgressTracker::progressStarted(Frame* frame)
{
- LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
+ LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->name().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
frame->loader()->client()->willChangeEstimatedProgress();
@@ -119,7 +119,7 @@ void ProgressTracker::progressStarted(Frame* frame)
void ProgressTracker::progressCompleted(Frame* frame)
{
- LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
+ LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->name().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
if (m_numProgressTrackedFrames <= 0)
return;
diff --git a/WebCore/loader/archive/cf/LegacyWebArchive.cpp b/WebCore/loader/archive/cf/LegacyWebArchive.cpp
index 3efea91..061f4d9 100644
--- a/WebCore/loader/archive/cf/LegacyWebArchive.cpp
+++ b/WebCore/loader/archive/cf/LegacyWebArchive.cpp
@@ -492,7 +492,7 @@ PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(const String& markupString
if (responseURL.isNull())
responseURL = KURL(ParsedURLString, "");
- PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->uniqueName());
+ PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->name());
Vector<PassRefPtr<LegacyWebArchive> > subframeArchives;
Vector<PassRefPtr<ArchiveResource> > subresources;
@@ -509,7 +509,7 @@ PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(const String& markupString
if (subframeArchive)
subframeArchives.append(subframeArchive);
else
- LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->uniqueName().string().utf8().data());
+ LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->name().string().utf8().data());
} else {
ListHashSet<KURL> subresourceURLs;
node->getSubresourceURLs(subresourceURLs);
diff --git a/WebCore/page/FrameTree.cpp b/WebCore/page/FrameTree.cpp
index ab3896d..1f0604c 100644
--- a/WebCore/page/FrameTree.cpp
+++ b/WebCore/page/FrameTree.cpp
@@ -40,19 +40,17 @@ FrameTree::~FrameTree()
void FrameTree::setName(const AtomicString& name)
{
- m_name = name;
if (!parent()) {
- m_uniqueName = name;
+ m_name = name;
return;
}
- m_uniqueName = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
- m_uniqueName = parent()->tree()->uniqueChildName(name);
+ m_name = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
+ m_name = parent()->tree()->uniqueChildName(name);
}
void FrameTree::clearName()
{
m_name = AtomicString();
- m_uniqueName = AtomicString();
}
Frame* FrameTree::parent(bool checkForDisconnectedFrame) const
@@ -121,19 +119,19 @@ AtomicString FrameTree::uniqueChildName(const AtomicString& requestedName) const
Vector<Frame*, 16> chain;
Frame* frame;
for (frame = m_thisFrame; frame; frame = frame->tree()->parent()) {
- if (frame->tree()->uniqueName().startsWith(framePathPrefix))
+ if (frame->tree()->name().startsWith(framePathPrefix))
break;
chain.append(frame);
}
String name;
name += framePathPrefix;
if (frame)
- name += frame->tree()->uniqueName().string().substring(framePathPrefixLength,
- frame->tree()->uniqueName().length() - framePathPrefixLength - framePathSuffixLength);
+ name += frame->tree()->name().string().substring(framePathPrefixLength,
+ frame->tree()->name().length() - framePathPrefixLength - framePathSuffixLength);
for (int i = chain.size() - 1; i >= 0; --i) {
frame = chain[i];
name += "/";
- name += frame->tree()->uniqueName();
+ name += frame->tree()->name();
}
// Suffix buffer has more than enough space for:
@@ -161,7 +159,7 @@ Frame* FrameTree::child(unsigned index) const
Frame* FrameTree::child(const AtomicString& name) const
{
for (Frame* child = firstChild(); child; child = child->tree()->nextSibling())
- if (child->tree()->uniqueName() == name)
+ if (child->tree()->name() == name)
return child;
return 0;
}
@@ -183,7 +181,7 @@ Frame* FrameTree::find(const AtomicString& name) const
// Search subtree starting with this frame first.
for (Frame* 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.
@@ -194,7 +192,7 @@ Frame* FrameTree::find(const AtomicString& name) const
return 0;
for (Frame* 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.
@@ -205,7 +203,7 @@ Frame* FrameTree::find(const AtomicString& name) const
Page* otherPage = *it;
if (otherPage != page) {
for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
- if (frame->tree()->uniqueName() == name)
+ if (frame->tree()->name() == name)
return frame;
}
}
diff --git a/WebCore/page/FrameTree.h b/WebCore/page/FrameTree.h
index 58b7c1f..b97aab6 100644
--- a/WebCore/page/FrameTree.h
+++ b/WebCore/page/FrameTree.h
@@ -39,7 +39,6 @@ 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;
@@ -74,8 +73,7 @@ namespace WebCore {
Frame* m_thisFrame;
Frame* m_parent;
- AtomicString m_name; // The actual frame name (may be empty).
- AtomicString m_uniqueName;
+ AtomicString m_name;
// FIXME: use ListRefPtr?
RefPtr<Frame> m_nextSibling;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 902688c..2bcb4fd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::name):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 61afafa..b4d23c0 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -486,7 +486,7 @@ WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& element)
WebString WebFrameImpl::name() const
{
- return m_frame->tree()->uniqueName();
+ return m_frame->tree()->name();
}
void WebFrameImpl::setName(const WebString& name)
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index f08fc74..d9b5222 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,5 +1,19 @@
2010-10-29 Daniel Bates <dbates at rim.com>
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_name_get):
+
+2010-10-29 Daniel Bates <dbates at rim.com>
+
Reviewed by Adam Barth.
For unnamed frames, window.name returns a generated name
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 7cf1b0f..1395fa5 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -474,7 +474,7 @@ const char* ewk_frame_name_get(const Evas_Object* o)
return 0;
}
- WTF::String s = sd->frame->tree()->uniqueName();
+ WTF::String s = sd->frame->tree()->name();
WTF::CString cs = s.utf8();
sd->name = eina_stringshare_add_length(cs.data(), cs.length());
return sd->name;
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 23e3527..8507a11 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_get_name):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 20fde35..c581ce6 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -480,7 +480,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_name(WebKitWebFrame* frame)
if (!coreFrame)
return "";
- String string = coreFrame->tree()->uniqueName();
+ String string = coreFrame->tree()->name();
priv->name = g_strdup(string.utf8().data());
return priv->name;
}
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 3133bd3..cec4718 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame name]):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 7e0bc38..d7db5a2 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -1408,7 +1408,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
Frame* coreFrame = _private->coreFrame;
if (!coreFrame)
return nil;
- return coreFrame->tree()->uniqueName();
+ return coreFrame->tree()->name();
}
- (WebFrameView *)frameView
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 050699b..39e74d9 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -758,7 +758,7 @@ QIcon QWebFrame::icon() const
*/
QString QWebFrame::frameName() const
{
- return d->frame->tree()->uniqueName();
+ return d->frame->tree()->name();
}
/*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b12997f..9c64e70 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::frameName):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 52a5f37..ce59419 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-29 Daniel Bates <dbates at rim.com>
+
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * WebFrame.cpp:
+ (WebFrame::name):
+
2010-10-28 Antonio Gomes <agomes at rim.com>
Reviewed by Ojan Vafai.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index a6b477d..9db6a2a 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -438,7 +438,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::name(
if (!coreFrame)
return E_FAIL;
- *frameName = BString(coreFrame->tree()->uniqueName()).release();
+ *frameName = BString(coreFrame->tree()->name()).release();
return S_OK;
}
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 978b55f..402dd9d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,19 @@
2010-10-29 Daniel Bates <dbates at rim.com>
+ No review, rolling out 70971.
+ http://trac.webkit.org/changeset/70971
+ https://bugs.webkit.org/show_bug.cgi?id=6751
+
+ Rolling out changeset 70971 <http://trac.webkit.org/changeset/70971> since
+ it caused layout test failures on all bots. In particular, the
+ child count in a generated frame name differs after this patch. We need
+ to look into this further.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::name):
+
+2010-10-29 Daniel Bates <dbates at rim.com>
+
Reviewed by Adam Barth.
For unnamed frames, window.name returns a generated name
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index b4b2fe2..4dbdec3 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -247,7 +247,7 @@ String WebFrame::name() const
if (!m_coreFrame)
return String();
- return m_coreFrame->tree()->uniqueName();
+ return m_coreFrame->tree()->name();
}
String WebFrame::url() const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list