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

Unified Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 15748002: Initial support for experimental touch-action CSS feature (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unnecessary CSSParserContext change Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index 57a5d2f0edf89f0a5a773a77f727e0caeaaa4713..b54b0ea462a46d8e70581a450678749df436684b 100644
--- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -80,6 +80,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_runningAcceleratedAnimation(false)
, m_hasAspectRatio(false)
, m_effectiveBlendMode(RenderStyle::initialBlendMode())
+ , m_touchAction(RenderStyle::initialTouchAction())
{
m_maskBoxImage.setMaskDefaults();
}
@@ -155,6 +156,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
, m_hasAspectRatio(o.m_hasAspectRatio)
, m_effectiveBlendMode(o.m_effectiveBlendMode)
+ , m_touchAction(o.m_touchAction)
{
}
@@ -232,7 +234,8 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_wrapThrough == o.m_wrapThrough
&& !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
&& m_effectiveBlendMode == o.m_effectiveBlendMode
- && m_hasAspectRatio == o.m_hasAspectRatio;
+ && m_hasAspectRatio == o.m_hasAspectRatio
+ && m_touchAction == o.m_touchAction;
}
bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698