Bug 205616 – Build (unified) failure after adding source files to support media in GPU process

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Peng Liu]

The Mac OS SDK includes a definition of "Fixed", and the project has WebCore::Fixed. They conflict due to the unified build when we try to add some new CPP files.

[Peng Liu]

Created attachment 386734 [details]
Patch

[Eric Carlson]

Comment on attachment 386734 [details]
Patch

r=me once the bots are happy

[Peng Liu]

Created attachment 386751 [details]
[WIP] Fix GTK and WPE build failures

[Peng Liu]

Created attachment 386756 [details]
WIP patch

[Peng Liu]

Created attachment 386757 [details]
Patch

[Radar WebKit Bug Importer]

<rdar://problem/58314047>

[Darin Adler]

Comment on attachment 386757 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=386757&action=review

I don’t understand why we are removing the header and source files from the project file.

> Source/WebCore/Modules/mediastream/UserMediaClient.h:44
> +class Document;

We sort these alphabetically, so this should be up above Page.

[Peng Liu]

(In reply to Darin Adler from comment #7)
> Comment on attachment 386757 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=386757&action=review
> 
> I don’t understand why we are removing the header and source files from the
> project file.
Because we are adding them to the unified build. They are still included in the project file (the updated project file still has references to them), but they are not included in the build process directly.

> 
> > Source/WebCore/Modules/mediastream/UserMediaClient.h:44
> > +class Document;
> 
> We sort these alphabetically, so this should be up above Page.
Fixed.

[Peng Liu]

Created attachment 386782 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 386782 [details]
Patch

Rejecting attachment 386782 [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-01', 'apply-attachment', '--no-update', '--non-interactive', 386782, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=386782&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=205616&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 386782 from bug 205616.
Fetching: https://bugs.webkit.org/attachment.cgi?id=386782
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dean Jackson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 6 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/Modules/mediastream/UserMediaClient.h
patching file Source/WebKit/Sources.txt
Hunk #2 FAILED at 508.
1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/Sources.txt.rej
patching file Source/WebKit/SourcesGTK.txt
patching file Source/WebKit/WebKit.xcodeproj/project.pbxproj
Hunk #1 succeeded at 99 (offset 2 lines).
Hunk #2 succeeded at 406 (offset 2 lines).
Hunk #3 succeeded at 10087 (offset 8 lines).
Hunk #4 FAILED at 10247.
Hunk #5 succeeded at 11865 (offset 9 lines).
Hunk #6 FAILED at 11921.
2 out of 6 hunks FAILED -- saving rejects to file Source/WebKit/WebKit.xcodeproj/project.pbxproj.rej

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dean Jackson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: https://webkit-queues.webkit.org/results/13300141

[Peng Liu]

Created attachment 386871 [details]
Rebased patch

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 386871 [details]:

transitions/default-timing-function.html bug 138901 (authors: [e-mail] and [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 386871 [details]
Rebased patch

Clearing flags on attachment: 386871

Committed r254093: <https://trac.webkit.org/changeset/254093>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.