<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184622] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184622">184622</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-20 00:39:12 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nullptr cleanup in WebCore/xml.
https://bugs.webkit.org/show_bug.cgi?id=145165
Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2015-05-20
Reviewed by Csaba Osztrogonác.
No new tests, no behavior changes
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseXML):
(WebCore::XMLHttpRequest::internalAbort):
(WebCore::XMLHttpRequest::clearResponseBuffers):
(WebCore::XMLHttpRequest::clearRequest):
(WebCore::XMLHttpRequest::didFinishLoading):
* xml/XMLHttpRequestProgressEventThrottle.cpp:
(WebCore::XMLHttpRequestProgressEventThrottle::flushProgressEvent):
* xml/XSLImportRule.cpp:
(WebCore::XSLImportRule::XSLImportRule):
(WebCore::XSLImportRule::~XSLImportRule):
(WebCore::XSLImportRule::setXSLStyleSheet):
(WebCore::XSLImportRule::loadSheet):
* xml/XSLStyleSheet.h:
* xml/XSLStyleSheetLibxslt.cpp:
(WebCore::XSLStyleSheet::XSLStyleSheet):
(WebCore::XSLStyleSheet::~XSLStyleSheet):
(WebCore::XSLStyleSheet::clearDocuments):
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::saveResultToString):
(WebCore::xsltParamArrayFromParameterMap):
(WebCore::xmlDocPtrFromNode):
(WebCore::XSLTProcessor::transformToString):
* xml/parser/XMLDocumentParser.cpp:
(WebCore::XMLDocumentParser::clearCurrentNodeStack):
(WebCore::XMLDocumentParser::exitText):
(WebCore::XMLDocumentParser::notifyFinished):
* xml/parser/XMLDocumentParser.h:
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::openFunc):
(WebCore::XMLDocumentParser::XMLDocumentParser):
* xml/parser/XMLDocumentParserScope.cpp:
* xml/parser/XMLDocumentParserScope.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLImportRulecpp">trunk/Source/WebCore/xml/XSLImportRule.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheeth">trunk/Source/WebCore/xml/XSLStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp">trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParsercpp">trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserh">trunk/Source/WebCore/xml/parser/XMLDocumentParser.h</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserScopecpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserScopeh">trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/ChangeLog 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-05-20 Hunseop Jeong <hs85.jeong@samsung.com>
+
+ nullptr cleanup in WebCore/xml.
+ https://bugs.webkit.org/show_bug.cgi?id=145165
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests, no behavior changes
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseXML):
+ (WebCore::XMLHttpRequest::internalAbort):
+ (WebCore::XMLHttpRequest::clearResponseBuffers):
+ (WebCore::XMLHttpRequest::clearRequest):
+ (WebCore::XMLHttpRequest::didFinishLoading):
+ * xml/XMLHttpRequestProgressEventThrottle.cpp:
+ (WebCore::XMLHttpRequestProgressEventThrottle::flushProgressEvent):
+ * xml/XSLImportRule.cpp:
+ (WebCore::XSLImportRule::XSLImportRule):
+ (WebCore::XSLImportRule::~XSLImportRule):
+ (WebCore::XSLImportRule::setXSLStyleSheet):
+ (WebCore::XSLImportRule::loadSheet):
+ * xml/XSLStyleSheet.h:
+ * xml/XSLStyleSheetLibxslt.cpp:
+ (WebCore::XSLStyleSheet::XSLStyleSheet):
+ (WebCore::XSLStyleSheet::~XSLStyleSheet):
+ (WebCore::XSLStyleSheet::clearDocuments):
+ * xml/XSLTProcessorLibxslt.cpp:
+ (WebCore::saveResultToString):
+ (WebCore::xsltParamArrayFromParameterMap):
+ (WebCore::xmlDocPtrFromNode):
+ (WebCore::XSLTProcessor::transformToString):
+ * xml/parser/XMLDocumentParser.cpp:
+ (WebCore::XMLDocumentParser::clearCurrentNodeStack):
+ (WebCore::XMLDocumentParser::exitText):
+ (WebCore::XMLDocumentParser::notifyFinished):
+ * xml/parser/XMLDocumentParser.h:
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::openFunc):
+ (WebCore::XMLDocumentParser::XMLDocumentParser):
+ * xml/parser/XMLDocumentParserScope.cpp:
+ * xml/parser/XMLDocumentParserScope.h:
+
</ins><span class="cx"> 2015-05-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Network Cache: Implement ShareableResource for Soup and enable it for GTK platform
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> if ((m_response.isHTTP() && !responseIsXML() && !isHTML)
</span><span class="cx"> || (isHTML && m_responseTypeCode == ResponseTypeDefault)
</span><span class="cx"> || scriptExecutionContext()->isWorkerGlobalScope()) {
</span><del>- m_responseDocument = 0;
</del><ins>+ m_responseDocument = nullptr;
</ins><span class="cx"> } else {
</span><span class="cx"> if (isHTML)
</span><span class="cx"> m_responseDocument = HTMLDocument::create(0, m_url);
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> m_responseDocument->overrideMIMEType(mimeType);
</span><span class="cx">
</span><span class="cx"> if (!m_responseDocument->wellFormed())
</span><del>- m_responseDocument = 0;
</del><ins>+ m_responseDocument = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> m_createdDocument = true;
</span><span class="cx"> }
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx"> // FIXME: when we add the support for multi-part XHR, we will have to think be careful with this initialization.
</span><span class="cx"> m_receivedLength = 0;
</span><span class="cx">
</span><del>- m_decoder = 0;
</del><ins>+ m_decoder = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_loader)
</span><span class="cx"> return true;
</span><span class="lines">@@ -866,8 +866,8 @@
</span><span class="cx"> m_responseBuilder.clear();
</span><span class="cx"> m_responseEncoding = String();
</span><span class="cx"> m_createdDocument = false;
</span><del>- m_responseDocument = 0;
- m_responseBlob = 0;
</del><ins>+ m_responseDocument = nullptr;
+ m_responseBlob = nullptr;
</ins><span class="cx"> m_binaryResponseBuilder.clear();
</span><span class="cx"> m_responseArrayBuffer.clear();
</span><span class="cx"> m_responseCacheIsValid = false;
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx"> void XMLHttpRequest::clearRequest()
</span><span class="cx"> {
</span><span class="cx"> m_requestHeaders.clear();
</span><del>- m_requestEntityBody = 0;
</del><ins>+ m_requestEntityBody = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::genericError()
</span><span class="lines">@@ -1112,11 +1112,11 @@
</span><span class="cx"> InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), this, identifier, m_responseBuilder.toStringPreserveCapacity(), m_url, m_lastSendURL, m_lastSendLineNumber, m_lastSendColumnNumber);
</span><span class="cx">
</span><span class="cx"> bool hadLoader = m_loader;
</span><del>- m_loader = 0;
</del><ins>+ m_loader = nullptr;
</ins><span class="cx">
</span><span class="cx"> changeState(DONE);
</span><span class="cx"> m_responseEncoding = String();
</span><del>- m_decoder = 0;
</del><ins>+ m_decoder = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (hadLoader)
</span><span class="cx"> dropProtection();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> if (m_deferEvents && m_deferredProgressEvent) {
</span><span class="cx"> // Move the progress event to the queue, to get it in the right order on resume.
</span><span class="cx"> m_deferredEvents.append(m_deferredProgressEvent);
</span><del>- m_deferredProgressEvent = 0;
</del><ins>+ m_deferredProgressEvent = nullptr;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLImportRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLImportRule.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLImportRule.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XSLImportRule.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> XSLImportRule::XSLImportRule(XSLStyleSheet* parent, const String& href)
</span><span class="cx"> : m_parentStyleSheet(parent)
</span><span class="cx"> , m_strHref(href)
</span><del>- , m_cachedSheet(0)
</del><ins>+ , m_cachedSheet(nullptr)
</ins><span class="cx"> , m_loading(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> XSLImportRule::~XSLImportRule()
</span><span class="cx"> {
</span><span class="cx"> if (m_styleSheet)
</span><del>- m_styleSheet->setParentStyleSheet(0);
</del><ins>+ m_styleSheet->setParentStyleSheet(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><span class="cx"> m_cachedSheet->removeClient(this);
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> void XSLImportRule::setXSLStyleSheet(const String& href, const URL& baseURL, const String& sheet)
</span><span class="cx"> {
</span><span class="cx"> if (m_styleSheet)
</span><del>- m_styleSheet->setParentStyleSheet(0);
</del><ins>+ m_styleSheet->setParentStyleSheet(nullptr);
</ins><span class="cx">
</span><span class="cx"> m_styleSheet = XSLStyleSheet::create(this, href, baseURL);
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void XSLImportRule::loadSheet()
</span><span class="cx"> {
</span><del>- CachedResourceLoader* cachedResourceLoader = 0;
</del><ins>+ CachedResourceLoader* cachedResourceLoader = nullptr;
</ins><span class="cx">
</span><span class="cx"> XSLStyleSheet* rootSheet = parentStyleSheet();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheet.h (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheet.h 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XSLStyleSheet.h 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> virtual String href() const override { return m_originalURL; }
</span><span class="cx"> virtual String title() const override { return emptyString(); }
</span><span class="cx">
</span><del>- virtual void clearOwnerNode() override { m_ownerNode = 0; }
</del><ins>+ virtual void clearOwnerNode() override { m_ownerNode = nullptr; }
</ins><span class="cx"> virtual URL baseURL() const override { return m_finalURL; }
</span><span class="cx"> virtual bool isLoading() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> XSLStyleSheet::XSLStyleSheet(XSLImportRule* parentRule, const String& originalURL, const URL& finalURL)
</span><del>- : m_ownerNode(0)
</del><ins>+ : m_ownerNode(nullptr)
</ins><span class="cx"> , m_originalURL(originalURL)
</span><span class="cx"> , m_finalURL(finalURL)
</span><span class="cx"> , m_isDisabled(false)
</span><span class="cx"> , m_embedded(false)
</span><span class="cx"> , m_processed(false) // Child sheets get marked as processed when the libxslt engine has finally seen them.
</span><del>- , m_stylesheetDoc(0)
</del><ins>+ , m_stylesheetDoc(nullptr)
</ins><span class="cx"> , m_stylesheetDocTaken(false)
</span><del>- , m_parentStyleSheet(parentRule ? parentRule->parentStyleSheet() : 0)
</del><ins>+ , m_parentStyleSheet(parentRule ? parentRule->parentStyleSheet() : nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> , m_isDisabled(false)
</span><span class="cx"> , m_embedded(embedded)
</span><span class="cx"> , m_processed(true) // The root sheet starts off processed.
</span><del>- , m_stylesheetDoc(0)
</del><ins>+ , m_stylesheetDoc(nullptr)
</ins><span class="cx"> , m_stylesheetDocTaken(false)
</span><del>- , m_parentStyleSheet(0)
</del><ins>+ , m_parentStyleSheet(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& child : m_children) {
</span><span class="cx"> ASSERT(child->parentStyleSheet() == this);
</span><del>- child->setParentStyleSheet(0);
</del><ins>+ child->setParentStyleSheet(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> void XSLStyleSheet::clearDocuments()
</span><span class="cx"> {
</span><del>- m_stylesheetDoc = 0;
</del><ins>+ m_stylesheetDoc = nullptr;
</ins><span class="cx"> for (auto& import : m_children) {
</span><span class="cx"> if (import->styleSheet())
</span><span class="cx"> import->styleSheet()->clearDocuments();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: There seems to be no way to control the ctxt pointer for loading here, thus we have globals.
</span><del>-static XSLTProcessor* globalProcessor = 0;
-static CachedResourceLoader* globalCachedResourceLoader = 0;
</del><ins>+static XSLTProcessor* globalProcessor = nullptr;
+static CachedResourceLoader* globalCachedResourceLoader = nullptr;
</ins><span class="cx"> static xmlDocPtr docLoaderFunc(const xmlChar* uri,
</span><span class="cx"> xmlDictPtr,
</span><span class="cx"> int options,
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> static bool saveResultToString(xmlDocPtr resultDoc, xsltStylesheetPtr sheet, String& resultString)
</span><span class="cx"> {
</span><del>- xmlOutputBufferPtr outputBuf = xmlAllocOutputBuffer(0);
</del><ins>+ xmlOutputBufferPtr outputBuf = xmlAllocOutputBuffer(nullptr);
</ins><span class="cx"> if (!outputBuf)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> parameterArray[index++] = fastStrDup(parameter.key.utf8().data());
</span><span class="cx"> parameterArray[index++] = fastStrDup(parameter.value.utf8().data());
</span><span class="cx"> }
</span><del>- parameterArray[index] = 0;
</del><ins>+ parameterArray[index] = nullptr;
</ins><span class="cx">
</span><span class="cx"> return parameterArray;
</span><span class="cx"> }
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> Ref<Document> ownerDocument(sourceNode.document());
</span><span class="cx"> bool sourceIsDocument = (&sourceNode == &ownerDocument.get());
</span><span class="cx">
</span><del>- xmlDocPtr sourceDoc = 0;
</del><ins>+ xmlDocPtr sourceDoc = nullptr;
</ins><span class="cx"> if (sourceIsDocument && ownerDocument->transformSource())
</span><span class="cx"> sourceDoc = (xmlDocPtr)ownerDocument->transformSource()->platformSource();
</span><span class="cx"> if (!sourceDoc) {
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> sheet->method = origMethod;
</span><span class="cx"> setXSLTLoadCallBack(0, 0, 0);
</span><span class="cx"> xsltFreeStylesheet(sheet);
</span><del>- m_stylesheet = 0;
</del><ins>+ m_stylesheet = nullptr;
</ins><span class="cx">
</span><span class="cx"> return success;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_currentNode && m_currentNode != document())
</span><span class="cx"> m_currentNode->deref();
</span><del>- m_currentNode = 0;
- m_leafTextNode = 0;
</del><ins>+ m_currentNode = nullptr;
+ m_leafTextNode = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_currentNodeStack.size()) { // Aborted parsing.
</span><span class="cx"> for (size_t i = m_currentNodeStack.size() - 1; i != 0; --i)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> Vector<xmlChar> empty;
</span><span class="cx"> m_bufferedText.swap(empty);
</span><span class="cx">
</span><del>- m_leafTextNode = 0;
</del><ins>+ m_leafTextNode = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLDocumentParser::detach()
</span><span class="lines">@@ -230,10 +230,10 @@
</span><span class="cx"> bool wasCanceled = m_pendingScript->wasCanceled();
</span><span class="cx">
</span><span class="cx"> m_pendingScript->removeClient(this);
</span><del>- m_pendingScript = 0;
</del><ins>+ m_pendingScript = nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> e = m_scriptElement;
</span><del>- m_scriptElement = 0;
</del><ins>+ m_scriptElement = nullptr;
</ins><span class="cx">
</span><span class="cx"> ScriptElement* scriptElement = toScriptElementIfPossible(e.get());
</span><span class="cx"> ASSERT(scriptElement);
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> scriptElement->dispatchLoadEvent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_scriptElement = 0;
</del><ins>+ m_scriptElement = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!isDetached() && !m_requestingScript)
</span><span class="cx"> resumeParsing();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.h (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void setIsXHTMLDocument(bool isXHTML) { m_isXHTMLDocument = isXHTML; }
</span><span class="cx"> bool isXHTMLDocument() const { return m_isXHTMLDocument; }
</span><span class="cx">
</span><del>- static bool parseDocumentFragment(const String&, DocumentFragment&, Element* parent = 0, ParserContentPolicy = AllowScriptingContent);
</del><ins>+ static bool parseDocumentFragment(const String&, DocumentFragment&, Element* parent = nullptr, ParserContentPolicy = AllowScriptingContent);
</ins><span class="cx">
</span><span class="cx"> // Used by the XMLHttpRequest to check if the responseXML was well formed.
</span><span class="cx"> virtual bool wellFormed() const override { return !m_sawError; }
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> static bool supportsXMLVersion(const String&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- XMLDocumentParser(Document&, FrameView* = 0);
</del><ins>+ XMLDocumentParser(Document&, FrameView* = nullptr);
</ins><span class="cx"> XMLDocumentParser(DocumentFragment&, Element*, ParserContentPolicy);
</span><span class="cx">
</span><span class="cx"> // From DocumentParser
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> SegmentedString m_originalSourceForTransform;
</span><span class="cx">
</span><del>- xmlParserCtxtPtr context() const { return m_context ? m_context->context() : 0; };
</del><ins>+ xmlParserCtxtPtr context() const { return m_context ? m_context->context() : nullptr; };
</ins><span class="cx"> RefPtr<XMLParserContext> m_context;
</span><span class="cx"> std::unique_ptr<PendingCallbacks> m_pendingCallbacks;
</span><span class="cx"> Vector<xmlChar> m_bufferedText;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> CachedResourceLoader* cachedResourceLoader = XMLDocumentParserScope::currentCachedResourceLoader;
</span><del>- XMLDocumentParserScope scope(0);
</del><ins>+ XMLDocumentParserScope scope(nullptr);
</ins><span class="cx"> // FIXME: We should restore the original global error handler as well.
</span><span class="cx">
</span><span class="cx"> if (cachedResourceLoader->frame())
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> XMLDocumentParser::XMLDocumentParser(Document& document, FrameView* frameView)
</span><span class="cx"> : ScriptableDocumentParser(document)
</span><span class="cx"> , m_view(frameView)
</span><del>- , m_context(0)
</del><ins>+ , m_context(nullptr)
</ins><span class="cx"> , m_pendingCallbacks(std::make_unique<PendingCallbacks>())
</span><span class="cx"> , m_depthTriggeringEntityExpansion(-1)
</span><span class="cx"> , m_isParsingEntityDeclaration(false)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> , m_parserPaused(false)
</span><span class="cx"> , m_requestingScript(false)
</span><span class="cx"> , m_finishCalled(false)
</span><del>- , m_pendingScript(0)
</del><ins>+ , m_pendingScript(nullptr)
</ins><span class="cx"> , m_scriptStartPosition(TextPosition::belowRangePosition())
</span><span class="cx"> , m_parsingFragment(false)
</span><span class="cx"> {
</span><span class="lines">@@ -598,8 +598,8 @@
</span><span class="cx">
</span><span class="cx"> XMLDocumentParser::XMLDocumentParser(DocumentFragment& fragment, Element* parentElement, ParserContentPolicy parserContentPolicy)
</span><span class="cx"> : ScriptableDocumentParser(fragment.document(), parserContentPolicy)
</span><del>- , m_view(0)
- , m_context(0)
</del><ins>+ , m_view(nullptr)
+ , m_context(nullptr)
</ins><span class="cx"> , m_pendingCallbacks(std::make_unique<PendingCallbacks>())
</span><span class="cx"> , m_depthTriggeringEntityExpansion(-1)
</span><span class="cx"> , m_isParsingEntityDeclaration(false)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedResourceLoader* XMLDocumentParserScope::currentCachedResourceLoader = 0;
</del><ins>+CachedResourceLoader* XMLDocumentParserScope::currentCachedResourceLoader = nullptr;
</ins><span class="cx">
</span><span class="cx"> XMLDocumentParserScope::XMLDocumentParserScope(CachedResourceLoader* cachedResourceLoader)
</span><span class="cx"> : m_oldCachedResourceLoader(currentCachedResourceLoader)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.h (184621 => 184622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.h 2015-05-20 07:26:56 UTC (rev 184621)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserScope.h 2015-05-20 07:39:12 UTC (rev 184622)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> static CachedResourceLoader* currentCachedResourceLoader;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><del>- XMLDocumentParserScope(CachedResourceLoader* cachedResourceLoader, xmlGenericErrorFunc genericErrorFunc, xmlStructuredErrorFunc structuredErrorFunc = 0, void* errorContext = 0);
</del><ins>+ XMLDocumentParserScope(CachedResourceLoader*, xmlGenericErrorFunc, xmlStructuredErrorFunc structuredErrorFunc = 0, void* errorContext = nullptr);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>