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

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

Issue 15094019: Fixing inconsistency with Media Query append/deleteMedium. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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
« Source/core/css/MediaList.cpp ('K') | « Source/core/css/MediaList.idl ('k') | no next file » | 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 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 if (!documentElement) 60 if (!documentElement)
61 return false; 61 return false;
62 62
63 StyleResolver* styleResolver = document->styleResolver(); 63 StyleResolver* styleResolver = document->styleResolver();
64 if (!styleResolver) 64 if (!styleResolver)
65 return false; 65 return false;
66 66
67 RefPtr<RenderStyle> rootStyle = styleResolver->styleForElement(documentEleme nt, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules); 67 RefPtr<RenderStyle> rootStyle = styleResolver->styleForElement(documentEleme nt, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules);
68 68
69 RefPtr<MediaQuerySet> media = MediaQuerySet::create(); 69 RefPtr<MediaQuerySet> media = MediaQuerySet::create();
70 if (!media->parse(query)) 70 if (!media->set(query))
71 return false; 71 return false;
72 72
73 MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get()); 73 MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get());
74 return screenEval.eval(media.get()); 74 return screenEval.eval(media.get());
75 } 75 }
76 76
77 } // namespace WebCore 77 } // namespace WebCore
OLDNEW
« Source/core/css/MediaList.cpp ('K') | « Source/core/css/MediaList.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698