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

Side by Side Diff: Source/core/css/MediaQueryEvaluatorTest.cpp

Issue 853483003: Add support for 'display-mode' MQ defined in Manifest spec (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 5 years, 11 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 | « Source/core/css/MediaQueryEvaluator.cpp ('k') | Source/core/css/MediaQueryExp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/css/MediaQueryEvaluator.h" 6 #include "core/css/MediaQueryEvaluator.h"
7 7
8 #include "core/MediaTypeNames.h" 8 #include "core/MediaTypeNames.h"
9 #include "core/css/MediaList.h" 9 #include "core/css/MediaList.h"
10 #include "core/css/MediaValuesCached.h" 10 #include "core/css/MediaValuesCached.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 {"(orientation: 'portrait')", 0}, 47 {"(orientation: 'portrait')", 0},
48 {"(orientation: @junk portrait)", 0}, 48 {"(orientation: @junk portrait)", 0},
49 {"screen and (orientation: @portrait) and (max-width: 1000px)", 0}, 49 {"screen and (orientation: @portrait) and (max-width: 1000px)", 0},
50 {"screen and (orientation: @portrait), (max-width: 1000px)", 1}, 50 {"screen and (orientation: @portrait), (max-width: 1000px)", 1},
51 {"tv and (scan: progressive)", 0}, 51 {"tv and (scan: progressive)", 0},
52 {"(pointer: coarse)", 0}, 52 {"(pointer: coarse)", 0},
53 {"(pointer: fine)", 1}, 53 {"(pointer: fine)", 1},
54 {"(hover: hover)", 1}, 54 {"(hover: hover)", 1},
55 {"(hover: on-demand)", 0}, 55 {"(hover: on-demand)", 0},
56 {"(hover: none)", 0}, 56 {"(hover: none)", 0},
57 {"(display-mode)", 0},
58 {"(display-mode: fullscreen)", 0},
59 {"(display-mode: standalone)", 0},
60 {"(display-mode: minimal-ui)", 0},
61 {"(display-mode: browser)", 1},
62 {"(display-mode: min-browser)", 0},
63 {"(display-mode: url(browser))", 0},
64 {"(display-mode: #browser)", 0},
65 {"(display-mode: @browser)", 0},
66 {"(display-mode: 'browser')", 0},
67 {"(display-mode: @junk browser)", 0},
57 {0, 0} // Do not remove the terminator line. 68 {0, 0} // Do not remove the terminator line.
58 }; 69 };
59 70
60 TestCase viewportTestCases[] = { 71 TestCase viewportTestCases[] = {
61 {"all and (min-width: 500px)", 1}, 72 {"all and (min-width: 500px)", 1},
62 {"(min-width: 500px)", 1}, 73 {"(min-width: 500px)", 1},
63 {"(min-width: 501px)", 0}, 74 {"(min-width: 501px)", 0},
64 {"(max-width: 500px)", 1}, 75 {"(max-width: 500px)", 1},
65 {"(max-width: 499px)", 0}, 76 {"(max-width: 499px)", 0},
66 {"(width: 500px)", 1}, 77 {"(width: 500px)", 1},
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 data.deviceHeight = 500; 118 data.deviceHeight = 500;
108 data.devicePixelRatio = 2.0; 119 data.devicePixelRatio = 2.0;
109 data.colorBitsPerComponent = 24; 120 data.colorBitsPerComponent = 24;
110 data.monochromeBitsPerComponent = 0; 121 data.monochromeBitsPerComponent = 0;
111 data.primaryPointerType = PointerTypeFine; 122 data.primaryPointerType = PointerTypeFine;
112 data.primaryHoverType = HoverTypeHover; 123 data.primaryHoverType = HoverTypeHover;
113 data.defaultFontSize = 16; 124 data.defaultFontSize = 16;
114 data.threeDEnabled = true; 125 data.threeDEnabled = true;
115 data.mediaType = MediaTypeNames::screen; 126 data.mediaType = MediaTypeNames::screen;
116 data.strictMode = true; 127 data.strictMode = true;
128 data.displayMode = DisplayModeBrowser;
117 RefPtr<MediaValues> mediaValues = MediaValuesCached::create(data); 129 RefPtr<MediaValues> mediaValues = MediaValuesCached::create(data);
118 130
119 MediaQueryEvaluator mediaQueryEvaluator(*mediaValues); 131 MediaQueryEvaluator mediaQueryEvaluator(*mediaValues);
120 testMQEvaluator(screenTestCases, mediaQueryEvaluator); 132 testMQEvaluator(screenTestCases, mediaQueryEvaluator);
121 testMQEvaluator(viewportTestCases, mediaQueryEvaluator); 133 testMQEvaluator(viewportTestCases, mediaQueryEvaluator);
122 134
123 data.mediaType = MediaTypeNames::print; 135 data.mediaType = MediaTypeNames::print;
124 mediaValues = MediaValuesCached::create(data); 136 mediaValues = MediaValuesCached::create(data);
125 MediaQueryEvaluator printMediaQueryEvaluator(*mediaValues); 137 MediaQueryEvaluator printMediaQueryEvaluator(*mediaValues);
126 testMQEvaluator(printTestCases, printMediaQueryEvaluator); 138 testMQEvaluator(printTestCases, printMediaQueryEvaluator);
(...skipping 16 matching lines...) Expand all
143 RefPtrWillBePersistent<FrameView> view = pageHolder->frame().view(); 155 RefPtrWillBePersistent<FrameView> view = pageHolder->frame().view();
144 pageHolder->frame().setView(nullptr); 156 pageHolder->frame().setView(nullptr);
145 MediaQueryEvaluator mediaQueryEvaluator(&pageHolder->frame()); 157 MediaQueryEvaluator mediaQueryEvaluator(&pageHolder->frame());
146 RefPtrWillBePersistent<MediaQuerySet> querySet = MediaQuerySet::create("foob ar"); 158 RefPtrWillBePersistent<MediaQuerySet> querySet = MediaQuerySet::create("foob ar");
147 bool output = false; 159 bool output = false;
148 ASSERT_EQ(output, mediaQueryEvaluator.eval(querySet.get())); 160 ASSERT_EQ(output, mediaQueryEvaluator.eval(querySet.get()));
149 pageHolder->frame().setView(view); 161 pageHolder->frame().setView(view);
150 } 162 }
151 163
152 } // namespace 164 } // namespace
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryEvaluator.cpp ('k') | Source/core/css/MediaQueryExp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698