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

Side by Side Diff: trunk/Source/core/css/MediaList.cpp

Issue 196653020: Revert 169289 "A thread-safe Media Query Parser" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/Source/core/css/CSSPrimitiveValue.cpp ('k') | trunk/Source/core/css/MediaQuery.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 #include "config.h" 20 #include "config.h"
21 #include "core/css/MediaList.h" 21 #include "core/css/MediaList.h"
22 22
23 #include "MediaFeatureNames.h" 23 #include "MediaFeatureNames.h"
24 #include "bindings/v8/ExceptionState.h" 24 #include "bindings/v8/ExceptionState.h"
25 #include "core/css/parser/BisonCSSParser.h" 25 #include "core/css/parser/BisonCSSParser.h"
26 #include "core/css/CSSStyleSheet.h" 26 #include "core/css/CSSStyleSheet.h"
27 #include "core/css/MediaQuery.h" 27 #include "core/css/MediaQuery.h"
28 #include "core/css/MediaQueryExp.h" 28 #include "core/css/MediaQueryExp.h"
29 #include "core/css/parser/MediaQueryParser.h"
30 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
31 #include "core/frame/DOMWindow.h" 30 #include "core/frame/DOMWindow.h"
32 #include "wtf/text/StringBuilder.h" 31 #include "wtf/text/StringBuilder.h"
33 32
34 namespace WebCore { 33 namespace WebCore {
35 34
36 /* MediaList is used to store 3 types of media related entities which mean the s ame: 35 /* MediaList is used to store 3 types of media related entities which mean the s ame:
37 * 36 *
38 * Media Queries, Media Types and Media Descriptors. 37 * Media Queries, Media Types and Media Descriptors.
39 * 38 *
(...skipping 24 matching lines...) Expand all
64 m_queries[i] = o.m_queries[i]->copy(); 63 m_queries[i] = o.m_queries[i]->copy();
65 } 64 }
66 65
67 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet) 66 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet)
68 67
69 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS tring) 68 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS tring)
70 { 69 {
71 if (mediaString.isEmpty()) 70 if (mediaString.isEmpty())
72 return MediaQuerySet::create(); 71 return MediaQuerySet::create();
73 72
74 return MediaQueryParser::parse(mediaString); 73 BisonCSSParser parser(strictCSSParserContext());
75 74 return parser.parseMediaQueryList(mediaString);
76 } 75 }
77 76
78 bool MediaQuerySet::set(const String& mediaString) 77 bool MediaQuerySet::set(const String& mediaString)
79 { 78 {
80 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString); 79 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString);
81 m_queries.swap(result->m_queries); 80 m_queries.swap(result->m_queries);
82 return true; 81 return true;
83 } 82 }
84 83
85 bool MediaQuerySet::add(const String& queryString) 84 bool MediaQuerySet::add(const String& queryString)
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 304 }
306 } 305 }
307 } 306 }
308 } 307 }
309 308
310 if (suspiciousValue && !dotsPerPixelUsed) 309 if (suspiciousValue && !dotsPerPixelUsed)
311 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText( ), suspiciousValue); 310 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText( ), suspiciousValue);
312 } 311 }
313 312
314 } 313 }
OLDNEW
« no previous file with comments | « trunk/Source/core/css/CSSPrimitiveValue.cpp ('k') | trunk/Source/core/css/MediaQuery.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698