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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 years, 9 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
OLDNEW
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. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 27 matching lines...) Expand all
38 , m_useLegacyBackgroundSizeShorthandBehavior(false) 38 , m_useLegacyBackgroundSizeShorthandBehavior(false)
39 , m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy) 39 , m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy)
40 , m_useCounter(useCounter) 40 , m_useCounter(useCounter)
41 { 41 {
42 } 42 }
43 43
44 CSSParserContext::CSSParserContext(const Document& document, UseCounter* useCoun ter, const KURL& baseURL, const String& charset) 44 CSSParserContext::CSSParserContext(const Document& document, UseCounter* useCoun ter, const KURL& baseURL, const String& charset)
45 : m_baseURL(baseURL.isNull() ? document.baseURL() : baseURL) 45 : m_baseURL(baseURL.isNull() ? document.baseURL() : baseURL)
46 , m_charset(charset) 46 , m_charset(charset)
47 , m_mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode) 47 , m_mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode)
48 , m_referrer(m_baseURL.strippedForUseAsReferrer(), document.referrerPolicy() ) 48 , m_referrer(m_baseURL.strippedForUseAsReferrer(), document.getReferrerPolic y())
49 , m_isHTMLDocument(document.isHTMLDocument()) 49 , m_isHTMLDocument(document.isHTMLDocument())
50 , m_useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document. settings()->useLegacyBackgroundSizeShorthandBehavior() : false) 50 , m_useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document. settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
51 , m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy) 51 , m_shouldCheckContentSecurityPolicy(DoNotCheckContentSecurityPolicy)
52 , m_useCounter(useCounter) 52 , m_useCounter(useCounter)
53 { 53 {
54 if (ContentSecurityPolicy::shouldBypassMainWorld(&document)) 54 if (ContentSecurityPolicy::shouldBypassMainWorld(&document))
55 m_shouldCheckContentSecurityPolicy = DoNotCheckContentSecurityPolicy; 55 m_shouldCheckContentSecurityPolicy = DoNotCheckContentSecurityPolicy;
56 else 56 else
57 m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy; 57 m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy;
58 } 58 }
(...skipping 28 matching lines...) Expand all
87 KURL CSSParserContext::completeURL(const String& url) const 87 KURL CSSParserContext::completeURL(const String& url) const
88 { 88 {
89 if (url.isNull()) 89 if (url.isNull())
90 return KURL(); 90 return KURL();
91 if (charset().isEmpty()) 91 if (charset().isEmpty())
92 return KURL(baseURL(), url); 92 return KURL(baseURL(), url);
93 return KURL(baseURL(), url, charset()); 93 return KURL(baseURL(), url, charset());
94 } 94 }
95 95
96 } // namespace blink 96 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698