Changeset 124650 in webkit
- Timestamp:
- Aug 3, 2012 2:00:37 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r124649 r124650 1 2012-08-03 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r124628. 4 http://trac.webkit.org/changeset/124628 5 https://bugs.webkit.org/show_bug.cgi?id=93155 6 7 Causes random crashes of DRT on Chromium bots (Requested by 8 dimich on #webkit). 9 10 * DumpRenderTree/DumpRenderTree.gypi: 11 * DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp: 12 (MockWebKitPlatformSupport::createMediaStreamCenter): 13 * DumpRenderTree/chromium/MockWebKitPlatformSupport.h: 14 (MockWebKitPlatformSupport): 15 * DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp: 16 * DumpRenderTree/chromium/MockWebMediaStreamCenter.h: 17 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: Removed. 18 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: Removed. 19 1 20 2012-08-03 Brady Eidson <beidson@apple.com> 2 21 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gypi
r124628 r124650 19 19 'chromium/MockWebPrerenderingSupport.cpp', 20 20 'chromium/MockWebPrerenderingSupport.h', 21 'chromium/MockWebRTCPeerConnectionHandler.cpp',22 'chromium/MockWebRTCPeerConnectionHandler.h',23 21 'chromium/MockWebSpeechInputController.cpp', 24 22 'chromium/MockWebSpeechInputController.h', -
trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp
r124628 r124650 33 33 34 34 #include "MockWebMediaStreamCenter.h" 35 #include "MockWebRTCPeerConnectionHandler.h"36 35 #include <wtf/Assertions.h> 37 36 #include <wtf/PassOwnPtr.h> … … 65 64 return m_mockMediaStreamCenter.get(); 66 65 } 67 68 WebRTCPeerConnectionHandler* MockWebKitPlatformSupport::createRTCPeerConnectionHandler(WebRTCPeerConnectionHandlerClient* client)69 {70 if (!m_mockRTCPeerConnectionHandler)71 m_mockRTCPeerConnectionHandler = adoptPtr(new MockWebRTCPeerConnectionHandler(client));72 73 return m_mockRTCPeerConnectionHandler.get();74 }75 66 #endif // ENABLE(MEDIA_STREAM) -
trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h
r124628 r124650 45 45 #if ENABLE(MEDIA_STREAM) 46 46 virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*) OVERRIDE; 47 virtual WebKit::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*) OVERRIDE;48 47 #endif // ENABLE(MEDIA_STREAM) 49 48 … … 53 52 #if ENABLE(MEDIA_STREAM) 54 53 OwnPtr<WebKit::WebMediaStreamCenter> m_mockMediaStreamCenter; 55 OwnPtr<WebKit::WebRTCPeerConnectionHandler> m_mockRTCPeerConnectionHandler;56 54 #endif // ENABLE(MEDIA_STREAM) 57 55 }; -
trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp
r124628 r124650 34 34 #include "MockWebMediaStreamCenter.h" 35 35 36 #include <public/WebICECandidateDescriptor.h>37 #include <public/WebMediaStreamCenterClient.h>38 #include <public/WebMediaStreamComponent.h>39 #include <public/WebMediaStreamDescriptor.h>40 #include <public/WebMediaStreamSource.h>41 #include <public/WebMediaStreamSourcesRequest.h>42 #include <public/WebSessionDescriptionDescriptor.h>43 #include <public/WebVector.h>36 #include "platform/WebICECandidateDescriptor.h" 37 #include "platform/WebMediaStreamCenterClient.h" 38 #include "platform/WebMediaStreamComponent.h" 39 #include "platform/WebMediaStreamDescriptor.h" 40 #include "platform/WebMediaStreamSource.h" 41 #include "platform/WebMediaStreamSourcesRequest.h" 42 #include "platform/WebSessionDescriptionDescriptor.h" 43 #include "platform/WebVector.h" 44 44 45 45 using namespace WebKit; -
trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.h
r124628 r124650 33 33 34 34 #if ENABLE(MEDIA_STREAM) 35 #include <public/WebMediaStreamCenter.h>35 #include "platform/WebMediaStreamCenter.h" 36 36 37 37 namespace WebKit {
Note: See TracChangeset
for help on using the changeset viewer.