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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: Unfortunately doesn't work Created 3 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
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 90342759e0e5d6ae4ceaf73ec095d9f5234f190e..0299a9361dd01b0495dff3af1944f66f4d87853e 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -66,6 +66,7 @@
#include "platform/geometry/FloatRoundedRect.h"
#include "platform/geometry/LayoutRectOutsets.h"
#include "platform/graphics/Color.h"
+#include "platform/graphics/TouchAction.h"
#include "platform/scroll/ScrollTypes.h"
#include "platform/text/TextDirection.h"
#include "platform/text/UnicodeBidi.h"
@@ -1511,7 +1512,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
// touch-action
- static TouchAction InitialTouchAction() { return kTouchActionAuto; }
+ static TouchAction InitialTouchAction() {
+ return TouchAction::kTouchActionAuto;
+ }
TouchAction GetTouchAction() const {
return static_cast<TouchAction>(rare_non_inherited_data_->touch_action_);
}

Powered by Google App Engine
This is Rietveld 408576698