Implement direction-specific touch-action values.

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 0b8d2fff3b140a5c84568a477d7dee8ae028ff42..f6ab582fef37f079b26bc7771d79f9315d6506ba 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -2336,10 +2336,6 @@ void RenderWidget::setTouchAction(
   if (handling_event_type_ != WebInputEvent::TouchStart)
     return;
 
-// TODO(dtapuska): A dependant change needs to land in blink to change
-// the blink::WebTouchAction enum; in the meantime don't do
-// a static cast between the values. (http://crbug.com/476556)
-#if 0
   // Verify the same values are used by the types so we can cast between them.
    STATIC_ASSERT_WTI_ENUM_MATCH(Auto,      AUTO);
    STATIC_ASSERT_WTI_ENUM_MATCH(None,      NONE);
@@ -2353,18 +2349,6 @@ void RenderWidget::setTouchAction(
 
    content::TouchAction content_touch_action =
        static_cast<content::TouchAction>(web_touch_action);
-#else
-  content::TouchAction content_touch_action = TOUCH_ACTION_AUTO;
-  if (web_touch_action & blink::WebTouchActionNone)
-    content_touch_action |= TOUCH_ACTION_NONE;
-  if (web_touch_action & blink::WebTouchActionPanX)
-    content_touch_action |= TOUCH_ACTION_PAN_X;
-  if (web_touch_action & blink::WebTouchActionPanY)
-    content_touch_action |= TOUCH_ACTION_PAN_Y;
-  if (web_touch_action & blink::WebTouchActionPinchZoom)
-    content_touch_action |= TOUCH_ACTION_PINCH_ZOOM;
-
-#endif
   Send(new InputHostMsg_SetTouchAction(routing_id_, content_touch_action));
 }