[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:25:45 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 5867dce0edddea366e75a868449d9bb73952076e
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 07:00:15 2010 +0000

    2010-11-02  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Adam Barth.
    
            For unnamed frames, window.name returns a generated name
            https://bugs.webkit.org/show_bug.cgi?id=6751
    
            Part 1 of 2.
    
            Towards fixing bug #6751, rename FrameTree::name() to FrameTree::uniqueName(),
            which is more descriptive of its purpose. A follow up patch will re-add
            FrameTree::name() which will return the DOM-specified name of the frame.
    
            We will also take this opportunity to verify that we have found all the
            call sites of FrameTree::name().
    
            * loader/DocumentLoader.cpp:
            (WebCore::DocumentLoader::mainResource): Use FrameTree::uniqueName().
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::loadURLIntoChildFrame): Ditto.
            (WebCore::FrameLoader::commitProvisionalLoad): Ditto.
            * loader/HistoryController.cpp:
            (WebCore::HistoryController::saveDocumentState): Ditto.
            (WebCore::HistoryController::restoreDocumentState): Ditto.
            (WebCore::HistoryController::createItem): Ditto.
            (WebCore::HistoryController::currentFramesMatchItem): Ditto.
            * loader/ProgressTracker.cpp:
            (WebCore::ProgressTracker::progressStarted): Ditto.
            (WebCore::ProgressTracker::progressCompleted): Ditto.
            * loader/archive/cf/LegacyWebArchive.cpp:
            (WebCore::LegacyWebArchive::create): Ditto.
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::name): Ditto.
            * page/FrameTree.cpp:
            (WebCore::FrameTree::setName): Ditto.
            (WebCore::FrameTree::clearName): Ditto.
            (WebCore::FrameTree::uniqueChildName): Ditto.
            (WebCore::FrameTree::child): Ditto.
            (WebCore::FrameTree::find): Ditto.
            * page/FrameTree.h:
            (WebCore::FrameTree::uniqueName): Renamed (formerly FrameTree::name()).
    
    2010-11-02  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Adam Barth.
    
            For unnamed frames, window.name returns a generated name
            https://bugs.webkit.org/show_bug.cgi?id=6751
    
            Part 1 of 2.
    
            Substitute FrameTree::uniqueName() for FrameTree::name() in WebKit2.
    
            * WebProcess/WebPage/WebFrame.cpp:
            (WebKit::WebFrame::name):
    
    2010-11-02  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Adam Barth.
    
            For unnamed frames, window.name returns a generated name
            https://bugs.webkit.org/show_bug.cgi?id=6751
    
            Part 1 of 2.
    
            Substitute FrameTree::uniqueName() for FrameTree::name() in the Mac port.
    
            * WebView/WebFrame.mm:
            (-[WebFrame name]):
    
    2010-11-02  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Adam Barth.
    
            For unnamed frames, window.name returns a generated name
            https://bugs.webkit.org/show_bug.cgi?id=6751
    
            Part 1 of 2.
    
            Substitute FrameTree::uniqueName() for FrameTree::name() in the Apple Windows port.
    
            * WebFrame.cpp:
            (WebFrame::name):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d47a4d1..3dbf2f5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,45 @@
+2010-11-02  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Adam Barth.
+
+        For unnamed frames, window.name returns a generated name
+        https://bugs.webkit.org/show_bug.cgi?id=6751
+
+        Part 1 of 2.
+
+        Towards fixing bug #6751, rename FrameTree::name() to FrameTree::uniqueName(),
+        which is more descriptive of its purpose. A follow up patch will re-add
+        FrameTree::name() which will return the DOM-specified name of the frame.
+
+        We will also take this opportunity to verify that we have found all the
+        call sites of FrameTree::name().
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::mainResource): Use FrameTree::uniqueName().
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURLIntoChildFrame): Ditto.
+        (WebCore::FrameLoader::commitProvisionalLoad): Ditto.
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::saveDocumentState): Ditto.
+        (WebCore::HistoryController::restoreDocumentState): Ditto.
+        (WebCore::HistoryController::createItem): Ditto.
+        (WebCore::HistoryController::currentFramesMatchItem): Ditto.
+        * loader/ProgressTracker.cpp:
+        (WebCore::ProgressTracker::progressStarted): Ditto.
+        (WebCore::ProgressTracker::progressCompleted): Ditto.
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::create): Ditto.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::name): Ditto.
+        * page/FrameTree.cpp:
+        (WebCore::FrameTree::setName): Ditto.
+        (WebCore::FrameTree::clearName): Ditto.
+        (WebCore::FrameTree::uniqueChildName): Ditto.
+        (WebCore::FrameTree::child): Ditto.
+        (WebCore::FrameTree::find): Ditto.
+        * page/FrameTree.h:
+        (WebCore::FrameTree::uniqueName): Renamed (formerly FrameTree::name()).
+
 2010-11-02  Chris Rogers  <crogers at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp
index 30b80eb..19a55ef 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()->name());
+    return ArchiveResource::create(mainResourceBuffer, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->uniqueName());
 }
 
 PassRefPtr<ArchiveResource> DocumentLoader::subresource(const KURL& url) const
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index b90b18c..3322069 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()->name());
+        HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
         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()->name());
+    RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
     
     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()->name().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()->uniqueName().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()->name().string().utf8().data(), m_URL.string().utf8().data());
+    LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->uniqueName().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 31f4889..07bece7 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()->name().string().utf8().data(), item);
+        LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().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()->name().string().utf8().data(), itemToRestore);
+    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().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()->name() : "";
+    String parent = parentFrame ? parentFrame->tree()->uniqueName() : "";
     String title = documentLoader ? documentLoader->title() : "";
 
-    RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->name(), parent, title);
+    RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->uniqueName(), 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()->name().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->name() != item->target())
+    if ((!m_frame->tree()->uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->uniqueName() != item->target())
         return false;
         
     const HistoryItemVector& childItems = item->children();
diff --git a/WebCore/loader/ProgressTracker.cpp b/WebCore/loader/ProgressTracker.cpp
index 561e6bc..6bc2055 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()->name().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()->uniqueName().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()->name().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()->uniqueName().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 061f4d9..3efea91 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()->name());
+    PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->uniqueName());
 
     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()->name().string().utf8().data());
+                LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->uniqueName().string().utf8().data());
         } else {
             ListHashSet<KURL> subresourceURLs;
             node->getSubresourceURLs(subresourceURLs);
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 8779aaa..3fe4e76 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1136,7 +1136,7 @@ String DOMWindow::name() const
     if (!m_frame)
         return String();
 
-    return m_frame->tree()->name();
+    return m_frame->tree()->uniqueName();
 }
 
 void DOMWindow::setName(const String& string)
diff --git a/WebCore/page/FrameTree.cpp b/WebCore/page/FrameTree.cpp
index 1f0604c..0f01c0f 100644
--- a/WebCore/page/FrameTree.cpp
+++ b/WebCore/page/FrameTree.cpp
@@ -41,16 +41,16 @@ FrameTree::~FrameTree()
 void FrameTree::setName(const AtomicString& name) 
 {
     if (!parent()) {
-        m_name = name;
+        m_uniqueName = name;
         return;
     }
-    m_name = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
-    m_name = parent()->tree()->uniqueChildName(name);
+    m_uniqueName = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
+    m_uniqueName = parent()->tree()->uniqueChildName(name);
 }
 
 void FrameTree::clearName()
 {
-    m_name = AtomicString();
+    m_uniqueName = AtomicString();
 }
 
 Frame* FrameTree::parent(bool checkForDisconnectedFrame) const 
@@ -119,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()->name().startsWith(framePathPrefix))
+        if (frame->tree()->uniqueName().startsWith(framePathPrefix))
             break;
         chain.append(frame);
     }
     String name;
     name += framePathPrefix;
     if (frame)
-        name += frame->tree()->name().string().substring(framePathPrefixLength,
-            frame->tree()->name().length() - framePathPrefixLength - framePathSuffixLength);
+        name += frame->tree()->uniqueName().string().substring(framePathPrefixLength,
+            frame->tree()->uniqueName().length() - framePathPrefixLength - framePathSuffixLength);
     for (int i = chain.size() - 1; i >= 0; --i) {
         frame = chain[i];
         name += "/";
-        name += frame->tree()->name();
+        name += frame->tree()->uniqueName();
     }
 
     // Suffix buffer has more than enough space for:
@@ -159,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()->name() == name)
+        if (child->tree()->uniqueName() == name)
             return child;
     return 0;
 }
@@ -181,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()->name() == name)
+        if (frame->tree()->uniqueName() == name)
             return frame;
 
     // Search the entire tree for this page next.
@@ -192,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()->name() == name)
+        if (frame->tree()->uniqueName() == name)
             return frame;
 
     // Search the entire tree of each of the other pages in this namespace.
@@ -203,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()->name() == name)
+                if (frame->tree()->uniqueName() == name)
                     return frame;
             }
         }
diff --git a/WebCore/page/FrameTree.h b/WebCore/page/FrameTree.h
index b97aab6..6a43075 100644
--- a/WebCore/page/FrameTree.h
+++ b/WebCore/page/FrameTree.h
@@ -38,7 +38,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 +73,7 @@ namespace WebCore {
         Frame* m_thisFrame;
 
         Frame* m_parent;
-        AtomicString m_name;
+        AtomicString m_uniqueName;
 
         // FIXME: use ListRefPtr?
         RefPtr<Frame> m_nextSibling;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f328e4e..4a8a885 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-02  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Adam Barth.
+
+        For unnamed frames, window.name returns a generated name
+        https://bugs.webkit.org/show_bug.cgi?id=6751
+
+        Part 1 of 2.
+
+        Substitute FrameTree::uniqueName() for FrameTree::name() in the Mac port. 
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame name]):
+
 2010-11-01  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index d7db5a2..7e0bc38 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()->name();
+    return coreFrame->tree()->uniqueName();
 }
 
 - (WebFrameView *)frameView
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 2a04708..cc30abf 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-02  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Adam Barth.
+
+        For unnamed frames, window.name returns a generated name
+        https://bugs.webkit.org/show_bug.cgi?id=6751
+
+        Part 1 of 2.
+
+        Substitute FrameTree::uniqueName() for FrameTree::name() in the Apple Windows port.
+
+        * WebFrame.cpp:
+        (WebFrame::name):
+
 2010-11-02  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index c1d9c21..f161932 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()->name()).release();
+    *frameName = BString(coreFrame->tree()->uniqueName()).release();
     return S_OK;
 }
 
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 58bb48e..6229a4a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-02  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Adam Barth.
+
+        For unnamed frames, window.name returns a generated name
+        https://bugs.webkit.org/show_bug.cgi?id=6751
+
+        Part 1 of 2.
+
+        Substitute FrameTree::uniqueName() for FrameTree::name() in WebKit2.
+
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::name):
+
 2010-11-02  Amruth Raj  <amruthraj at motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla at motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index 4dbdec3..b4b2fe2 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()->name();
+    return m_coreFrame->tree()->uniqueName();
 }
 
 String WebFrame::url() const

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list