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

Side by Side Diff: Source/core/css/parser/BisonCSSParser-in.cpp

Issue 564133003: Make better use of MediaTypeNames (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add more Created 6 years, 3 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 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 10 matching lines...) Expand all
21 * You should have received a copy of the GNU Library General Public License 21 * You should have received a copy of the GNU Library General Public License
22 * along with this library; see the file COPYING.LIB. If not, write to 22 * along with this library; see the file COPYING.LIB. If not, write to
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/css/parser/BisonCSSParser.h" 28 #include "core/css/parser/BisonCSSParser.h"
29 29
30 #include "core/CSSValueKeywords.h" 30 #include "core/CSSValueKeywords.h"
31 #include "core/MediaTypeNames.h"
31 #include "core/StylePropertyShorthand.h" 32 #include "core/StylePropertyShorthand.h"
32 #include "core/css/CSSAspectRatioValue.h" 33 #include "core/css/CSSAspectRatioValue.h"
33 #include "core/css/CSSBasicShapes.h" 34 #include "core/css/CSSBasicShapes.h"
34 #include "core/css/CSSBorderImage.h" 35 #include "core/css/CSSBorderImage.h"
35 #include "core/css/CSSCanvasValue.h" 36 #include "core/css/CSSCanvasValue.h"
36 #include "core/css/CSSCrossfadeValue.h" 37 #include "core/css/CSSCrossfadeValue.h"
37 #include "core/css/CSSCursorImageValue.h" 38 #include "core/css/CSSCursorImageValue.h"
38 #include "core/css/CSSFontFaceSrcValue.h" 39 #include "core/css/CSSFontFaceSrcValue.h"
39 #include "core/css/CSSFontFeatureValue.h" 40 #include "core/css/CSSFontFeatureValue.h"
40 #include "core/css/CSSFunctionValue.h" 41 #include "core/css/CSSFunctionValue.h"
(...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 } 1527 }
1527 1528
1528 MediaQuery* BisonCSSParser::createFloatingMediaQuery(MediaQuery::Restrictor rest rictor, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr<WillBeHeapVector<O wnPtrWillBeMember<MediaQueryExp> > > expressions) 1529 MediaQuery* BisonCSSParser::createFloatingMediaQuery(MediaQuery::Restrictor rest rictor, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr<WillBeHeapVector<O wnPtrWillBeMember<MediaQueryExp> > > expressions)
1529 { 1530 {
1530 m_floatingMediaQuery = adoptPtrWillBeNoop(new MediaQuery(restrictor, mediaTy pe, expressions)); 1531 m_floatingMediaQuery = adoptPtrWillBeNoop(new MediaQuery(restrictor, mediaTy pe, expressions));
1531 return m_floatingMediaQuery.get(); 1532 return m_floatingMediaQuery.get();
1532 } 1533 }
1533 1534
1534 MediaQuery* BisonCSSParser::createFloatingMediaQuery(PassOwnPtrWillBeRawPtr<Will BeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > > expressions) 1535 MediaQuery* BisonCSSParser::createFloatingMediaQuery(PassOwnPtrWillBeRawPtr<Will BeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > > expressions)
1535 { 1536 {
1536 return createFloatingMediaQuery(MediaQuery::None, AtomicString("all", Atomic String::ConstructFromLiteral), expressions); 1537 return createFloatingMediaQuery(MediaQuery::None, MediaTypeNames::all, expre ssions);
1537 } 1538 }
1538 1539
1539 MediaQuery* BisonCSSParser::createFloatingNotAllQuery() 1540 MediaQuery* BisonCSSParser::createFloatingNotAllQuery()
1540 { 1541 {
1541 return createFloatingMediaQuery(MediaQuery::Not, AtomicString("all", AtomicS tring::ConstructFromLiteral), sinkFloatingMediaQueryExpList(createFloatingMediaQ ueryExpList())); 1542 return createFloatingMediaQuery(MediaQuery::Not, MediaTypeNames::all, sinkFl oatingMediaQueryExpList(createFloatingMediaQueryExpList()));
1542 } 1543 }
1543 1544
1544 PassOwnPtrWillBeRawPtr<MediaQuery> BisonCSSParser::sinkFloatingMediaQuery(MediaQ uery* query) 1545 PassOwnPtrWillBeRawPtr<MediaQuery> BisonCSSParser::sinkFloatingMediaQuery(MediaQ uery* query)
1545 { 1546 {
1546 ASSERT_UNUSED(query, query == m_floatingMediaQuery); 1547 ASSERT_UNUSED(query, query == m_floatingMediaQuery);
1547 return m_floatingMediaQuery.release(); 1548 return m_floatingMediaQuery.release();
1548 } 1549 }
1549 1550
1550 WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> >* BisonCSSParser::createFloa tingKeyframeVector() 1551 WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> >* BisonCSSParser::createFloa tingKeyframeVector()
1551 { 1552 {
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 rule->setProperties(createStylePropertySet()); 2111 rule->setProperties(createStylePropertySet());
2111 clearProperties(); 2112 clearProperties();
2112 2113
2113 StyleRuleViewport* result = rule.get(); 2114 StyleRuleViewport* result = rule.get();
2114 m_parsedRules.append(rule.release()); 2115 m_parsedRules.append(rule.release());
2115 2116
2116 return result; 2117 return result;
2117 } 2118 }
2118 2119
2119 } 2120 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/shadow/ShadowElementNames.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698