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

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

Issue 100463004: Make calls to AtomicString(const String&) explicit in css/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make MediaQuery::mediaType() return an AtomicString Created 7 years 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) 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 22 matching lines...) Expand all
33 #include "core/frame/Frame.h" 33 #include "core/frame/Frame.h"
34 #include "core/frame/FrameView.h" 34 #include "core/frame/FrameView.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 StyleMedia::StyleMedia(Frame* frame) 38 StyleMedia::StyleMedia(Frame* frame)
39 : DOMWindowProperty(frame) 39 : DOMWindowProperty(frame)
40 { 40 {
41 } 41 }
42 42
43 String StyleMedia::type() const 43 AtomicString StyleMedia::type() const
44 { 44 {
45 FrameView* view = m_frame ? m_frame->view() : 0; 45 FrameView* view = m_frame ? m_frame->view() : 0;
46 if (view) 46 if (view)
47 return view->mediaType(); 47 return view->mediaType();
48 48
49 return String(); 49 return nullAtom;
50 } 50 }
51 51
52 bool StyleMedia::matchMedium(const String& query) const 52 bool StyleMedia::matchMedium(const String& query) const
53 { 53 {
54 if (!m_frame) 54 if (!m_frame)
55 return false; 55 return false;
56 56
57 Document* document = m_frame->document(); 57 Document* document = m_frame->document();
58 ASSERT(document); 58 ASSERT(document);
59 Element* documentElement = document->documentElement(); 59 Element* documentElement = document->documentElement();
60 if (!documentElement) 60 if (!documentElement)
61 return false; 61 return false;
62 62
63 StyleResolver& styleResolver = document->ensureStyleResolver(); 63 StyleResolver& styleResolver = document->ensureStyleResolver();
64 RefPtr<RenderStyle> rootStyle = styleResolver.styleForElement(documentElemen t, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules); 64 RefPtr<RenderStyle> rootStyle = styleResolver.styleForElement(documentElemen t, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules);
65 65
66 RefPtr<MediaQuerySet> media = MediaQuerySet::create(); 66 RefPtr<MediaQuerySet> media = MediaQuerySet::create();
67 if (!media->set(query)) 67 if (!media->set(query))
68 return false; 68 return false;
69 69
70 MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get()); 70 MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get());
71 return screenEval.eval(media.get()); 71 return screenEval.eval(media.get());
72 } 72 }
73 73
74 } // namespace WebCore 74 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698