diff options
Diffstat (limited to 'WebCore/rendering/style/StyleRareInheritedData.cpp')
| -rw-r--r-- | WebCore/rendering/style/StyleRareInheritedData.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp index a765a46..0f3b7e7 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -86,13 +86,10 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const && nbspMode == o.nbspMode && khtmlLineBreak == o.khtmlLineBreak && textSizeAdjust == o.textSizeAdjust -#ifdef MANUAL_MERGE_REQUIRED #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR && tapHighlightColor == o.tapHighlightColor #endif -#else // MANUAL_MERGE_REQUIRED && resize == o.resize -#endif // MANUAL_MERGE_REQUIRED && userSelect == o.userSelect; } |