Changeset 142371 in webkit


Ignore:
Timestamp:
Feb 9, 2013 11:01:43 AM (11 years ago)
Author:
jochen@chromium.org
Message:

[chromium] move context menu data tracking to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=109313

Reviewed by Adam Barth.

  • DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebKit):
(WebTestDelegate):

  • DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:

(WebKit):
(WebTestRunner::WebTestProxy::showContextMenu):

  • DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:

(WebTestRunner):
(WebTestRunner::EventSender::setContextMenuData):
(WebTestRunner::EventSender::contextClick):

  • DumpRenderTree/chromium/TestRunner/src/EventSender.h:

(WebKit):
(EventSender):

  • DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:

(WebTestRunner::WebTestProxyBase::showContextMenu):
(WebTestRunner):

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::showContextMenu):

  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r142370 r142371  
     12013-02-09  Jochen Eisinger  <jochen@chromium.org>
     2
     3        [chromium] move context menu data tracking to TestRunner library
     4        https://bugs.webkit.org/show_bug.cgi?id=109313
     5
     6        Reviewed by Adam Barth.
     7
     8        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
     9        (WebKit):
     10        (WebTestDelegate):
     11        * DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:
     12        (WebKit):
     13        (WebTestRunner::WebTestProxy::showContextMenu):
     14        * DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
     15        (WebTestRunner):
     16        (WebTestRunner::EventSender::setContextMenuData):
     17        (WebTestRunner::EventSender::contextClick):
     18        * DumpRenderTree/chromium/TestRunner/src/EventSender.h:
     19        (WebKit):
     20        (EventSender):
     21        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
     22        (WebTestRunner::WebTestProxyBase::showContextMenu):
     23        (WebTestRunner):
     24        * DumpRenderTree/chromium/WebViewHost.cpp:
     25        (WebViewHost::showContextMenu):
     26        * DumpRenderTree/chromium/WebViewHost.h:
     27        (WebViewHost):
     28
    1292013-02-09  Jochen Eisinger  <jochen@chromium.org>
    230

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

    r142253 r142371  
    4141class WebGamepads;
    4242class WebIntentRequest;
    43 struct WebContextMenuData;
    4443struct WebRect;
    4544struct WebURLError;
    … …  
    5352class WebTestDelegate {
    5453public:
    55     virtual void clearContextMenuData() = 0;
    5654    virtual void clearEditCommand() = 0;
    5755    virtual void setEditCommand(const std::string& name, const std::string& value) = 0;
    58     virtual WebKit::WebContextMenuData* lastContextMenuData() const = 0;
    5956    virtual void setGamepadData(const WebKit::WebGamepads&) = 0;
    6057    virtual void printMessage(const std::string& message) = 0;

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

    r142237 r142371  
    6868class WebView;
    6969struct WebConsoleMessage;
     70struct WebContextMenuData;
    7071struct WebPluginParams;
    7172struct WebPoint;
    … …  
    128129    bool isSmartInsertDeleteEnabled();
    129130    bool isSelectTrailingWhitespaceEnabled();
     131    void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&);
    130132
    131133    void willPerformClientRedirect(WebKit::WebFrame*, const WebKit::WebURL& from, const WebKit::WebURL& to, double interval, double fire_time);
    … …  
    330332        return WebTestProxyBase::isSelectTrailingWhitespaceEnabled();
    331333    }
     334    void showContextMenu(WebKit::WebFrame* frame, const WebKit::WebContextMenuData& contextMenuData)
     335    {
     336        WebTestProxyBase::showContextMenu(frame, contextMenuData);
     337        Base::showContextMenu(frame, contextMenuData);
     338    }
    332339
    333340    // WebFrameClient implementation.

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp

    r142237 r142371  
    318318    bindProperty("WM_SYSDEADCHAR", &wmSysDeadChar);
    319319#endif
     320}
     321
     322void EventSender::setContextMenuData(const WebContextMenuData& contextMenuData)
     323{
     324    m_lastContextMenuData = auto_ptr<WebContextMenuData>(new WebContextMenuData(contextMenuData));
    320325}
    321326
    … …  
    850855    // Clears last context menu data because we need to know if the context menu be requested
    851856    // after following mouse events.
    852     m_delegate->clearContextMenuData();
     857    m_lastContextMenuData.reset();
    853858
    854859    // Generate right mouse down and up.
    … …  
    868873#endif
    869874
    870     WebContextMenuData* lastContextMenu = m_delegate->lastContextMenuData();
    871     result->set(WebBindings::makeStringArray(makeMenuItemStringsFor(lastContextMenu, m_delegate)));
     875    result->set(WebBindings::makeStringArray(makeMenuItemStringsFor(m_lastContextMenuData.get(), m_delegate)));
    872876}
    873877

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h

    r142057 r142371  
    4242#include "WebInputEvent.h"
    4343#include "WebTask.h"
     44#include <memory>
    4445#include <public/WebPoint.h>
    4546
    … …  
    4748class WebDragData;
    4849class WebView;
     50struct WebContextMenuData;
    4951}
    5052
    … …  
    5961    void setDelegate(WebTestDelegate* delegate) { m_delegate = delegate; }
    6062    void setWebView(WebKit::WebView* webView) { m_webView = webView; }
     63
     64    void setContextMenuData(const WebKit::WebContextMenuData&);
    6165
    6266    // Resets some static variable state.
    … …  
    175179    WebKit::WebView* m_webView;
    176180
     181    std::auto_ptr<WebKit::WebContextMenuData> m_lastContextMenuData;
     182
    177183    // Location of the touch point that initiated a gesture.
    178184    WebKit::WebPoint m_currentGestureLocation;

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

    r142237 r142371  
    628628}
    629629
     630void WebTestProxyBase::showContextMenu(WebFrame*, const WebContextMenuData& contextMenuData)
     631{
     632    m_testInterfaces->eventSender()->setContextMenuData(contextMenuData);
     633}
     634
    630635void WebTestProxyBase::willPerformClientRedirect(WebFrame* frame, const WebURL&, const WebURL& to, double, double)
    631636{

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r142253 r142371  
    237237void WebViewHost::showContextMenu(WebFrame*, const WebContextMenuData& contextMenuData)
    238238{
    239     m_lastContextMenuData = adoptPtr(new WebContextMenuData(contextMenuData));
    240239}
    241240
    … …  
    638637
    639638// WebTestDelegate ------------------------------------------------------------
    640 
    641 WebContextMenuData* WebViewHost::lastContextMenuData() const
    642 {
    643     return m_lastContextMenuData.get();
    644 }
    645 
    646 void WebViewHost::clearContextMenuData()
    647 {
    648     m_lastContextMenuData.clear();
    649 }
    650639
    651640void WebViewHost::setEditCommand(const string& name, const string& value)

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r142253 r142371  
    110110
    111111    // WebTestDelegate.
    112     virtual WebKit::WebContextMenuData* lastContextMenuData() const OVERRIDE;
    113     virtual void clearContextMenuData() OVERRIDE;
    114112    virtual void setEditCommand(const std::string& name, const std::string& value) OVERRIDE;
    115113    virtual void clearEditCommand() OVERRIDE;
Note: See TracChangeset for help on using the changeset viewer.