projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
css
/
resolver
/
StyleResolverState.cpp
diff --git
a/src/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
b/src/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
index
c30774b
..
665a5f1
100644
(file)
--- a/
src/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
+++ b/
src/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
@@
-39,16
+39,11
@@
StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
, m_applyPropertyToVisitedLinkStyle(false)
, m_lineHeightValue(nullptr)
, m_styleMap(*this, m_elementStyleResources)
, m_applyPropertyToVisitedLinkStyle(false)
, m_lineHeightValue(nullptr)
, m_styleMap(*this, m_elementStyleResources)
- , m_currentRule(nullptr)
{
if (!parentStyle && m_elementContext.parentNode())
m_parentStyle = m_elementContext.parentNode()->renderStyle();
{
if (!parentStyle && m_elementContext.parentNode())
m_parentStyle = m_elementContext.parentNode()->renderStyle();
- // FIXME: Animation unitests will start animations on non-active documents!
- // http://crbug.com/330095
- // ASSERT(document.isActive());
- if (!document.isActive())
- return;
+ ASSERT(document.isActive());
m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceScaleFactor());
}
m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceScaleFactor());
}