Diff
Modified: trunk/Tools/ChangeLog (124649 => 124650)
--- trunk/Tools/ChangeLog 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/ChangeLog 2012-08-03 21:00:37 UTC (rev 124650)
@@ -1,3 +1,22 @@
+2012-08-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r124628.
+ http://trac.webkit.org/changeset/124628
+ https://bugs.webkit.org/show_bug.cgi?id=93155
+
+ Causes random crashes of DRT on Chromium bots (Requested by
+ dimich on #webkit).
+
+ * DumpRenderTree/DumpRenderTree.gypi:
+ * DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:
+ (MockWebKitPlatformSupport::createMediaStreamCenter):
+ * DumpRenderTree/chromium/MockWebKitPlatformSupport.h:
+ (MockWebKitPlatformSupport):
+ * DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp:
+ * DumpRenderTree/chromium/MockWebMediaStreamCenter.h:
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: Removed.
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: Removed.
+
2012-08-03 Brady Eidson <[email protected]>
Small part of "Out-of-process plug-ins should support asynchronous initialization."
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gypi (124649 => 124650)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-08-03 21:00:37 UTC (rev 124650)
@@ -18,8 +18,6 @@
'chromium/MockWebMediaStreamCenter.h',
'chromium/MockWebPrerenderingSupport.cpp',
'chromium/MockWebPrerenderingSupport.h',
- 'chromium/MockWebRTCPeerConnectionHandler.cpp',
- 'chromium/MockWebRTCPeerConnectionHandler.h',
'chromium/MockWebSpeechInputController.cpp',
'chromium/MockWebSpeechInputController.h',
'chromium/MockWebSpeechRecognizer.cpp',
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp 2012-08-03 21:00:37 UTC (rev 124650)
@@ -32,7 +32,6 @@
#include "MockWebKitPlatformSupport.h"
#include "MockWebMediaStreamCenter.h"
-#include "MockWebRTCPeerConnectionHandler.h"
#include <wtf/Assertions.h>
#include <wtf/PassOwnPtr.h>
@@ -64,12 +63,4 @@
return m_mockMediaStreamCenter.get();
}
-
-WebRTCPeerConnectionHandler* MockWebKitPlatformSupport::createRTCPeerConnectionHandler(WebRTCPeerConnectionHandlerClient* client)
-{
- if (!m_mockRTCPeerConnectionHandler)
- m_mockRTCPeerConnectionHandler = adoptPtr(new MockWebRTCPeerConnectionHandler(client));
-
- return m_mockRTCPeerConnectionHandler.get();
-}
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h 2012-08-03 21:00:37 UTC (rev 124650)
@@ -44,7 +44,6 @@
#if ENABLE(MEDIA_STREAM)
virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*) OVERRIDE;
- virtual WebKit::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*) OVERRIDE;
#endif // ENABLE(MEDIA_STREAM)
private:
@@ -52,7 +51,6 @@
#if ENABLE(MEDIA_STREAM)
OwnPtr<WebKit::WebMediaStreamCenter> m_mockMediaStreamCenter;
- OwnPtr<WebKit::WebRTCPeerConnectionHandler> m_mockRTCPeerConnectionHandler;
#endif // ENABLE(MEDIA_STREAM)
};
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp 2012-08-03 21:00:37 UTC (rev 124650)
@@ -33,14 +33,14 @@
#include "MockWebMediaStreamCenter.h"
-#include <public/WebICECandidateDescriptor.h>
-#include <public/WebMediaStreamCenterClient.h>
-#include <public/WebMediaStreamComponent.h>
-#include <public/WebMediaStreamDescriptor.h>
-#include <public/WebMediaStreamSource.h>
-#include <public/WebMediaStreamSourcesRequest.h>
-#include <public/WebSessionDescriptionDescriptor.h>
-#include <public/WebVector.h>
+#include "platform/WebICECandidateDescriptor.h"
+#include "platform/WebMediaStreamCenterClient.h"
+#include "platform/WebMediaStreamComponent.h"
+#include "platform/WebMediaStreamDescriptor.h"
+#include "platform/WebMediaStreamSource.h"
+#include "platform/WebMediaStreamSourcesRequest.h"
+#include "platform/WebSessionDescriptionDescriptor.h"
+#include "platform/WebVector.h"
using namespace WebKit;
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.h (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.h 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.h 2012-08-03 21:00:37 UTC (rev 124650)
@@ -32,7 +32,7 @@
#define MockWebMediaStreamCenter_h
#if ENABLE(MEDIA_STREAM)
-#include <public/WebMediaStreamCenter.h>
+#include "platform/WebMediaStreamCenter.h"
namespace WebKit {
class WebMediaStreamCenterClient;
Deleted: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-08-03 21:00:37 UTC (rev 124650)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2012 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if ENABLE(MEDIA_STREAM)
-
-#include "MockWebRTCPeerConnectionHandler.h"
-
-#include <public/WebRTCPeerConnectionHandlerClient.h>
-
-using namespace WebKit;
-
-MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler(WebRTCPeerConnectionHandlerClient* client)
-{
-}
-
-bool MockWebRTCPeerConnectionHandler::initialize()
-{
- return true;
-}
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h (124649 => 124650)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h 2012-08-03 20:49:03 UTC (rev 124649)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h 2012-08-03 21:00:37 UTC (rev 124650)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MockWebRTCPeerConnectionHandler_h
-#define MockWebRTCPeerConnectionHandler_h
-
-#if ENABLE(MEDIA_STREAM)
-#include <public/WebRTCPeerConnectionHandler.h>
-
-namespace WebKit {
-class WebRTCPeerConnectionHandlerClient;
-};
-
-class MockWebRTCPeerConnectionHandler : public WebKit::WebRTCPeerConnectionHandler {
-public:
- explicit MockWebRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*);
-
- virtual bool initialize() OVERRIDE;
-
-private:
- MockWebRTCPeerConnectionHandler() { }
-};
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // MockWebRTCPeerConnectionHandler_h
-
