Changeset 147305 in webkit
- Timestamp:
- Mar 31, 2013 11:55:27 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r147304 r147305 1 2013-03-31 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r147289. 4 http://trac.webkit.org/changeset/147289 5 https://bugs.webkit.org/show_bug.cgi?id=113678 6 7 broke Win7 (dbg) build (Requested by shinyak|gardener on 8 #webkit). 9 10 * DumpRenderTree/DumpRenderTree.gypi: 11 * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h: Renamed from Tools/DumpRenderTree/chromium/TestRunner/public/WebUserMediaClientMock.h. 12 (WebTestRunner): 13 (WebUserMediaClientMock): 14 (WebTestRunner::WebUserMediaClientMock::~WebUserMediaClientMock): 15 (WebTestRunner::WebUserMediaClientMock::taskList): 16 * Scripts/webkitpy/style/checkers/cpp.py: 17 (check_function_definition): 18 1 19 2013-03-31 Adam Barth <abarth@webkit.org> 2 20 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gypi
r147289 r147305 38 38 'chromium/TestRunner/public/WebTestProxy.h', 39 39 'chromium/TestRunner/public/WebTestRunner.h', 40 'chromium/TestRunner/public/WebUserMediaClientMock.h',41 40 'chromium/TestRunner/src/AccessibilityControllerChromium.cpp', 42 41 'chromium/TestRunner/src/AccessibilityControllerChromium.h', … … 98 97 'chromium/TestRunner/src/WebTestThemeEngineWin.h', 99 98 'chromium/TestRunner/src/WebUserMediaClientMock.cpp', 99 'chromium/TestRunner/src/WebUserMediaClientMock.h', 100 100 ], 101 101 'test_plugin_files': [ -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h
r147304 r147305 32 32 #define WebUserMediaClientMock_h 33 33 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" 34 #include "TestCommon.h" 38 35 #include "WebTask.h" 36 #include "WebUserMediaClient.h" 37 #include <public/WebCommon.h> 38 #include <public/WebString.h> 39 #include <public/WebURL.h> 39 40 40 41 namespace WebTestRunner { … … 44 45 class WebUserMediaClientMock : public WebKit::WebUserMediaClient { 45 46 public: 46 WEBKIT_EXPORTexplicit WebUserMediaClientMock(WebTestDelegate*);47 explicit WebUserMediaClientMock(WebTestDelegate*); 47 48 ~WebUserMediaClientMock() { } 48 49 49 virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&) ;50 virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&) OVERRIDE; 50 51 virtual void cancelUserMediaRequest(const WebKit::WebUserMediaRequest&); 51 52 -
trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py
r147289 r147305 1664 1664 modifiers_and_return_type = function_state.modifiers_and_return_type() 1665 1665 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 and filename.find('chromium/TestRunner/public') == -1:1666 if filename.find('/chromium/public/') == -1 and filename.find('/chromium/tests/') == -1 and filename.find('chromium/platform') == -1: 1667 1667 error(function_state.function_name_start_position.row, 'readability/webkit_export', 5, 1668 1668 'WEBKIT_EXPORT should only appear in the chromium public (or tests) directory.')
Note: See TracChangeset
for help on using the changeset viewer.