Patch to follow
Created attachment 188907 [details] Patch
Comment on attachment 188907 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188907&action=review As per our discussion, conflict resolution should be encapsulated in the UISourceCode if possible. > Source/WebCore/inspector/front-end/DefaultTextEditor.js:505 > + this._textModel.editRange(this._textModel.range(), text, this.lastSelection()) I'd do that on the call site. > Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js:102 > + requestUpdatedFileContent: function(path, currentContent, callback) { { on the next line.
Created attachment 190983 [details] Patch
Comment on attachment 190983 [details] Patch Rejecting attachment 190983 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 190983, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 181763 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 57>At revision 181763. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://webkit-commit-queue.appspot.com/results/16687537
Comment on attachment 190983 [details] Patch Attachment 190983 [details] did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/16772732 New failing tests: svg/as-image/img-relative-height.html
Committed r144598: <http://trac.webkit.org/changeset/144598>