Bug 167244 - [WebRTC] libwebrtc NO_RETURN is conflicting with WebKit one
Summary: [WebRTC] libwebrtc NO_RETURN is conflicting with WebKit one
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: youenn fablet
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-01-20 10:57 PST by youenn fablet
Modified: 2017-01-20 17:22 PST (History)
2 users (show)

See Also:

Attachments
Patch (1.39 KB, patch)
2017-01-20 10:58 PST, youenn fablet 		no flags Details | Formatted Diff | Diff
Patch for landing (2.53 KB, patch)
2017-01-20 12:01 PST, youenn fablet 		no flags Details | Formatted Diff | Diff
Patch for landing (1.82 KB, patch)
2017-01-20 14:31 PST, youenn fablet 		no flags Details | Formatted Diff | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description youenn fablet 2017-01-20 10:57:15 PST 
[WebRTC] libwebrtc NO_RETURN is conflicting with WebKit one
Comment 1 youenn fablet 2017-01-20 10:58:45 PST 
Created attachment 299357 [details]
Patch
Comment 2 Alex Christensen 2017-01-20 11:07:25 PST 
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.
Comment 3 youenn fablet 2017-01-20 12:01:35 PST 
Created attachment 299365 [details]
Patch for landing
Comment 4 youenn fablet 2017-01-20 12:01:52 PST 
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 5 WebKit Commit Bot 2017-01-20 14:04:55 PST 
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
Comment 6 youenn fablet 2017-01-20 14:31:57 PST 
Created attachment 299385 [details]
Patch for landing
Comment 7 WebKit Commit Bot 2017-01-20 17:21:55 PST 
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 8 WebKit Commit Bot 2017-01-20 17:22:24 PST 
Comment on attachment 299385 [details]
Patch for landing

Clearing flags on attachment: 299385

Committed r211004: <http://trac.webkit.org/changeset/211004>
Comment 9 WebKit Commit Bot 2017-01-20 17:22:28 PST 
All reviewed patches have been landed.  Closing bug.