| Index: Source/core/css/parser/CSSParserMode.cpp
|
| diff --git a/Source/core/css/parser/CSSParserMode.cpp b/Source/core/css/parser/CSSParserMode.cpp
|
| index 0525e622facc54769713228a870ec21602599ddb..d77295c00bc86b2cd6d80d09c9888c5c309c971d 100644
|
| --- a/Source/core/css/parser/CSSParserMode.cpp
|
| +++ b/Source/core/css/parser/CSSParserMode.cpp
|
| @@ -28,6 +28,7 @@
|
| #include "core/css/parser/CSSParserMode.h"
|
|
|
| #include "core/dom/Document.h"
|
| +#include "core/frame/LocalFrame.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
|
|
| @@ -56,9 +57,10 @@ CSSParserContext::CSSParserContext(const Document& document, UseCounter* useCoun
|
| m_shouldCheckContentSecurityPolicy = DoNotCheckContentSecurityPolicy;
|
| else
|
| m_shouldCheckContentSecurityPolicy = CheckContentSecurityPolicy;
|
| + m_frame = document.frame();
|
| }
|
|
|
| -CSSParserContext::CSSParserContext(const CSSParserContext& other, UseCounter* useCounter)
|
| +CSSParserContext::CSSParserContext(const CSSParserContext& other, LocalFrame* frame, UseCounter* useCounter)
|
| : m_baseURL(other.m_baseURL)
|
| , m_charset(other.m_charset)
|
| , m_mode(other.m_mode)
|
| @@ -66,17 +68,23 @@ CSSParserContext::CSSParserContext(const CSSParserContext& other, UseCounter* us
|
| , m_isHTMLDocument(other.m_isHTMLDocument)
|
| , m_useLegacyBackgroundSizeShorthandBehavior(other.m_useLegacyBackgroundSizeShorthandBehavior)
|
| , m_shouldCheckContentSecurityPolicy(other.m_shouldCheckContentSecurityPolicy)
|
| + , m_frame(frame)
|
| , m_useCounter(useCounter)
|
| {
|
| }
|
|
|
| +CSSParserContext::~CSSParserContext()
|
| +{
|
| +}
|
| +
|
| bool CSSParserContext::operator==(const CSSParserContext& other) const
|
| {
|
| return m_baseURL == other.m_baseURL
|
| && m_charset == other.m_charset
|
| && m_mode == other.m_mode
|
| && m_isHTMLDocument == other.m_isHTMLDocument
|
| - && m_useLegacyBackgroundSizeShorthandBehavior == other.m_useLegacyBackgroundSizeShorthandBehavior;
|
| + && m_useLegacyBackgroundSizeShorthandBehavior == other.m_useLegacyBackgroundSizeShorthandBehavior
|
| + && m_frame == other.m_frame;
|
| }
|
|
|
| const CSSParserContext& strictCSSParserContext()
|
|
|