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

Side by Side Diff: sky/engine/core/css/MediaList.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/css/FontFaceSetLoadEvent.h ('k') | sky/engine/core/css/MediaQueryList.h » ('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, 2010, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2006, 2010, 2012 Apple Inc. All rights reserved.
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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 #include "sky/engine/config.h" 20 #include "sky/engine/config.h"
21 #include "sky/engine/core/css/MediaList.h" 21 #include "sky/engine/core/css/MediaList.h"
22 22
23 #include "gen/sky/core/MediaFeatureNames.h" 23 #include "gen/sky/core/MediaFeatureNames.h"
24 #include "sky/engine/bindings/core/v8/ExceptionState.h" 24 #include "sky/engine/bindings2/exception_state.h"
25 #include "sky/engine/core/css/CSSStyleSheet.h" 25 #include "sky/engine/core/css/CSSStyleSheet.h"
26 #include "sky/engine/core/css/MediaQuery.h" 26 #include "sky/engine/core/css/MediaQuery.h"
27 #include "sky/engine/core/css/MediaQueryExp.h" 27 #include "sky/engine/core/css/MediaQueryExp.h"
28 #include "sky/engine/core/css/parser/BisonCSSParser.h" 28 #include "sky/engine/core/css/parser/BisonCSSParser.h"
29 #include "sky/engine/core/css/parser/MediaQueryParser.h" 29 #include "sky/engine/core/css/parser/MediaQueryParser.h"
30 #include "sky/engine/core/dom/Document.h" 30 #include "sky/engine/core/dom/Document.h"
31 #include "sky/engine/core/frame/LocalDOMWindow.h" 31 #include "sky/engine/core/frame/LocalDOMWindow.h"
32 #include "sky/engine/core/inspector/ConsoleMessage.h" 32 #include "sky/engine/core/inspector/ConsoleMessage.h"
33 #include "sky/engine/wtf/text/StringBuilder.h" 33 #include "sky/engine/wtf/text/StringBuilder.h"
34 34
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 } 237 }
238 } 238 }
239 } 239 }
240 240
241 if (suspiciousType && !dotsPerPixelUsed) 241 if (suspiciousType && !dotsPerPixelUsed)
242 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText( ), suspiciousType); 242 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText( ), suspiciousType);
243 } 243 }
244 244
245 } 245 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFaceSetLoadEvent.h ('k') | sky/engine/core/css/MediaQueryList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698