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

Side by Side Diff: Source/core/css/MediaList.h

Issue 14578010: Fixing inconsistency with the media query spec and other browsers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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
« no previous file with comments | « LayoutTests/fast/media/mq-parsing-expected.txt ('k') | Source/core/css/MediaList.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 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 PassRefPtr<MediaQuerySet> copy() const { return adoptRef(new MediaQuerySet(* this)); } 68 PassRefPtr<MediaQuerySet> copy() const { return adoptRef(new MediaQuerySet(* this)); }
69 69
70 void reportMemoryUsage(MemoryObjectInfo*) const; 70 void reportMemoryUsage(MemoryObjectInfo*) const;
71 71
72 private: 72 private:
73 MediaQuerySet(); 73 MediaQuerySet();
74 MediaQuerySet(const String& mediaQuery, bool fallbackToDescription); 74 MediaQuerySet(const String& mediaQuery, bool fallbackToDescription);
75 MediaQuerySet(const MediaQuerySet&); 75 MediaQuerySet(const MediaQuerySet&);
76 76
77 PassOwnPtr<MediaQuery> parseMediaQuery(const String&);
78
77 unsigned m_fallbackToDescriptor : 1; // true if failed media query parsing s hould fallback to media description parsing. 79 unsigned m_fallbackToDescriptor : 1; // true if failed media query parsing s hould fallback to media description parsing.
78 signed m_lastLine : 31; 80 signed m_lastLine : 31;
79 Vector<OwnPtr<MediaQuery> > m_queries; 81 Vector<OwnPtr<MediaQuery> > m_queries;
80 }; 82 };
81 83
82 class MediaList : public RefCounted<MediaList> { 84 class MediaList : public RefCounted<MediaList> {
83 public: 85 public:
84 static PassRefPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSStyleShe et* parentSheet) 86 static PassRefPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSStyleShe et* parentSheet)
85 { 87 {
86 return adoptRef(new MediaList(mediaQueries, parentSheet)); 88 return adoptRef(new MediaList(mediaQueries, parentSheet));
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 CSSStyleSheet* m_parentStyleSheet; 122 CSSStyleSheet* m_parentStyleSheet;
121 CSSRule* m_parentRule; 123 CSSRule* m_parentRule;
122 }; 124 };
123 125
124 // Adds message to inspector console whenever dpi or dpcm values are used for "s creen" media. 126 // Adds message to inspector console whenever dpi or dpcm values are used for "s creen" media.
125 void reportMediaQueryWarningIfNeeded(Document*, const MediaQuerySet*); 127 void reportMediaQueryWarningIfNeeded(Document*, const MediaQuerySet*);
126 128
127 } // namespace 129 } // namespace
128 130
129 #endif 131 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/media/mq-parsing-expected.txt ('k') | Source/core/css/MediaList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698