[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:23:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fb745d3151e9b51b4b1bb001a4213f84c62a1422
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 2 16:04:29 2010 +0000
2010-11-02 Daniel Bates <dbates at rim.com>
Reviewed by Martin Robinson.
Set frame name before appending it to the frame tree in the Apple Windows,
GTK, and EFL ports
https://bugs.webkit.org/show_bug.cgi?id=48806
Make the frame creation process in the GTK-port consistent with the
Mac, Qt, and Haiku ports. In particular, set the name of the new
frame before it's appended to the frame tree.
At this time we cannot test this change since it is being masked by
HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
We'll be able to test this once we fix bug #6751.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::createFrame):
2010-11-02 Daniel Bates <dbates at rim.com>
Reviewed by Martin Robinson.
Set frame name before appending it to the frame tree in the Apple Windows,
GTK, and EFL ports
https://bugs.webkit.org/show_bug.cgi?id=48806
Make the frame creation process in the Apple Windows-port consistent
with the Mac, Qt, and Haiku ports. In particular, set the name of
the new frame before it's appended to the frame tree.
At this time we cannot test this change since it is being masked by
HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
We'll be able to test this once we fix bug #6751.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::createFrame):
2010-11-02 Daniel Bates <dbates at rim.com>
Reviewed by Martin Robinson.
Set frame name before appending it to the frame tree in the Apple Windows,
GTK, and EFL ports
https://bugs.webkit.org/show_bug.cgi?id=48806
Make the frame creation process in the EFL-port consistent with the
Mac, Qt, and Haiku ports. In particular, set the name of the new
frame before it's appended to the frame tree.
At this time we cannot test this change since it is being masked by
HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
We'll be able to test this once we fix bug #6751.
* ewk/ewk_frame.cpp:
(ewk_frame_child_add):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71120 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index f46c247..c4aaabb 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-02 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ Set frame name before appending it to the frame tree in the Apple Windows,
+ GTK, and EFL ports
+ https://bugs.webkit.org/show_bug.cgi?id=48806
+
+ Make the frame creation process in the EFL-port consistent with the
+ Mac, Qt, and Haiku ports. In particular, set the name of the new
+ frame before it's appended to the frame tree.
+
+ At this time we cannot test this change since it is being masked by
+ HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
+ We'll be able to test this once we fix bug #6751.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_child_add):
+
2010-11-01 Brady Eidson <beidson at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 1395fa5..5c1f1a7 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -1623,11 +1623,11 @@ Evas_Object* ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame>
}
cf = child.get();
- sd->frame->tree()->appendChild(child);
if (cf->tree())
cf->tree()->setName(name);
else
ERR("no tree for child object");
+ sd->frame->tree()->appendChild(child);
if (!ewk_frame_init(frame, sd->view, cf)) {
evas_object_del(frame);
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e5f97e9..19f251d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-02 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ Set frame name before appending it to the frame tree in the Apple Windows,
+ GTK, and EFL ports
+ https://bugs.webkit.org/show_bug.cgi?id=48806
+
+ Make the frame creation process in the GTK-port consistent with the
+ Mac, Qt, and Haiku ports. In particular, set the name of the new
+ frame before it's appended to the frame tree.
+
+ At this time we cannot test this change since it is being masked by
+ HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
+ We'll be able to test this once we fix bug #6751.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::createFrame):
+
2010-11-01 Jennifer Braithwaite <jennb at google.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 88a6a43..bc2b5d9 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -584,8 +584,8 @@ PassRefPtr<Frame> FrameLoaderClient::createFrame(const KURL& url, const String&
RefPtr<Frame> childFrame = Frame::create(page, ownerElement, new FrameLoaderClient(kitFrame));
framePrivate->coreFrame = childFrame.get();
- parentFrame->tree()->appendChild(childFrame);
childFrame->tree()->setName(name);
+ parentFrame->tree()->appendChild(childFrame);
childFrame->init();
// The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index cc63f38..640d51d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-02 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ Set frame name before appending it to the frame tree in the Apple Windows,
+ GTK, and EFL ports
+ https://bugs.webkit.org/show_bug.cgi?id=48806
+
+ Make the frame creation process in the Apple Windows-port consistent
+ with the Mac, Qt, and Haiku ports. In particular, set the name of
+ the new frame before it's appended to the frame tree.
+
+ At this time we cannot test this change since it is being masked by
+ HTMLFrameElementBase::setName() <http://trac.webkit.org/browser/trunk/WebCore/html/HTMLFrameElementBase.cpp?rev=70976#L160>.
+ We'll be able to test this once we fix bug #6751.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::createFrame):
+
2010-11-01 Jenn Braithwaite <jennb at chromium.org>
Reviewed by Adam Roben.
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index a77c6fb..d5b35ac 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -774,8 +774,8 @@ PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const KURL& URL, const Strin
RefPtr<Frame> childFrame = webFrame->init(m_webFrame->webView(), coreFrame->page(), ownerElement);
- coreFrame->tree()->appendChild(childFrame);
childFrame->tree()->setName(name);
+ coreFrame->tree()->appendChild(childFrame);
childFrame->init();
coreFrame->loader()->loadURLIntoChildFrame(URL, referrer, childFrame.get());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list