Fix style errors in core/xml/.

Source/core/xml/XSLStyleSheetLibxslt.cpp

 /*
  * This file is part of the XSL implementation.
  *
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 14 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/dom/TransformSource.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/xml/XSLImportRule.h"
 #include "core/xml/XSLTProcessor.h"
 #include "core/xml/parser/XMLDocumentParserScope.h"
 #include "core/xml/parser/XMLParserInput.h"
 #include "wtf/text/CString.h"
-
 #include <libxml/uri.h>
 #include <libxslt/xsltutils.h>
 
 namespace WebCore {
 
 XSLStyleSheet::XSLStyleSheet(XSLImportRule* parentRule, const String& originalURL, const KURL& finalURL)
     : m_ownerNode(nullptr)
     , m_originalURL(originalURL)
     , m_finalURL(finalURL)
     , m_isDisabled(false)
     , m_embedded(false)
-    , m_processed(false) // Child sheets get marked as processed when the libxslt engine has finally seen them.
+    // Child sheets get marked as processed when the libxslt engine has finally
+    // seen them.
+    , m_processed(false)
     , m_stylesheetDoc(0)
     , m_stylesheetDocTaken(false)
     , m_compilationFailed(false)
     , m_parentStyleSheet(parentRule ? parentRule->parentStyleSheet() : 0)
 {
 }
 
 XSLStyleSheet::XSLStyleSheet(Node* parentNode, const String& originalURL, const KURL& finalURL,  bool embedded)
     : m_ownerNode(parentNode)
     , m_originalURL(originalURL)
@@ skipping 51 matching lines @@
     m_stylesheetDoc = 0;
     for (unsigned i = 0; i < m_children.size(); ++i) {
         XSLImportRule* import = m_children.at(i).get();
         if (import->styleSheet())
             import->styleSheet()->clearDocuments();
     }
 }
 
 ResourceFetcher* XSLStyleSheet::fetcher()
 {
-    Document* document = ownerDocument();
-    if (!document)
-        return 0;
-    return document->fetcher();
+    if (Document* document = ownerDocument())
+        return document->fetcher();
+    return 0;
 }
 
 bool XSLStyleSheet::parseString(const String& source)
 {
     // Parse in a single chunk into an xmlDocPtr
     if (!m_stylesheetDocTaken)
         xmlFreeDoc(m_stylesheetDoc);
     m_stylesheetDocTaken = false;
 
     FrameConsole* console = 0;
-    LocalFrame* frame = ownerDocument()->frame();
-    if (frame)
+    if (LocalFrame* frame = ownerDocument()->frame())
         console = &frame->console();
 
     XMLDocumentParserScope scope(fetcher(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);
     XMLParserInput input(source);
 
     xmlParserCtxtPtr ctxt = xmlCreateMemoryParserCtxt(input.data(), input.size());
     if (!ctxt)
         return 0;
 
     if (m_parentStyleSheet) {
@@ skipping 17 matching lines @@
     return m_stylesheetDoc;
 }
 
 void XSLStyleSheet::loadChildSheets()
 {
     if (!document())
         return;
 
     xmlNodePtr stylesheetRoot = document()->children;
 
-    // Top level children may include other things such as DTD nodes, we ignore those.
+    // Top level children may include other things such as DTD nodes, we ignore
+    // those.
     while (stylesheetRoot && stylesheetRoot->type != XML_ELEMENT_NODE)
         stylesheetRoot = stylesheetRoot->next;
 
     if (m_embedded) {
-        // We have to locate (by ID) the appropriate embedded stylesheet element, so that we can walk the
-        // import/include list.
+        // We have to locate (by ID) the appropriate embedded stylesheet
+        // element, so that we can walk the import/include list.
         xmlAttrPtr idNode = xmlGetID(document(), (const xmlChar*)(finalURL().string().utf8().data()));
         if (!idNode)
             return;
         stylesheetRoot = idNode->parent;
     } else {
-        // FIXME: Need to handle an external URI with a # in it.  This is a pretty minor edge case, so we'll deal
-        // with it later.
+        // FIXME: Need to handle an external URI with a # in it. This is a
+        // pretty minor edge case, so we'll deal with it later.
     }
 
     if (stylesheetRoot) {
-        // Walk the children of the root element and look for import/include elements.
-        // Imports must occur first.
+        // Walk the children of the root element and look for import/include
+        // elements. Imports must occur first.
         xmlNodePtr curr = stylesheetRoot->children;
         while (curr) {
             if (curr->type != XML_ELEMENT_NODE) {
                 curr = curr->next;
                 continue;
             }
             if (IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "import")) {
                 xmlChar* uriRef = xsltGetNsProp(curr, (const xmlChar*)"href", XSLT_NAMESPACE);
                 loadChildSheet(String::fromUTF8((const char*)uriRef));
                 xmlFree(uriRef);
-            } else
+            } else {
                 break;
+            }
             curr = curr->next;
         }
 
         // Now handle includes.
         while (curr) {
             if (curr->type == XML_ELEMENT_NODE && IS_XSLT_ELEM(curr) && IS_XSLT_NAME(curr, "include")) {
                 xmlChar* uriRef = xsltGetNsProp(curr, (const xmlChar*)"href", XSLT_NAMESPACE);
                 loadChildSheet(String::fromUTF8((const char*)uriRef));
                 xmlFree(uriRef);
             }
             curr = curr->next;
         }
     }
 }
 
 void XSLStyleSheet::loadChildSheet(const String& href)
 {
     OwnPtrWillBeRawPtr<XSLImportRule> childRule = XSLImportRule::create(this, href);
     XSLImportRule* c = childRule.get();
     m_children.append(childRule.release());
     c->loadSheet();
 }
 
 xsltStylesheetPtr XSLStyleSheet::compileStyleSheet()
 {
     // FIXME: Hook up error reporting for the stylesheet compilation process.
     if (m_embedded)
         return xsltLoadStylesheetPI(document());
 
-    // Certain libxslt versions are corrupting the xmlDoc on compilation failures -
-    // hence attempting to recompile after a failure is unsafe.
+    // Certain libxslt versions are corrupting the xmlDoc on compilation
+    // failures - hence attempting to recompile after a failure is unsafe.
     if (m_compilationFailed)
         return 0;
 
     // xsltParseStylesheetDoc makes the document part of the stylesheet
     // so we have to release our pointer to it.
     ASSERT(!m_stylesheetDocTaken);
     xsltStylesheetPtr result = xsltParseStylesheetDoc(m_stylesheetDoc);
     if (result)
         m_stylesheetDocTaken = true;
     else
@@ skipping 22 matching lines @@
     for (unsigned i = 0; i < m_children.size(); ++i) {
         XSLImportRule* import = m_children.at(i).get();
         XSLStyleSheet* child = import->styleSheet();
         if (!child)
             continue;
         if (matchedParent) {
             if (child->processed())
                 continue; // libxslt has been given this sheet already.
 
             // Check the URI of the child stylesheet against the doc URI.
-            // In order to ensure that libxml canonicalized both URLs, we get the original href
-            // string from the import rule and canonicalize it using libxml before comparing it
-            // with the URI argument.
+            // In order to ensure that libxml canonicalized both URLs, we get
+            // the original href string from the import rule and canonicalize it
+            // using libxml before comparing it with the URI argument.
             CString importHref = import->href().utf8();
             xmlChar* base = xmlNodeGetBase(parentDoc, (xmlNodePtr)parentDoc);
             xmlChar* childURI = xmlBuildURI((const xmlChar*)importHref.data(), base);
             bool equalURIs = xmlStrEqual(uri, childURI);
             xmlFree(base);
             xmlFree(childURI);
             if (equalURIs) {
                 child->markAsProcessed();
                 return child->document();
             }
@@ skipping 17 matching lines @@
 
 void XSLStyleSheet::trace(Visitor* visitor)
 {
     visitor->trace(m_ownerNode);
     visitor->trace(m_children);
     visitor->trace(m_parentStyleSheet);
     StyleSheet::trace(visitor);
 }
 
 } // namespace WebCore