Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: third_party/WebKit/Source/core/css/MediaList.cpp

Issue 2755493004: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in core/css/ (Closed)
Patch Set: Worked on Review Comments done Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2006, 2010, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2006, 2010, 2012 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // To "parse a media query" for a given string means to follow "the parse 75 // To "parse a media query" for a given string means to follow "the parse
76 // a media query list" steps and return "null" if more than one media query 76 // a media query list" steps and return "null" if more than one media query
77 // is returned, or else the returned media query. 77 // is returned, or else the returned media query.
78 MediaQuerySet* result = create(queryString); 78 MediaQuerySet* result = create(queryString);
79 79
80 // Only continue if exactly one media query is found, as described above. 80 // Only continue if exactly one media query is found, as described above.
81 if (result->m_queries.size() != 1) 81 if (result->m_queries.size() != 1)
82 return true; 82 return true;
83 83
84 MediaQuery* newQuery = result->m_queries[0].release(); 84 MediaQuery* newQuery = result->m_queries[0].release();
85 ASSERT(newQuery); 85 DCHECK(newQuery);
86 86
87 // If comparing with any of the media queries in the collection of media 87 // If comparing with any of the media queries in the collection of media
88 // queries returns true terminate these steps. 88 // queries returns true terminate these steps.
89 for (size_t i = 0; i < m_queries.size(); ++i) { 89 for (size_t i = 0; i < m_queries.size(); ++i) {
90 MediaQuery* query = m_queries[i].get(); 90 MediaQuery* query = m_queries[i].get();
91 if (*query == *newQuery) 91 if (*query == *newQuery)
92 return true; 92 return true;
93 } 93 }
94 94
95 m_queries.push_back(newQuery); 95 m_queries.push_back(newQuery);
96 return true; 96 return true;
97 } 97 }
98 98
99 bool MediaQuerySet::remove(const String& queryStringToRemove) { 99 bool MediaQuerySet::remove(const String& queryStringToRemove) {
100 // To "parse a media query" for a given string means to follow "the parse 100 // To "parse a media query" for a given string means to follow "the parse
101 // a media query list" steps and return "null" if more than one media query 101 // a media query list" steps and return "null" if more than one media query
102 // is returned, or else the returned media query. 102 // is returned, or else the returned media query.
103 MediaQuerySet* result = create(queryStringToRemove); 103 MediaQuerySet* result = create(queryStringToRemove);
104 104
105 // Only continue if exactly one media query is found, as described above. 105 // Only continue if exactly one media query is found, as described above.
106 if (result->m_queries.size() != 1) 106 if (result->m_queries.size() != 1)
107 return true; 107 return true;
108 108
109 MediaQuery* newQuery = result->m_queries[0].release(); 109 MediaQuery* newQuery = result->m_queries[0].release();
110 ASSERT(newQuery); 110 DCHECK(newQuery);
111 111
112 // Remove any media query from the collection of media queries for which 112 // Remove any media query from the collection of media queries for which
113 // comparing with the media query returns true. 113 // comparing with the media query returns true.
114 bool found = false; 114 bool found = false;
115 for (size_t i = 0; i < m_queries.size(); ++i) { 115 for (size_t i = 0; i < m_queries.size(); ++i) {
116 MediaQuery* query = m_queries[i].get(); 116 MediaQuery* query = m_queries[i].get();
117 if (*query == *newQuery) { 117 if (*query == *newQuery) {
118 m_queries.remove(i); 118 m_queries.remove(i);
119 --i; 119 --i;
120 found = true; 120 found = true;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 InvalidCharacterError, 196 InvalidCharacterError,
197 "The value provided ('" + medium + "') is not a valid medium."); 197 "The value provided ('" + medium + "') is not a valid medium.");
198 return; 198 return;
199 } 199 }
200 200
201 if (m_parentStyleSheet) 201 if (m_parentStyleSheet)
202 m_parentStyleSheet->didMutate(); 202 m_parentStyleSheet->didMutate();
203 } 203 }
204 204
205 void MediaList::reattach(MediaQuerySet* mediaQueries) { 205 void MediaList::reattach(MediaQuerySet* mediaQueries) {
206 ASSERT(mediaQueries); 206 DCHECK(mediaQueries);
207 m_mediaQueries = mediaQueries; 207 m_mediaQueries = mediaQueries;
208 } 208 }
209 209
210 DEFINE_TRACE(MediaList) { 210 DEFINE_TRACE(MediaList) {
211 visitor->trace(m_mediaQueries); 211 visitor->trace(m_mediaQueries);
212 visitor->trace(m_parentStyleSheet); 212 visitor->trace(m_parentStyleSheet);
213 visitor->trace(m_parentRule); 213 visitor->trace(m_parentRule);
214 } 214 }
215 215
216 } // namespace blink 216 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698