Changeset 147289 in webkit


Ignore:
Timestamp:
Mar 31, 2013 4:17:50 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Allow WebUserMediaClientMock to be used by client
​https://bugs.webkit.org/show_bug.cgi?id=113633

Patch by Wei Jia <​wjia@chromium.org> on 2013-03-31
Reviewed by Adam Barth.

Export WebUserMediaClientMock.
Allow files in chromium/TestRunner/public to have WEBKIT_EXPORT.

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/chromium/TestRunner/public/WebUserMediaClientMock.h: Copied from Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h.

(WebUserMediaClientMock):

  • DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h: Removed.
  • Scripts/webkitpy/style/checkers/cpp.py:

(check_function_definition):

Location:
trunk/Tools
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r147260 r147289  
     12013-03-31  Wei Jia  <wjia@chromium.org>
     2
     3        Allow WebUserMediaClientMock to be used by client
     4        https://bugs.webkit.org/show_bug.cgi?id=113633
     5
     6        Reviewed by Adam Barth.
     7
     8        Export WebUserMediaClientMock.
     9        Allow files in chromium/TestRunner/public to have WEBKIT_EXPORT.
     10
     11        * DumpRenderTree/DumpRenderTree.gypi:
     12        * DumpRenderTree/chromium/TestRunner/public/WebUserMediaClientMock.h: Copied from Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h.
     13        (WebUserMediaClientMock):
     14        * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h: Removed.
     15        * Scripts/webkitpy/style/checkers/cpp.py:
     16        (check_function_definition):
     17
    1182013-03-29  Alexey Proskuryakov  <ap@apple.com>
    219

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r146439 r147289  
    3838            'chromium/TestRunner/public/WebTestProxy.h',
    3939            'chromium/TestRunner/public/WebTestRunner.h',
     40            'chromium/TestRunner/public/WebUserMediaClientMock.h',
    4041            'chromium/TestRunner/src/AccessibilityControllerChromium.cpp',
    4142            'chromium/TestRunner/src/AccessibilityControllerChromium.h',
    … …  
    9798            'chromium/TestRunner/src/WebTestThemeEngineWin.h',
    9899            'chromium/TestRunner/src/WebUserMediaClientMock.cpp',
    99             'chromium/TestRunner/src/WebUserMediaClientMock.h',
    100100        ],
    101101        'test_plugin_files': [

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

    r147287 r147289  
    3232#define WebUserMediaClientMock_h
    3333
    34 #include "TestCommon.h"
     34#include "Platform/chromium/public/WebCommon.h"
     35#include "Platform/chromium/public/WebString.h"
     36#include "Platform/chromium/public/WebURL.h"
     37#include "WebKit/chromium/public/WebUserMediaClient.h"
    3538#include "WebTask.h"
    36 #include "WebUserMediaClient.h"
    37 #include <public/WebCommon.h>
    38 #include <public/WebString.h>
    39 #include <public/WebURL.h>
    4039
    4140namespace WebTestRunner {
    … …  
    4544class WebUserMediaClientMock : public WebKit::WebUserMediaClient {
    4645public:
    47     explicit WebUserMediaClientMock(WebTestDelegate*);
     46    WEBKIT_EXPORT explicit WebUserMediaClientMock(WebTestDelegate*);
    4847    ~WebUserMediaClientMock() { }
    4948
    50     virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&) OVERRIDE;
     49    virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&);
    5150    virtual void cancelUserMediaRequest(const WebKit::WebUserMediaRequest&);
    5251

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

    r138719 r147289  
    16641664    modifiers_and_return_type = function_state.modifiers_and_return_type()
    16651665    if filename.find('/chromium/') != -1 and search(r'\bWEBKIT_EXPORT\b', modifiers_and_return_type):
    1666         if filename.find('/chromium/public/') == -1 and filename.find('/chromium/tests/') == -1 and filename.find('chromium/platform') == -1:
     1666        if filename.find('/chromium/public/') == -1 and filename.find('/chromium/tests/') == -1 and filename.find('chromium/platform') == -1 and filename.find('chromium/TestRunner/public') == -1:
    16671667            error(function_state.function_name_start_position.row, 'readability/webkit_export', 5,
    16681668                  'WEBKIT_EXPORT should only appear in the chromium public (or tests) directory.')
Note: See TracChangeset for help on using the changeset viewer.