X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=WebKit%2Fchromium%2Fsrc%2FWebFrameImpl.cpp;h=41b8321d67251266ee45ba4c3cbe7348257c24cc;hb=28040489d744e0c5d475a88663056c9040ed5320;hp=b4d23c0e2165d326d7e960dd4a40acceb5bf8a3a;hpb=eff9be92c41913c92fb1d3b7983c071f3e718678;p=android-x86%2Fexternal-webkit.git

diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index b4d23c0e2..41b8321d6 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()->name();
+    return m_frame->tree()->uniqueName();
 }
 
 void WebFrameImpl::setName(const WebString& name)
@@ -986,7 +986,7 @@ WebHistoryItem WebFrameImpl::previousHistoryItem() const
     // only get saved to history when it becomes the previous item.  The caller
     // is expected to query the history item after a navigation occurs, after
     // the desired history item has become the previous entry.
-    return WebHistoryItem(viewImpl()->previousHistoryItem());
+    return WebHistoryItem(m_frame->loader()->history()->previousItem());
 }
 
 WebHistoryItem WebFrameImpl::currentHistoryItem() const