Changeset 70971 in webkit


Ignore:
Timestamp:
Oct 29, 2010 8:49:02 PM (13 years ago)
Author:
dbates@webkit.org
Message:

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified Chromium-port to use FrameTree::uniqueName().

  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::name):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified Qt-port to use FrameTree::uniqueName().

  • Api/qwebframe.cpp: (QWebFrame::frameName):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified GTK-port to use FrameTree::uniqueName().

  • webkit/webkitwebframe.cpp: (webkit_web_frame_get_name):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified Apple Windows-port to use FrameTree::uniqueName().

  • WebFrame.cpp: (WebFrame::name):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified Mac-port to use FrameTree::uniqueName().

  • WebView/WebFrame.mm: (-[WebFrame name]):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified EFL-port to use FrameTree::uniqueName().

  • ewk/ewk_frame.cpp: (ewk_frame_name_get):

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Fixes an issue where the window.name of an unnamed frame returns
a unique generated name that is used internally to identify the
frame. Instead, we should return an empty string as implied by
section 5.1.6 of the HTML5 spec. (http://www.w3.org/TR/html5/browsers.html#browsing-context-names).
This section describes that a browsing context can have no name or be
the empty string.

  • html/HTMLFrameElementBase.cpp: (WebCore::HTMLFrameElementBase::openURL): Removed ASSERT for empty frame name since this is valid as per the HTML5 spec. (WebCore::HTMLFrameElementBase::setName): Removed the call to FrameTree::uniqueChildName() since the loader code no longer depends on the frame name being unique.
  • html/HTMLFrameElementBase.h:
  • 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): (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/FrameTree.cpp: (WebCore::FrameTree::setName): Modified to store the DOM-specified name of the frame. (WebCore::FrameTree::clearName): (WebCore::FrameTree::uniqueChildName): Use FrameTree::uniqueName(). (WebCore::FrameTree::child): Ditto. (WebCore::FrameTree::find): Ditto.
  • page/FrameTree.h: (WebCore::FrameTree::uniqueName): Added.

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Updated test case fast/frames/frame-element-name.html to check
the value of window.name.

  • fast/frames/frame-element-name-expected.txt: Updated result.
  • fast/frames/iframe-set-inner-html-expected.txt: Removed; This test ensured that the generated name for an unnamed frames was unique by looking at the value of window.name. However, the generated name should not be exposed to web developers. Instead, window.name should return the empty string for an unnamed frame as implied by section 5.1.6 of the HTML5 spec. We should consider exposing a DRT method for obtaining the internal frame name (which may be generated) and re-implementing this test to use it.
  • fast/frames/iframe-set-inner-html.html: Removed.
  • fast/frames/resources/frame-element-name-left.html: Added test for window.name.
  • fast/frames/resources/frame-element-name-right.html: Ditto.

2010-10-29 Daniel Bates <dbates@rim.com>

Reviewed by Adam Barth.

For unnamed frames, window.name returns a generated name
https://bugs.webkit.org/show_bug.cgi?id=6751

Modified WebKit2 to use FrameTree::uniqueName().

  • WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::name):
Location:
trunk
Files:
2 deleted
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r70967 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Updated test case fast/frames/frame-element-name.html to check
     9        the value of window.name.
     10
     11        * fast/frames/frame-element-name-expected.txt: Updated result.
     12        * fast/frames/iframe-set-inner-html-expected.txt: Removed; This test ensured
     13        that the generated name for an unnamed frames was unique by looking at the
     14        value of window.name. However, the generated name should not be exposed to
     15        web developers. Instead, window.name should return the empty string for
     16        an unnamed frame as implied by section 5.1.6 of the HTML5 spec. We should
     17        consider exposing a DRT method for obtaining the internal frame name (which
     18        may be generated) and re-implementing this test to use it.
     19        * fast/frames/iframe-set-inner-html.html: Removed.
     20        * fast/frames/resources/frame-element-name-left.html: Added test for window.name.
     21        * fast/frames/resources/frame-element-name-right.html: Ditto.
     22
    1232010-10-29  James Robinson  <jamesr@chromium.org>
    224
  • trunk/LayoutTests/fast/frames/frame-element-name-expected.txt

    r70185 r70971  
    55--------
    66PASS escape(window.frameElement.name) is "left"
     7PASS escape(window.name) is "left"
    78
    89
     
    1112--------
    1213PASS escape(window.frameElement.name) is ""
     14PASS escape(window.name) is ""
    1315
  • trunk/LayoutTests/fast/frames/resources/frame-element-name-left.html

    r70185 r70971  
    88<script>
    99shouldBeEqualToString("escape(window.frameElement.name)", "left");
     10shouldBeEqualToString("escape(window.name)", "left");
    1011</script>
    1112</body>
  • trunk/LayoutTests/fast/frames/resources/frame-element-name-right.html

    r70185 r70971  
    88<script>
    99shouldBeEqualToString("escape(window.frameElement.name)", "");
     10shouldBeEqualToString("escape(window.name)", "");
    1011</script>
    1112</body>
  • trunk/WebCore/ChangeLog

    r70963 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Fixes an issue where the window.name of an unnamed frame returns
     9        a unique generated name that is used internally to identify the
     10        frame. Instead, we should return an empty string as implied by
     11        section 5.1.6 of the HTML5 spec. (http://www.w3.org/TR/html5/browsers.html#browsing-context-names).
     12        This section describes that a browsing context can have no name or be
     13        the empty string.
     14
     15        * html/HTMLFrameElementBase.cpp:
     16        (WebCore::HTMLFrameElementBase::openURL): Removed ASSERT for empty
     17        frame name since this is valid as per the HTML5 spec.
     18        (WebCore::HTMLFrameElementBase::setName): Removed the call to FrameTree::uniqueChildName()
     19        since the loader code no longer depends on the frame name being unique.
     20        * html/HTMLFrameElementBase.h:
     21        * loader/DocumentLoader.cpp:
     22        (WebCore::DocumentLoader::mainResource): Use FrameTree::uniqueName().
     23        * loader/FrameLoader.cpp:
     24        (WebCore::FrameLoader::loadURLIntoChildFrame): Ditto.
     25        (WebCore::FrameLoader::commitProvisionalLoad): Ditto.
     26        * loader/HistoryController.cpp:
     27        (WebCore::HistoryController::saveDocumentState): Ditto.
     28        (WebCore::HistoryController::restoreDocumentState): Ditto.
     29        (WebCore::HistoryController::createItem):
     30        (WebCore::HistoryController::currentFramesMatchItem): Ditto.
     31        * loader/ProgressTracker.cpp:
     32        (WebCore::ProgressTracker::progressStarted): Ditto.
     33        (WebCore::ProgressTracker::progressCompleted): Ditto.
     34        * loader/archive/cf/LegacyWebArchive.cpp:
     35        (WebCore::LegacyWebArchive::create): Ditto.
     36        * page/FrameTree.cpp:
     37        (WebCore::FrameTree::setName): Modified to store the DOM-specified
     38        name of the frame.
     39        (WebCore::FrameTree::clearName):
     40        (WebCore::FrameTree::uniqueChildName): Use FrameTree::uniqueName().
     41        (WebCore::FrameTree::child): Ditto.
     42        (WebCore::FrameTree::find): Ditto.
     43        * page/FrameTree.h:
     44        (WebCore::FrameTree::uniqueName): Added.
     45
    1462010-10-29  Darin Adler  <darin@apple.com>
    247
  • trunk/WebCore/html/HTMLFrameElementBase.cpp

    r70407 r70971  
    9393void HTMLFrameElementBase::openURL(bool lockHistory, bool lockBackForwardList)
    9494{
    95     ASSERT(!m_frameName.isEmpty());
    96 
    9795    if (!isURLAllowed())
    9896        return;
     
    156154    if (m_frameName.isNull())
    157155        m_frameName = getIdAttribute();
    158    
    159     if (Frame* parentFrame = document()->frame())
    160         m_frameName = parentFrame->tree()->uniqueChildName(m_frameName);
    161156}
    162157
  • trunk/WebCore/html/HTMLFrameElementBase.h

    r70407 r70971  
    7272
    7373    AtomicString m_URL;
    74     AtomicString m_frameName;
     74    AtomicString m_frameName; // The actual frame name (may be empty).
    7575
    7676    ScrollbarMode m_scrolling;
  • trunk/WebCore/loader/DocumentLoader.cpp

    r70574 r70971  
    492492        mainResourceBuffer = SharedBuffer::create();
    493493       
    494     return ArchiveResource::create(mainResourceBuffer, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->name());
     494    return ArchiveResource::create(mainResourceBuffer, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->uniqueName());
    495495}
    496496
  • trunk/WebCore/loader/FrameLoader.cpp

    r70960 r70971  
    929929    // of this child frame with whatever was there at that point.
    930930    if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType)) {
    931         HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->name());
     931        HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
    932932        if (childItem) {
    933933            // Use the original URL to ensure we get all the side-effects, such as
     
    940940    }
    941941
    942     RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->name());
     942    RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
    943943   
    944944    if (subframeArchive)
     
    18331833    RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
    18341834
    1835     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(),
     1835    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(),
    18361836        pdl ? pdl->url().string().utf8().data() : "<no provisional DocumentLoader>");
    18371837
     
    18811881    }
    18821882
    1883     LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->name().string().utf8().data(), m_URL.string().utf8().data());
     1883    LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->uniqueName().string().utf8().data(), m_URL.string().utf8().data());
    18841884
    18851885    if (m_loadType == FrameLoadTypeStandard && m_documentLoader->isClientRedirect())
  • trunk/WebCore/loader/HistoryController.cpp

    r70960 r70971  
    150150   
    151151    if (item->isCurrentDocument(document)) {
    152         LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->name().string().utf8().data(), item);
     152        LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
    153153        item->setDocumentState(document->formElementsState());
    154154    }
     
    189189        return;
    190190
    191     LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->name().string().utf8().data(), itemToRestore);
     191    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
    192192    doc->setStateForNewFormElements(itemToRestore->documentState());
    193193}
     
    481481   
    482482    Frame* parentFrame = m_frame->tree()->parent();
    483     String parent = parentFrame ? parentFrame->tree()->name() : "";
     483    String parent = parentFrame ? parentFrame->tree()->uniqueName() : "";
    484484    String title = documentLoader ? documentLoader->title() : "";
    485485
    486     RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->name(), parent, title);
     486    RefPtr<HistoryItem> item = HistoryItem::create(url, m_frame->tree()->uniqueName(), parent, title);
    487487    item->setOriginalURLString(originalURL.string());
    488488
     
    599599bool HistoryController::currentFramesMatchItem(HistoryItem* item) const
    600600{
    601     if ((!m_frame->tree()->name().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->name() != item->target())
     601    if ((!m_frame->tree()->uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame->tree()->uniqueName() != item->target())
    602602        return false;
    603603       
  • trunk/WebCore/loader/ProgressTracker.cpp

    r69643 r70971  
    102102void ProgressTracker::progressStarted(Frame* frame)
    103103{
    104     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());
     104    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());
    105105
    106106    frame->loader()->client()->willChangeEstimatedProgress();
     
    120120void ProgressTracker::progressCompleted(Frame* frame)
    121121{
    122     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());
     122    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());
    123123   
    124124    if (m_numProgressTrackedFrames <= 0)
  • trunk/WebCore/loader/archive/cf/LegacyWebArchive.cpp

    r69798 r70971  
    493493        responseURL = KURL(ParsedURLString, "");
    494494       
    495     PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->name());
     495    PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->uniqueName());
    496496
    497497    Vector<PassRefPtr<LegacyWebArchive> > subframeArchives;
     
    510510                subframeArchives.append(subframeArchive);
    511511            else
    512                 LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->name().string().utf8().data());
     512                LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->uniqueName().string().utf8().data());
    513513        } else {
    514514            ListHashSet<KURL> subresourceURLs;
  • trunk/WebCore/page/FrameTree.cpp

    r60287 r70971  
    4141void FrameTree::setName(const AtomicString& name)
    4242{
     43    m_name = name;
    4344    if (!parent()) {
    44         m_name = name;
     45        m_uniqueName = name;
    4546        return;
    4647    }
    47     m_name = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
    48     m_name = parent()->tree()->uniqueChildName(name);
     48    m_uniqueName = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
     49    m_uniqueName = parent()->tree()->uniqueChildName(name);
    4950}
    5051
     
    5253{
    5354    m_name = AtomicString();
     55    m_uniqueName = AtomicString();
    5456}
    5557
     
    120122    Frame* frame;
    121123    for (frame = m_thisFrame; frame; frame = frame->tree()->parent()) {
    122         if (frame->tree()->name().startsWith(framePathPrefix))
     124        if (frame->tree()->uniqueName().startsWith(framePathPrefix))
    123125            break;
    124126        chain.append(frame);
     
    127129    name += framePathPrefix;
    128130    if (frame)
    129         name += frame->tree()->name().string().substring(framePathPrefixLength,
    130             frame->tree()->name().length() - framePathPrefixLength - framePathSuffixLength);
     131        name += frame->tree()->uniqueName().string().substring(framePathPrefixLength,
     132            frame->tree()->uniqueName().length() - framePathPrefixLength - framePathSuffixLength);
    131133    for (int i = chain.size() - 1; i >= 0; --i) {
    132134        frame = chain[i];
    133135        name += "/";
    134         name += frame->tree()->name();
     136        name += frame->tree()->uniqueName();
    135137    }
    136138
     
    160162{
    161163    for (Frame* child = firstChild(); child; child = child->tree()->nextSibling())
    162         if (child->tree()->name() == name)
     164        if (child->tree()->uniqueName() == name)
    163165            return child;
    164166    return 0;
     
    182184    // Search subtree starting with this frame first.
    183185    for (Frame* frame = m_thisFrame; frame; frame = frame->tree()->traverseNext(m_thisFrame))
    184         if (frame->tree()->name() == name)
     186        if (frame->tree()->uniqueName() == name)
    185187            return frame;
    186188
     
    193195
    194196    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
    195         if (frame->tree()->name() == name)
     197        if (frame->tree()->uniqueName() == name)
    196198            return frame;
    197199
     
    204206        if (otherPage != page) {
    205207            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
    206                 if (frame->tree()->name() == name)
     208                if (frame->tree()->uniqueName() == name)
    207209                    return frame;
    208210            }
  • trunk/WebCore/page/FrameTree.h

    r65077 r70971  
    4040
    4141        const AtomicString& name() const { return m_name; }
     42        const AtomicString& uniqueName() const { return m_uniqueName; }
    4243        void setName(const AtomicString&);
    4344        void clearName();
     
    7475
    7576        Frame* m_parent;
    76         AtomicString m_name;
     77        AtomicString m_name; // The actual frame name (may be empty).
     78        AtomicString m_uniqueName;
    7779
    7880        // FIXME: use ListRefPtr?
  • trunk/WebKit/chromium/ChangeLog

    r70956 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified Chromium-port to use FrameTree::uniqueName().
     9
     10        * src/WebFrameImpl.cpp:
     11        (WebKit::WebFrameImpl::name):
     12
    1132010-10-29  Kavita Kanetkar  <kkanetkar@chromium.org>
    214
  • trunk/WebKit/chromium/src/WebFrameImpl.cpp

    r70463 r70971  
    487487WebString WebFrameImpl::name() const
    488488{
    489     return m_frame->tree()->name();
     489    return m_frame->tree()->uniqueName();
    490490}
    491491
  • trunk/WebKit/efl/ChangeLog

    r70931 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified EFL-port to use FrameTree::uniqueName().
     9
     10        * ewk/ewk_frame.cpp:
     11        (ewk_frame_name_get):
     12
    1132010-10-29  Darin Adler  <darin@apple.com>
    214
  • trunk/WebKit/efl/ewk/ewk_frame.cpp

    r68154 r70971  
    475475    }
    476476
    477     WTF::String s = sd->frame->tree()->name();
     477    WTF::String s = sd->frame->tree()->uniqueName();
    478478    WTF::CString cs = s.utf8();
    479479    sd->name = eina_stringshare_add_length(cs.data(), cs.length());
  • trunk/WebKit/gtk/ChangeLog

    r70955 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified GTK-port to use FrameTree::uniqueName().
     9
     10        * webkit/webkitwebframe.cpp:
     11        (webkit_web_frame_get_name):
     12
    1132010-10-29  Martin Robinson  <mrobinson@igalia.com>
    214
  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r68040 r70971  
    481481        return "";
    482482
    483     String string = coreFrame->tree()->name();
     483    String string = coreFrame->tree()->uniqueName();
    484484    priv->name = g_strdup(string.utf8().data());
    485485    return priv->name;
  • trunk/WebKit/mac/ChangeLog

    r70931 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified Mac-port to use FrameTree::uniqueName().
     9
     10        * WebView/WebFrame.mm:
     11        (-[WebFrame name]):
     12
    1132010-10-29  Darin Adler  <darin@apple.com>
    214
  • trunk/WebKit/mac/WebView/WebFrame.mm

    r70199 r70971  
    14071407    if (!coreFrame)
    14081408        return nil;
    1409     return coreFrame->tree()->name();
     1409    return coreFrame->tree()->uniqueName();
    14101410}
    14111411
  • trunk/WebKit/qt/Api/qwebframe.cpp

    r69851 r70971  
    759759QString QWebFrame::frameName() const
    760760{
    761     return d->frame->tree()->name();
     761    return d->frame->tree()->uniqueName();
    762762}
    763763
  • trunk/WebKit/qt/ChangeLog

    r70948 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified Qt-port to use FrameTree::uniqueName().
     9
     10        * Api/qwebframe.cpp:
     11        (QWebFrame::frameName):
     12
    1132010-10-29  Andreas Kling  <kling@webkit.org>
    214
  • trunk/WebKit/win/ChangeLog

    r70931 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified Apple Windows-port to use FrameTree::uniqueName().
     9
     10        * WebFrame.cpp:
     11        (WebFrame::name):
     12
    1132010-10-29  Darin Adler  <darin@apple.com>
    214
  • trunk/WebKit/win/WebFrame.cpp

    r70376 r70971  
    439439        return E_FAIL;
    440440
    441     *frameName = BString(coreFrame->tree()->name()).release();
     441    *frameName = BString(coreFrame->tree()->uniqueName()).release();
    442442    return S_OK;
    443443}
  • trunk/WebKit2/ChangeLog

    r70966 r70971  
     12010-10-29  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        For unnamed frames, window.name returns a generated name
     6        https://bugs.webkit.org/show_bug.cgi?id=6751
     7
     8        Modified WebKit2 to use FrameTree::uniqueName().
     9
     10        * WebProcess/WebPage/WebFrame.cpp:
     11        (WebKit::WebFrame::name):
     12
    1132010-10-29  Sam Weinig  <weinig@apple.com>
    214
  • trunk/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r70936 r70971  
    248248        return String();
    249249
    250     return m_coreFrame->tree()->name();
     250    return m_coreFrame->tree()->uniqueName();
    251251}
    252252
Note: See TracChangeset for help on using the changeset viewer.