Fix incorrect parameter name for useCounterDocument in CSSParserContext

third_party/WebKit/Source/core/css/parser/CSSParserContext.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSParserContext.h"
 
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/Settings.h"
@@ skipping 14 matching lines @@
 // static
 CSSParserContext* CSSParserContext::createWithStyleSheetContents(
     const CSSParserContext* other,
     const StyleSheetContents* styleSheetContents) {
   return CSSParserContext::create(
       other, StyleSheetContents::singleOwnerDocument(styleSheetContents));
 }
 
 // static
 CSSParserContext* CSSParserContext::create(const CSSParserContext* other,
-                                           const Document* m_document) {
+                                           const Document* useCounterDocument) {

[dcheng, 2017/03/22 21:09:59]

Personally I'd just call it document if we're going to call the field
m_document. *shrug*

   return new CSSParserContext(
       other->m_baseURL, other->m_charset, other->m_mode, other->m_matchMode,
       other->m_profile, other->m_referrer, other->m_isHTMLDocument,
       other->m_useLegacyBackgroundSizeShorthandBehavior,
-      other->m_shouldCheckContentSecurityPolicy, m_document);
+      other->m_shouldCheckContentSecurityPolicy, useCounterDocument);
 }
 
 // static
 CSSParserContext* CSSParserContext::create(CSSParserMode mode,
                                            SelectorProfile profile,
-                                           const Document* m_document) {
-  return new CSSParserContext(KURL(), emptyString, mode, mode, profile,
-                              Referrer(), false, false,
-                              DoNotCheckContentSecurityPolicy, m_document);
+                                           const Document* useCounterDocument) {
+  return new CSSParserContext(
+      KURL(), emptyString, mode, mode, profile, Referrer(), false, false,
+      DoNotCheckContentSecurityPolicy, useCounterDocument);
 }
 
 // static
 CSSParserContext* CSSParserContext::create(const Document& document,
-                                           const Document* m_document) {
+                                           const Document* useCounterDocument) {

[jochen (gone - plz use gerrit), 2017/03/22 21:10:47]

this would collide here...

   return CSSParserContext::create(document, KURL(), emptyString, DynamicProfile,
-                                  m_document);
+                                  useCounterDocument);
 }
 
 // static
 CSSParserContext* CSSParserContext::create(const Document& document,
                                            const KURL& baseURLOverride,
                                            const String& charset,
                                            SelectorProfile profile,
-                                           const Document* m_document) {
+                                           const Document* useCounterDocument) {
   const KURL baseURL =
       baseURLOverride.isNull() ? document.baseURL() : baseURLOverride;
 
   CSSParserMode mode =
       document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode;
   CSSParserMode matchMode;
   if (HTMLImportsController* importsController = document.importsController()) {
     matchMode = importsController->master()->inQuirksMode() ? HTMLQuirksMode
                                                             : HTMLStandardMode;
   } else {
@@ skipping 10 matching lines @@
 
   ContentSecurityPolicyDisposition policyDisposition;
   if (ContentSecurityPolicy::shouldBypassMainWorld(&document))
     policyDisposition = DoNotCheckContentSecurityPolicy;
   else
     policyDisposition = CheckContentSecurityPolicy;
 
   return new CSSParserContext(baseURL, charset, mode, matchMode, profile,
                               referrer, document.isHTMLDocument(),
                               useLegacyBackgroundSizeShorthandBehavior,
-                              policyDisposition, m_document);
+                              policyDisposition, useCounterDocument);
 }
 
 CSSParserContext::CSSParserContext(
     const KURL& baseURL,
     const String& charset,
     CSSParserMode mode,
     CSSParserMode matchMode,
     SelectorProfile profile,
     const Referrer& referrer,
     bool isHTMLDocument,
     bool useLegacyBackgroundSizeShorthandBehavior,
     ContentSecurityPolicyDisposition policyDisposition,
-    const Document* m_document)
+    const Document* useCounterDocument)
     : m_baseURL(baseURL),
       m_charset(charset),
       m_mode(mode),
       m_matchMode(matchMode),
       m_profile(profile),
       m_referrer(referrer),
       m_isHTMLDocument(isHTMLDocument),
       m_useLegacyBackgroundSizeShorthandBehavior(
           useLegacyBackgroundSizeShorthandBehavior),
       m_shouldCheckContentSecurityPolicy(policyDisposition),
-      m_document(m_document) {}
+      m_document(useCounterDocument) {}
 
 bool CSSParserContext::operator==(const CSSParserContext& other) const {
   return m_baseURL == other.m_baseURL && m_charset == other.m_charset &&
          m_mode == other.m_mode && m_matchMode == other.m_matchMode &&
          m_profile == other.m_profile &&
          m_isHTMLDocument == other.m_isHTMLDocument &&
          m_useLegacyBackgroundSizeShorthandBehavior ==
              other.m_useLegacyBackgroundSizeShorthandBehavior;
 }
 
@@ skipping 31 matching lines @@
 
 bool CSSParserContext::isDocumentHandleEqual(const Document* other) const {
   return m_document.get() == other;
 }
 
 DEFINE_TRACE(CSSParserContext) {
   visitor->trace(m_document);
 }
 
 }  // namespace blink