[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:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit be5b508e180d6b1a9ba773c1d8a62cfa5e0199c7
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 3 07:19:40 2010 +0000
2010-11-03 Daniel Bates <dbates at rim.com>
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 Chromium port.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::name):
2010-11-03 Daniel Bates <dbates at rim.com>
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 EFL port.
* ewk/ewk_frame.cpp:
(ewk_frame_name_get):
2010-11-03 Daniel Bates <dbates at rim.com>
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 GTK port.
* webkit/webkitwebframe.cpp:
(webkit_web_frame_get_name):
2010-11-03 Daniel Bates <dbates at rim.com>
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 Qt port.
* Api/qwebframe.cpp:
(QWebFrame::frameName):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71217 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index dd358e3..7c7ec8e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03 Daniel Bates <dbates at rim.com>
+
+ 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 Chromium port.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::name):
+
2010-11-02 Al Patrick <apatrick at chromium.org>
Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index b4d23c0..61afafa 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)
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index c4aaabb..9d002f6 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03 Daniel Bates <dbates at rim.com>
+
+ 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 EFL port.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_name_get):
+
2010-11-02 Daniel Bates <dbates at rim.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 5c1f1a7..5076be5 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()->name();
+ WTF::String s = sd->frame->tree()->uniqueName();
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 06a923a..6b33108 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03 Daniel Bates <dbates at rim.com>
+
+ 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 GTK port.
+
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_get_name):
+
2010-11-02 Martin Robinson <mrobinson at igalia.com>
Reviewed by Adam Barth.
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index c581ce6..20fde35 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()->name();
+ String string = coreFrame->tree()->uniqueName();
priv->name = g_strdup(string.utf8().data());
return priv->name;
}
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index fe65be6..63cd7f7 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -773,7 +773,7 @@ QIcon QWebFrame::icon() const
*/
QString QWebFrame::frameName() const
{
- return d->frame->tree()->name();
+ return d->frame->tree()->uniqueName();
}
/*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index eb8e3ce..150512f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03 Daniel Bates <dbates at rim.com>
+
+ 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 Qt port.
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::frameName):
+
2010-11-02 Noam Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list