Summary: | [WebRTC] libwebrtc NO_RETURN is conflicting with WebKit one | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | youenn fablet <youennf> | ||||||||
Component: | WebCore Misc. | Assignee: | youenn fablet <youennf> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | achristensen, commit-queue | ||||||||
Priority: | P2 | ||||||||||
Version: | WebKit Nightly Build | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
youenn fablet
2017-01-20 10:57:15 PST
Created attachment 299357 [details]
Patch
Comment on attachment 299357 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299357&action=review > Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h:113 > This space seems unbalanced. Created attachment 299365 [details]
Patch for landing
Thanks for the review. (In reply to comment #2) > Comment on attachment 299357 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=299357&action=review > > > Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h:113 > > > > This space seems unbalanced. Fixed. Comment on attachment 299365 [details] Patch for landing Rejecting attachment 299365 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 299365, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ch file(s). patching file Source/ThirdParty/libwebrtc/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/ThirdParty/libwebrtc/Source/webrtc/api/rtpsender.cc Hunk #1 FAILED at 204. 1 out of 1 hunk FAILED -- saving rejects to file Source/ThirdParty/libwebrtc/Source/webrtc/api/rtpsender.cc.rej patching file Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/2922039 Created attachment 299385 [details]
Patch for landing
The commit-queue encountered the following flaky tests while processing attachment 299385 [details]: media/audio-concurrent-supported.html bug 167251 The commit-queue is continuing to process your patch. Comment on attachment 299385 [details] Patch for landing Clearing flags on attachment: 299385 Committed r211004: <http://trac.webkit.org/changeset/211004> All reviewed patches have been landed. Closing bug. |