Bug 187782 – Remove duplicate compilation of WebKitNSImageExtras.mm

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Keith Rollin]

WebKitNSImageExtras.mm gets compiled twice, once because it's in WebCore.xcodeproj/project.pbxproj and once because it's in Webcore/SourcesCocoa.txt. This can lead to duplicate definition errors, particularly when building with LTO enabled. Fix this by removing the entry from the Xcode project.

[Radar WebKit Bug Importer]

<rdar://problem/42351628>

[Keith Rollin]

Created attachment 345286 [details]
Patch

[EWS Watchlist]

Comment on attachment 345286 [details]
Patch

Attachment 345286 [details] did not pass win-ews (win):
Output: https://webkit-queues.webkit.org/results/8583036

New failing tests:
http/tests/security/canvas-remote-read-remote-video-blocked-no-crossorigin.html

[EWS Watchlist]

Created attachment 345326 [details]
Archive of layout-test-results from ews206 for win-future

The attached test failures were seen while running run-webkit-tests on the win-ews.
Bot: ews206  Port: win-future  Platform: CYGWIN_NT-6.1-2.9.0-0.318-5-3-x86_64-64bit

[WebKit Commit Bot]

Comment on attachment 345286 [details]
Patch

Rejecting attachment 345286 [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', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 345286, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=345286&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=187782&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 345286 from bug 187782.
Fetching: https://bugs.webkit.org/attachment.cgi?id=345286
Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	Source/WebCore/ChangeLog

ERROR from SVN:
Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date
W: f522d85e63f0ad3a73613737ab54712918948672 and refs/remotes/origin/master differ, using rebase:
:040000 040000 d3dc7f5513e8745d03410cc50116df04f5364183 51a94177ed109004493538adeef8ca866211ba6e M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	Source/WebCore/ChangeLog

ERROR from SVN:
Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date
W: f522d85e63f0ad3a73613737ab54712918948672 and refs/remotes/origin/master differ, using rebase:
:040000 040000 d3dc7f5513e8745d03410cc50116df04f5364183 51a94177ed109004493538adeef8ca866211ba6e M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
From https://git.webkit.org/git/WebKit
   659b1921004..e763d217699  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 233988 = 659b1921004399782da7a2db0cb37750953cbdf8
r233989 = e763d2176991a53774bbe27645c7caabeaa578a0
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/origin/master.

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

[Keith Rollin]

Created attachment 345369 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 345369 [details]
Patch

Clearing flags on attachment: 345369

Committed r233995: <https://trac.webkit.org/changeset/233995>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.