Add more checks to diagnose MediaQuerySet issue

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2010, 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 49 matching lines @@
 
 MediaQuerySet* MediaQuerySet::Create(const String& media_string) {
   if (media_string.IsEmpty())
     return MediaQuerySet::Create();
 
   return MediaQueryParser::ParseMediaQuerySet(media_string);
 }
 
 bool MediaQuerySet::Set(const String& media_string) {
   MediaQuerySet* result = Create(media_string);
-#if DCHECK_IS_ON()
+  // TODO(keishi) Changed DCHECK to CHECK for crbug.com/699269 diagnosis
   for (const auto& query : result->queries_) {
-    DCHECK(query);
+    CHECK(query);
   }
-#endif
   queries_.Swap(result->queries_);
   return true;
 }
 
 bool MediaQuerySet::Add(const String& query_string) {
   // To "parse a media query" for a given string means to follow "the parse
   // a media query list" steps and return "null" if more than one media query
   // is returned, or else the returned media query.
   MediaQuerySet* result = Create(query_string);
 
   // Only continue if exactly one media query is found, as described above.
   if (result->queries_.size() != 1)
     return true;
 
   MediaQuery* new_query = result->queries_[0].Release();
-  DCHECK(new_query);
+  // TODO(keishi) Changed DCHECK to CHECK for crbug.com/699269 diagnosis
+  CHECK(new_query);
 
   // If comparing with any of the media queries in the collection of media
   // queries returns true terminate these steps.
   for (size_t i = 0; i < queries_.size(); ++i) {
     MediaQuery* query = queries_[i].Get();
     if (*query == *new_query)
       return true;
   }
 
   queries_.push_back(new_query);
   return true;
 }
 
 bool MediaQuerySet::Remove(const String& query_string_to_remove) {
   // To "parse a media query" for a given string means to follow "the parse
   // a media query list" steps and return "null" if more than one media query
   // is returned, or else the returned media query.
   MediaQuerySet* result = Create(query_string_to_remove);
 
   // Only continue if exactly one media query is found, as described above.
   if (result->queries_.size() != 1)
     return true;
 
   MediaQuery* new_query = result->queries_[0].Release();
-  DCHECK(new_query);
+  // TODO(keishi) Changed DCHECK to CHECK for crbug.com/699269 diagnosis
+  CHECK(new_query);
 
   // Remove any media query from the collection of media queries for which
   // comparing with the media query returns true.
   bool found = false;
   for (size_t i = 0; i < queries_.size(); ++i) {
     MediaQuery* query = queries_[i].Get();
     if (*query == *new_query) {
       queries_.erase(i);
       --i;
       found = true;
     }
   }
 
   return found;
 }
 
 void MediaQuerySet::AddMediaQuery(MediaQuery* media_query) {
-  DCHECK(media_query);
+  // TODO(keishi) Changed DCHECK to CHECK for crbug.com/699269 diagnosis
+  CHECK(media_query);
   queries_.push_back(media_query);
 }
 
 String MediaQuerySet::MediaText() const {
   StringBuilder text;
 
   bool first = true;
   for (size_t i = 0; i < queries_.size(); ++i) {
     if (!first)
       text.Append(", ");
@@ skipping 58 matching lines @@
         kInvalidCharacterError,
         "The value provided ('" + medium + "') is not a valid medium.");
     return;
   }
 
   if (parent_style_sheet_)
     parent_style_sheet_->DidMutate();
 }
 
 void MediaList::Reattach(MediaQuerySet* media_queries) {
-  DCHECK(media_queries);
-#if DCHECK_IS_ON
-  for (const auto& query : mediaQueries->queryVector) {
-    DCHECK(query);
+  // TODO(keishi) Changed DCHECK to CHECK for crbug.com/699269 diagnosis
+  CHECK(media_queries);
+  for (const auto& query : media_queries->QueryVector()) {
+    CHECK(query);
   }
-#endif
   media_queries_ = media_queries;
 }
 
 DEFINE_TRACE(MediaList) {
   visitor->Trace(media_queries_);
   visitor->Trace(parent_style_sheet_);
   visitor->Trace(parent_rule_);
 }
 
 }  // namespace blink