[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ap at apple.com
ap at apple.com
Wed Dec 22 15:16:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 243af8ae9d9118c9e6520ce5e83e0db5c3b706b4
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 18:40:02 2010 +0000
Fix the world (d'oh!)
https://bugs.webkit.org/show_bug.cgi?id=48576
Let WebKit2 client know when a frame is a frameset
* html/HTMLFrameSetElement.cpp:
(WebCore::HTMLFrameSetElement::insertedIntoDocument):
(WebCore::HTMLFrameSetElement::removedFromDocument):
Call base class version.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70907 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4354d8e..c161198 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-29 Alexey Proskuryakov <ap at apple.com>
+
+ Fix the world (d'oh!)
+
+ https://bugs.webkit.org/show_bug.cgi?id=48576
+ Let WebKit2 client know when a frame is a frameset
+
+ * html/HTMLFrameSetElement.cpp:
+ (WebCore::HTMLFrameSetElement::insertedIntoDocument):
+ (WebCore::HTMLFrameSetElement::removedFromDocument):
+ Call base class version.
+
2010-10-29 Jian Li <jianli at chromium.org>
Unreviewed. Fix chromium build break.
diff --git a/WebCore/html/HTMLFrameSetElement.cpp b/WebCore/html/HTMLFrameSetElement.cpp
index edc3f37..e6abb25 100644
--- a/WebCore/html/HTMLFrameSetElement.cpp
+++ b/WebCore/html/HTMLFrameSetElement.cpp
@@ -208,12 +208,14 @@ void HTMLFrameSetElement::recalcStyle(StyleChange ch)
void HTMLFrameSetElement::insertedIntoDocument()
{
+ HTMLElement::insertedIntoDocument();
if (Frame* frame = document()->frame())
frame->loader()->client()->dispatchDidBecomeFrameset(document()->isFrameSet());
}
void HTMLFrameSetElement::removedFromDocument()
{
+ HTMLElement::removedFromDocument();
if (Frame* frame = document()->frame())
frame->loader()->client()->dispatchDidBecomeFrameset(document()->isFrameSet());
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list