[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
morrita at google.com
morrita at google.com
Sun Feb 20 23:08:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 905dfd3c92dcba1b131b751ebed67343822565d7
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 07:08:56 2011 +0000
2011-01-17 MORITA Hajime <morrita at google.com>
Unreviewed, rolling out r75999.
http://trac.webkit.org/changeset/75999
* dom/Element.cpp:
(WebCore::Element::removeShadowRoot):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2f314a7..ca88290 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-17 MORITA Hajime <morrita at google.com>
+
+ Unreviewed, rolling out r75999.
+ http://trac.webkit.org/changeset/75999
+
+ * dom/Element.cpp:
+ (WebCore::Element::removeShadowRoot):
+
2011-01-17 MORITA Hajime <morrita at google.com>
Unreviewed crash fix, which introduced at r75995
diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
index 1b9e3dc..34caa22 100644
--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -1103,11 +1103,9 @@ void Element::setShadowRoot(PassRefPtr<Node> node)
void Element::removeShadowRoot()
{
- if (!hasRareData())
- return;
-
- ElementRareData* data = rareData();
- if (data->m_shadowRoot) {
+ if (ElementRareData* data = rareData()) {
+ if (!data->m_shadowRoot)
+ return;
RefPtr<Node> oldRoot = data->m_shadowRoot;
data->m_shadowRoot = 0;
document()->removeFocusedNodeOfSubtree(oldRoot.get());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list