| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 54                                    SelectorProfile profile) | 54                                    SelectorProfile profile) | 
| 55     : m_baseURL(baseURL.isNull() ? document.baseURL() : baseURL), | 55     : m_baseURL(baseURL.isNull() ? document.baseURL() : baseURL), | 
| 56       m_charset(charset), | 56       m_charset(charset), | 
| 57       m_mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode), | 57       m_mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode), | 
| 58       m_profile(profile), | 58       m_profile(profile), | 
| 59       m_referrer(m_baseURL.strippedForUseAsReferrer(), | 59       m_referrer(m_baseURL.strippedForUseAsReferrer(), | 
| 60                  document.getReferrerPolicy()), | 60                  document.getReferrerPolicy()), | 
| 61       m_isHTMLDocument(document.isHTMLDocument()), | 61       m_isHTMLDocument(document.isHTMLDocument()), | 
| 62       m_useLegacyBackgroundSizeShorthandBehavior( | 62       m_useLegacyBackgroundSizeShorthandBehavior( | 
| 63           document.settings() | 63           document.settings() | 
| 64               ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() | 64               ? document.settings() | 
|  | 65                     ->GetUseLegacyBackgroundSizeShorthandBehavior() | 
| 65               : false), | 66               : false), | 
| 66       m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy), | 67       m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy), | 
| 67       m_useCounter(useCounter) { | 68       m_useCounter(useCounter) { | 
| 68   if (ContentSecurityPolicy::shouldBypassMainWorld(&document)) | 69   if (ContentSecurityPolicy::shouldBypassMainWorld(&document)) | 
| 69     m_shouldCheckContentSecurityPolicy = DoNotCheckContentSecurityPolicy; | 70     m_shouldCheckContentSecurityPolicy = DoNotCheckContentSecurityPolicy; | 
| 70   else | 71   else | 
| 71     m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy; | 72     m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy; | 
| 72 | 73 | 
| 73   if (HTMLImportsController* importsController = document.importsController()) | 74   if (HTMLImportsController* importsController = document.importsController()) | 
| 74     m_matchMode = importsController->master()->inQuirksMode() | 75     m_matchMode = importsController->master()->inQuirksMode() | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 110 | 111 | 
| 111 KURL CSSParserContext::completeURL(const String& url) const { | 112 KURL CSSParserContext::completeURL(const String& url) const { | 
| 112   if (url.isNull()) | 113   if (url.isNull()) | 
| 113     return KURL(); | 114     return KURL(); | 
| 114   if (charset().isEmpty()) | 115   if (charset().isEmpty()) | 
| 115     return KURL(baseURL(), url); | 116     return KURL(baseURL(), url); | 
| 116   return KURL(baseURL(), url, charset()); | 117   return KURL(baseURL(), url, charset()); | 
| 117 } | 118 } | 
| 118 | 119 | 
| 119 }  // namespace blink | 120 }  // namespace blink | 
| OLD | NEW | 
|---|