Changeset 87098 in webkit

Timestamp:

May 23, 2011, 2:29:18 PM (14 years ago)

Author:

simonjam@chromium.org

Message:

2011-05-23 James Simonsen <​simonjam@chromium.org>

Reviewed by Adam Barth.

Convert raw pointer to RefPtr.
​https://bugs.webkit.org/show_bug.cgi?id=61196

• dom/XMLDocumentParserLibxml2.cpp: (WebCore::XMLDocumentParser::endElementNs):
• dom/XMLDocumentParserQt.cpp: (WebCore::XMLDocumentParser::parseEndElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/XMLDocumentParserLibxml2.cpp (modified) (3 diffs)
• dom/XMLDocumentParserQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-23  James Simonsen  <simonjam@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Convert raw pointer to RefPtr.
+        https://bugs.webkit.org/show_bug.cgi?id=61196
+
+        * dom/XMLDocumentParserLibxml2.cpp:
+        (WebCore::XMLDocumentParser::endElementNs):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::XMLDocumentParser::parseEndElement):
+
 2011-05-23  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp

@@ -849 +849 @@
     }
 
+    // JavaScript can detach the parser.  Make sure this is not released
+    // before the end of this method.
+    RefPtr<XMLDocumentParser> protect(this);
+
     exitText();
 
-    ContainerNode* n = m_currentNode;
+    RefPtr<ContainerNode> n = m_currentNode;
     n->finishParsingChildren();
 
-    if (m_scriptingPermission == FragmentScriptingNotAllowed && n->isElementNode() && toScriptElement(static_cast<Element*>(n))) {
+    if (m_scriptingPermission == FragmentScriptingNotAllowed && n->isElementNode() && toScriptElement(static_cast<Element*>(n.get()))) {
         popCurrentNode();
         ExceptionCode ec;
@@ -866 +870 @@
     }
 
-    Element* element = static_cast<Element*>(n);
+    Element* element = static_cast<Element*>(n.get());
 
     // The element's parent may have already been removed from document.
@@ -894 +898 @@
         // FIXME: Script execution should be shared between
         // the libxml2 and Qt XMLDocumentParser implementations.
-
-        // JavaScript can detach the parser.  Make sure this is not released
-        // before the end of this method.
-        RefPtr<XMLDocumentParser> protect(this);
 
         if (scriptElement->readyToBeParserExecuted())

trunk/Source/WebCore/dom/XMLDocumentParserQt.cpp

@@ -553 +553 @@
     exitText();
 
-    ContainerNode* n = m_currentNode;
+    RefPtr<ContainerNode> n = m_currentNode;
     n->finishParsingChildren();
 
-    if (m_scriptingPermission == FragmentScriptingNotAllowed && n->isElementNode() && toScriptElement(static_cast<Element*>(n))) {
+    if (m_scriptingPermission == FragmentScriptingNotAllowed && n->isElementNode() && toScriptElement(static_cast<Element*>(n.get()))) {
         popCurrentNode();
         ExceptionCode ec;
@@ -569 +569 @@
     }
 
-    Element* element = static_cast<Element*>(n);
+    Element* element = static_cast<Element*>(n.get());
 
     // The element's parent may have already been removed from document.