Changeset 147305 in webkit

Timestamp:

Mar 31, 2013 11:55:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r147289.
​http://trac.webkit.org/changeset/147289
​https://bugs.webkit.org/show_bug.cgi?id=113678

broke Win7 (dbg) build (Requested by shinyak|gardener on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-03-31

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

(WebTestRunner):
(WebUserMediaClientMock):
(WebTestRunner::WebUserMediaClientMock::~WebUserMediaClientMock):
(WebTestRunner::WebUserMediaClientMock::taskList):

• Scripts/webkitpy/style/checkers/cpp.py:

(check_function_definition):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/DumpRenderTree.gypi (modified) (2 diffs)
• DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h (moved) (moved from trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebUserMediaClientMock.h) (2 diffs)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r147289.
+        http://trac.webkit.org/changeset/147289
+        https://bugs.webkit.org/show_bug.cgi?id=113678
+
+        broke Win7 (dbg) build (Requested by shinyak|gardener on
+        #webkit).
+
+        * DumpRenderTree/DumpRenderTree.gypi:
+        * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h: Renamed from Tools/DumpRenderTree/chromium/TestRunner/public/WebUserMediaClientMock.h.
+        (WebTestRunner):
+        (WebUserMediaClientMock):
+        (WebTestRunner::WebUserMediaClientMock::~WebUserMediaClientMock):
+        (WebTestRunner::WebUserMediaClientMock::taskList):
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_function_definition):
+
 2013-03-31  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

@@ -38 +38 @@
             'chromium/TestRunner/public/WebTestProxy.h',
             'chromium/TestRunner/public/WebTestRunner.h',
-            'chromium/TestRunner/public/WebUserMediaClientMock.h',
             'chromium/TestRunner/src/AccessibilityControllerChromium.cpp',
             'chromium/TestRunner/src/AccessibilityControllerChromium.h',
@@ -98 +97 @@
             'chromium/TestRunner/src/WebTestThemeEngineWin.h',
             'chromium/TestRunner/src/WebUserMediaClientMock.cpp',
+            'chromium/TestRunner/src/WebUserMediaClientMock.h',
         ],
         'test_plugin_files': [

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h

@@ -32 +32 @@
 #define WebUserMediaClientMock_h
 
-#include "Platform/chromium/public/WebCommon.h"
-#include "Platform/chromium/public/WebString.h"
-#include "Platform/chromium/public/WebURL.h"
-#include "WebKit/chromium/public/WebUserMediaClient.h"
+#include "TestCommon.h"
 #include "WebTask.h"
+#include "WebUserMediaClient.h"
+#include <public/WebCommon.h>
+#include <public/WebString.h>
+#include <public/WebURL.h>
 
 namespace WebTestRunner {
@@ -44 +45 @@
 class WebUserMediaClientMock : public WebKit::WebUserMediaClient {
 public:
-    WEBKIT_EXPORT explicit WebUserMediaClientMock(WebTestDelegate*);
+    explicit WebUserMediaClientMock(WebTestDelegate*);
     ~WebUserMediaClientMock() { }
 
-    virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&);
+    virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&) OVERRIDE;
     virtual void cancelUserMediaRequest(const WebKit::WebUserMediaRequest&);
 

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

@@ -1664 +1664 @@
     modifiers_and_return_type = function_state.modifiers_and_return_type()
     if filename.find('/chromium/') != -1 and search(r'\bWEBKIT_EXPORT\b', modifiers_and_return_type):
-        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:
+        if filename.find('/chromium/public/') == -1 and filename.find('/chromium/tests/') == -1 and filename.find('chromium/platform') == -1:
             error(function_state.function_name_start_position.row, 'readability/webkit_export', 5,
                   'WEBKIT_EXPORT should only appear in the chromium public (or tests) directory.')