[webkit-changes] [101995] trunk/Source/WebCore

[commit-queue]

Title: [101995] trunk/Source/WebCore

Revision

101995

Author

commit-qu...@webkit.org

Date

2011-12-05 06:46:36 -0800 (Mon, 05 Dec 2011)

Log Message

Unreviewed, rolling out r101983.
http://trac.webkit.org/changeset/101983
https://bugs.webkit.org/show_bug.cgi?id=73827

It broke all tests on GTK and on Qt in debug mode (Requested
by Ossy on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-12-05

* dom/Document.h:
(WebCore::Node::Node):
* dom/Node.cpp:
(WebCore::Node::~Node):
* dom/Node.h:
(WebCore::Node::inDocument):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/dom/Document.h
• trunk/Source/WebCore/dom/Node.cpp
• trunk/Source/WebCore/dom/Node.h

Diff

Modified: trunk/Source/WebCore/ChangeLog (101994 => 101995)

--- trunk/Source/WebCore/ChangeLog	2011-12-05 14:32:31 UTC (rev 101994)
+++ trunk/Source/WebCore/ChangeLog	2011-12-05 14:46:36 UTC (rev 101995)
@@ -1,3 +1,19 @@
+2011-12-05  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r101983.
+        http://trac.webkit.org/changeset/101983
+        https://bugs.webkit.org/show_bug.cgi?id=73827
+
+        It broke all tests on GTK and on Qt in debug mode (Requested
+        by Ossy on #webkit).
+
+        * dom/Document.h:
+        (WebCore::Node::Node):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        * dom/Node.h:
+        (WebCore::Node::inDocument):
+
 2011-12-05  Roland Steiner  <rolandstei...@chromium.org>
 
         <style scoped>: Add 'scoped' attribute

Modified: trunk/Source/WebCore/dom/Document.h (101994 => 101995)

--- trunk/Source/WebCore/dom/Document.h	2011-12-05 14:32:31 UTC (rev 101994)
+++ trunk/Source/WebCore/dom/Document.h	2011-12-05 14:46:36 UTC (rev 101995)
@@ -1449,8 +1449,8 @@
     , m_next(0)
     , m_renderer(0)
 {
-    if (document)
-        document->guardRef();
+    if (m_document)
+        m_document->guardRef();
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();
 #endif

Modified: trunk/Source/WebCore/dom/Node.cpp (101994 => 101995)

--- trunk/Source/WebCore/dom/Node.cpp	2011-12-05 14:32:31 UTC (rev 101994)
+++ trunk/Source/WebCore/dom/Node.cpp	2011-12-05 14:46:36 UTC (rev 101995)
@@ -404,17 +404,16 @@
     if (renderer())
         detach();
 
-    Document* doc = document();
-    if (AXObjectCache::accessibilityEnabled() && doc && doc->axObjectCacheExists())
-        doc->axObjectCache()->removeNodeForUse(this);
+    if (AXObjectCache::accessibilityEnabled() && m_document && m_document->axObjectCacheExists())
+        m_document->axObjectCache()->removeNodeForUse(this);
     
     if (m_previous)
         m_previous->setNextSibling(0);
     if (m_next)
         m_next->setPreviousSibling(0);
 
-    if (doc)
-        doc->guardDeref();
+    if (m_document)
+        m_document->guardDeref();
 }
 
 #ifdef NDEBUG

Modified: trunk/Source/WebCore/dom/Node.h (101994 => 101995)

--- trunk/Source/WebCore/dom/Node.h	2011-12-05 14:32:31 UTC (rev 101994)
+++ trunk/Source/WebCore/dom/Node.h	2011-12-05 14:46:36 UTC (rev 101995)
@@ -388,7 +388,7 @@
     // node tree, false otherwise.
     bool inDocument() const 
     { 
-        ASSERT(document() || !getFlag(InDocumentFlag));
+        ASSERT(m_document || !getFlag(InDocumentFlag));
         return getFlag(InDocumentFlag);
     }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes