Merge 141357

Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 217 matching lines @@
     WebPluginContainer* m_container;
 
     WebRect m_rect;
     WebGraphicsContext3D* m_context;
     unsigned m_colorTexture;
     unsigned m_framebuffer;
     Scene m_scene;
     OwnPtr<WebExternalTextureLayer> m_layer;
 
     WebPluginContainer::TouchEventRequestType m_touchEventRequest;
+    // Requests touch events from the WebPluginContainerImpl multiple times to tickle webkit.org/b/108381
+    bool m_reRequestTouchEvents;
     bool m_printEventDetails;
     bool m_printUserGestureStatus;
     bool m_canProcessDrag;
 };
 
 WebTestPluginImpl::WebTestPluginImpl(WebFrame* frame, const WebPluginParams& params, WebTestDelegate* delegate)
     : m_frame(frame)
     , m_delegate(delegate)
     , m_container(0)
     , m_context(0)
     , m_touchEventRequest(WebPluginContainer::TouchEventRequestTypeNone)
+    , m_reRequestTouchEvents(false)
     , m_printEventDetails(false)
     , m_printUserGestureStatus(false)
     , m_canProcessDrag(false)
 {
     static const WebString kAttributePrimitive = WebString::fromUTF8("primitive");
     static const WebString kAttributeBackgroundColor = WebString::fromUTF8("background-color");
     static const WebString kAttributePrimitiveColor = WebString::fromUTF8("primitive-color");
     static const WebString kAttributeOpacity = WebString::fromUTF8("opacity");
     static const WebString kAttributeAcceptsTouch = WebString::fromUTF8("accepts-touch");
+    static const WebString kAttributeReRequestTouchEvents = WebString::fromUTF8("re-request-touch");
     static const WebString kAttributePrintEventDetails = WebString::fromUTF8("print-event-details");
     static const WebString kAttributeCanProcessDrag = WebString::fromUTF8("can-process-drag");
     static const WebString kAttributePrintUserGestureStatus = WebString::fromUTF8("print-user-gesture-status");
 
     ASSERT(params.attributeNames.size() == params.attributeValues.size());
     size_t size = params.attributeNames.size();
     for (size_t i = 0; i < size; ++i) {
         const WebString& attributeName = params.attributeNames[i];
         const WebString& attributeValue = params.attributeValues[i];
 
         if (attributeName == kAttributePrimitive)
             m_scene.primitive = parsePrimitive(attributeValue);
         else if (attributeName == kAttributeBackgroundColor)
             parseColor(attributeValue, m_scene.backgroundColor);
         else if (attributeName == kAttributePrimitiveColor)
             parseColor(attributeValue, m_scene.primitiveColor);
         else if (attributeName == kAttributeOpacity)
             m_scene.opacity = parseOpacity(attributeValue);
         else if (attributeName == kAttributeAcceptsTouch)
             m_touchEventRequest = parseTouchEventRequestType(attributeValue);
+        else if (attributeName == kAttributeReRequestTouchEvents)
+            m_reRequestTouchEvents = parseBoolean(attributeValue);
         else if (attributeName == kAttributePrintEventDetails)
             m_printEventDetails = parseBoolean(attributeValue);
         else if (attributeName == kAttributeCanProcessDrag)
             m_canProcessDrag = parseBoolean(attributeValue);
         else if (attributeName == kAttributePrintUserGestureStatus)
             m_printUserGestureStatus = parseBoolean(attributeValue);
     }
 }
 
 WebTestPluginImpl::~WebTestPluginImpl()
 {
 }
 
 bool WebTestPluginImpl::initialize(WebPluginContainer* container)
 {
     WebGraphicsContext3D::Attributes attrs;
     m_context = Platform::current()->createOffscreenGraphicsContext3D(attrs);
     if (!m_context)
         return false;
 
     if (!m_context->makeContextCurrent())
         return false;
 
     if (!initScene())
         return false;
 
     m_layer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer(this));
     m_container = container;
     m_container->setWebLayer(m_layer->layer());
+    if (m_reRequestTouchEvents) {
+        m_container->requestTouchEventType(WebPluginContainer::TouchEventRequestTypeSynthesizedMouse);
+        m_container->requestTouchEventType(WebPluginContainer::TouchEventRequestTypeRaw);
+    }
     m_container->requestTouchEventType(m_touchEventRequest);
     m_container->setWantsWheelEvents(true);
     return true;
 }
 
 void WebTestPluginImpl::destroy()
 {
     if (m_container)
         m_container->setWebLayer(0);
     m_layer.clear();
@@ skipping 321 matching lines @@
 {
 }
 
 const WebString& WebTestPlugin::mimeType()
 {
     static const WebString kMimeType = WebString::fromUTF8("application/x-webkit-test-webplugin");
     return kMimeType;
 }
 
 }