| OLD | NEW |
| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 text.appendLiteral(", "); | 164 text.appendLiteral(", "); |
| 165 else | 165 else |
| 166 first = false; | 166 first = false; |
| 167 text.append(m_queries[i]->cssText()); | 167 text.append(m_queries[i]->cssText()); |
| 168 } | 168 } |
| 169 return text.toString(); | 169 return text.toString(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 void MediaQuerySet::trace(Visitor* visitor) | 172 void MediaQuerySet::trace(Visitor* visitor) |
| 173 { | 173 { |
| 174 // We don't support tracing of vectors of OwnPtrs (ie. OwnPtr<Vector<OwnPtr<
MediaQuery> > >). | |
| 175 // Since this is a transitional object we are just ifdef'ing it out when oil
pan is not enabled. | |
| 176 #if ENABLE(OILPAN) | |
| 177 visitor->trace(m_queries); | |
| 178 #endif | |
| 179 } | 174 } |
| 180 | 175 |
| 181 MediaList::MediaList(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet) | 176 MediaList::MediaList(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet) |
| 182 : m_mediaQueries(mediaQueries) | 177 : m_mediaQueries(mediaQueries) |
| 183 , m_parentStyleSheet(parentSheet) | 178 , m_parentStyleSheet(parentSheet) |
| 184 , m_parentRule(nullptr) | 179 , m_parentRule(nullptr) |
| 185 { | 180 { |
| 186 } | 181 } |
| 187 | 182 |
| 188 MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule) | 183 MediaList::MediaList(MediaQuerySet* mediaQueries, CSSRule* parentRule) |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 } | 310 } |
| 316 } | 311 } |
| 317 } | 312 } |
| 318 } | 313 } |
| 319 | 314 |
| 320 if (suspiciousType && !dotsPerPixelUsed) | 315 if (suspiciousType && !dotsPerPixelUsed) |
| 321 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText(
), suspiciousType); | 316 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText(
), suspiciousType); |
| 322 } | 317 } |
| 323 | 318 |
| 324 } | 319 } |
| OLD | NEW |