| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. |
| 5 * All rights reserved. | 5 * All rights reserved. |
| 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| 9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
| 10 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 10 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "core/css/parser/CSSParserMode.h" | 29 #include "core/css/parser/CSSParserMode.h" |
| 30 | 30 |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/frame/Settings.h" | 32 #include "core/frame/Settings.h" |
| 33 #include "core/frame/csp/ContentSecurityPolicy.h" | 33 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 34 #include "core/html/imports/HTMLImportTreeRoot.h" | 34 #include "core/html/imports/HTMLImportTreeRoot.h" |
| 35 #include "core/html/imports/HTMLImportsController.h" | 35 #include "core/html/imports/HTMLImportsController.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 CSSParserContext::CSSParserContext(CSSParserMode mode, UseCounter* useCounter) | 39 CSSParserContext::CSSParserContext(CSSParserMode mode, |
| 40 UseCounter* useCounter, |
| 41 SelectorProfile profile) |
| 40 : m_mode(mode), | 42 : m_mode(mode), |
| 41 m_matchMode(mode), | 43 m_matchMode(mode), |
| 44 m_profile(profile), |
| 42 m_isHTMLDocument(false), | 45 m_isHTMLDocument(false), |
| 43 m_useLegacyBackgroundSizeShorthandBehavior(false), | 46 m_useLegacyBackgroundSizeShorthandBehavior(false), |
| 44 m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy), | 47 m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy), |
| 45 m_useCounter(useCounter) {} | 48 m_useCounter(useCounter) {} |
| 46 | 49 |
| 47 CSSParserContext::CSSParserContext(const Document& document, | 50 CSSParserContext::CSSParserContext(const Document& document, |
| 48 UseCounter* useCounter, | 51 UseCounter* useCounter, |
| 49 const KURL& baseURL, | 52 const KURL& baseURL, |
| 50 const String& charset, | 53 const String& charset, |
| 51 SelectorProfile profile) | 54 SelectorProfile profile) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 110 |
| 108 KURL CSSParserContext::completeURL(const String& url) const { | 111 KURL CSSParserContext::completeURL(const String& url) const { |
| 109 if (url.isNull()) | 112 if (url.isNull()) |
| 110 return KURL(); | 113 return KURL(); |
| 111 if (charset().isEmpty()) | 114 if (charset().isEmpty()) |
| 112 return KURL(baseURL(), url); | 115 return KURL(baseURL(), url); |
| 113 return KURL(baseURL(), url, charset()); | 116 return KURL(baseURL(), url, charset()); |
| 114 } | 117 } |
| 115 | 118 |
| 116 } // namespace blink | 119 } // namespace blink |
| OLD | NEW |