blink: Rename enums and functions to not collide with chromium style.

third_party/WebKit/Source/core/css/MediaQuery.cpp

 /*
  * CSS Media Query
  *
  * Copyright (C) 2005, 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 61 matching lines @@
 static bool expressionCompare(const OwnPtrWillBeMember<MediaQueryExp>& a, const OwnPtrWillBeMember<MediaQueryExp>& b)
 {
     return codePointCompare(a->serialize(), b->serialize()) < 0;
 }
 
 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::createNotAll()
 {
     return adoptPtrWillBeNoop(new MediaQuery(MediaQuery::Not, MediaTypeNames::all, ExpressionHeapVector()));
 }
 
-PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(Restrictor restrictor, String mediaType, ExpressionHeapVector expressions)
+PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
 {
     return adoptPtrWillBeNoop(new MediaQuery(restrictor, std::move(mediaType), std::move(expressions)));
 }
 
-MediaQuery::MediaQuery(Restrictor r, String mediaType, ExpressionHeapVector expressions)
-    : m_restrictor(r)
+MediaQuery::MediaQuery(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
+    : m_restrictor(restrictor)
     , m_mediaType(attemptStaticStringCreation(mediaType.lower()))
     , m_expressions(std::move(expressions))
 {
     nonCopyingSort(m_expressions.begin(), m_expressions.end(), expressionCompare);
 
     // Remove all duplicated expressions.
     MediaQueryExp* key = 0;
     for (int i = m_expressions.size() - 1; i >= 0; --i) {
         MediaQueryExp* exp = m_expressions.at(i).get();
 
@@ skipping 36 matching lines @@
 DEFINE_TRACE(MediaQuery)
 {
     // We don't support tracing of vectors of OwnPtrs (ie. OwnPtr<Vector<OwnPtr<MediaQuery>>>).
     // Since this is a transitional object we are just ifdef'ing it out when oilpan is not enabled.
 #if ENABLE(OILPAN)
     visitor->trace(m_expressions);
 #endif
 }
 
 } // namespace blink