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

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

Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat. (Closed)
Patch Set: merge with master; thakis nit Created 4 years, 2 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 * CSS Media Query Evaluator 2 * CSS Media Query Evaluator
3 * 3 *
4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
5 * Copyright (C) 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2013 Intel Corporation. All rights reserved. 6 * Copyright (C) 2013 Intel Corporation. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 static FunctionMap* gFunctionMap; 67 static FunctionMap* gFunctionMap;
68 68
69 MediaQueryEvaluator::MediaQueryEvaluator(bool mediaFeatureResult) 69 MediaQueryEvaluator::MediaQueryEvaluator(bool mediaFeatureResult)
70 : m_expectedResult(mediaFeatureResult) {} 70 : m_expectedResult(mediaFeatureResult) {}
71 71
72 MediaQueryEvaluator::MediaQueryEvaluator(const char* acceptedMediaType, 72 MediaQueryEvaluator::MediaQueryEvaluator(const char* acceptedMediaType,
73 bool mediaFeatureResult) 73 bool mediaFeatureResult)
74 : m_mediaType(acceptedMediaType), m_expectedResult(mediaFeatureResult) {} 74 : m_mediaType(acceptedMediaType), m_expectedResult(mediaFeatureResult) {}
75 75
76 MediaQueryEvaluator::MediaQueryEvaluator(LocalFrame* frame) 76 MediaQueryEvaluator::MediaQueryEvaluator(LocalFrame* frame)
77 : m_expectedResult( 77 // Doesn't matter when we have m_frame and m_style.
78 false) // Doesn't matter when we have m_frame and m_style. 78 : m_expectedResult(false),
79 ,
80 m_mediaValues(MediaValues::createDynamicIfFrameExists(frame)) {} 79 m_mediaValues(MediaValues::createDynamicIfFrameExists(frame)) {}
81 80
82 MediaQueryEvaluator::MediaQueryEvaluator(const MediaValues& mediaValues) 81 MediaQueryEvaluator::MediaQueryEvaluator(const MediaValues& mediaValues)
83 : m_expectedResult(false) // Doesn't matter when we have mediaValues. 82 : m_expectedResult(false), // Doesn't matter when we have mediaValues.
84 ,
85 m_mediaValues(mediaValues.copy()) {} 83 m_mediaValues(mediaValues.copy()) {}
86 84
87 MediaQueryEvaluator::~MediaQueryEvaluator() {} 85 MediaQueryEvaluator::~MediaQueryEvaluator() {}
88 86
89 DEFINE_TRACE(MediaQueryEvaluator) { 87 DEFINE_TRACE(MediaQueryEvaluator) {
90 visitor->trace(m_mediaValues); 88 visitor->trace(m_mediaValues);
91 } 89 }
92 90
93 const String MediaQueryEvaluator::mediaType() const { 91 const String MediaQueryEvaluator::mediaType() const {
94 // If a static mediaType was given by the constructor, we use it here. 92 // If a static mediaType was given by the constructor, we use it here.
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 // Call the media feature evaluation function. Assume no prefix and let 742 // Call the media feature evaluation function. Assume no prefix and let
745 // trampoline functions override the prefix if prefix is used. 743 // trampoline functions override the prefix if prefix is used.
746 EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl()); 744 EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl());
747 if (func) 745 if (func)
748 return func(expr->expValue(), NoPrefix, *m_mediaValues); 746 return func(expr->expValue(), NoPrefix, *m_mediaValues);
749 747
750 return false; 748 return false;
751 } 749 }
752 750
753 } // namespace blink 751 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698