| Index: third_party/WebKit/Source/core/css/parser/CSSParserContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserContext.cpp
|
| similarity index 69%
|
| rename from third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp
|
| rename to third_party/WebKit/Source/core/css/parser/CSSParserContext.cpp
|
| index e028dfd4b383489d8e126274327e708f80e3a5e1..f9ea915c47c828f98274047b5a42bd5fa77b530f 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSParserContext.cpp
|
| @@ -1,37 +1,11 @@
|
| -/*
|
| - * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
|
| - * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
|
| - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
|
| - * All rights reserved.
|
| - * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
|
| - * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
|
| - * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
|
| - * (http://www.torchmobile.com/)
|
| - * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
|
| - * Copyright (C) 2012 Intel Corporation. All rights reserved.
|
| - *
|
| - * This library is free software; you can redistribute it and/or
|
| - * modify it under the terms of the GNU Library General Public
|
| - * License as published by the Free Software Foundation; either
|
| - * version 2 of the License, or (at your option) any later version.
|
| - *
|
| - * This library is distributed in the hope that it will be useful,
|
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
| - * Library General Public License for more details.
|
| - *
|
| - * You should have received a copy of the GNU Library General Public License
|
| - * along with this library; see the file COPYING.LIB. If not, write to
|
| - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
| - * Boston, MA 02110-1301, USA.
|
| - */
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| -#include "core/css/parser/CSSParserMode.h"
|
| +#include "core/css/parser/CSSParserContext.h"
|
|
|
| -#include "core/dom/Document.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| -#include "core/html/imports/HTMLImportTreeRoot.h"
|
| #include "core/html/imports/HTMLImportsController.h"
|
|
|
| namespace blink {
|
| @@ -70,12 +44,13 @@ CSSParserContext::CSSParserContext(const Document& document,
|
| else
|
| m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy;
|
|
|
| - if (HTMLImportsController* importsController = document.importsController())
|
| + if (HTMLImportsController* importsController = document.importsController()) {
|
| m_matchMode = importsController->master()->inQuirksMode()
|
| ? HTMLQuirksMode
|
| : HTMLStandardMode;
|
| - else
|
| + } else {
|
| m_matchMode = m_mode;
|
| + }
|
| }
|
|
|
| CSSParserContext::CSSParserContext(const CSSParserContext& other,
|
|
|