126278 2013-12-29 13:18:00 -0800 Pending revision popover is slightly misplaced at build.webkit.org/dashboard 2013-12-29 16:24:26 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue timothy oldest_to_newest 963230 0 ap 2013-12-29 13:18:00 -0800 It's farther away from the text than iteration revisions popover. 963233 1 220088 ap 2013-12-29 13:34:31 -0800 Created attachment 220088 proposed fix 963235 2 220089 ap 2013-12-29 13:36:50 -0800 Created attachment 220089 oops, fix both branches 963246 3 220089 timothy 2013-12-29 14:45:41 -0800 Comment on attachment 220089 oops, fix both branches View in context: https://bugs.webkit.org/attachment.cgi?id=220089&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:97 > + var messageText = openSourceRevisionsBehind + " \uff0b " + internalRevisionsBehind + " revisions behind"; Seeing "1 + 1 revisions behind" is kind of confusing. Maybe it should just be: Math.max(openSourceRevisionsBehind, internalRevisionsBehind) + " revisions behind"; Given that it will update both internal and open source in sync. 963247 4 ap 2013-12-29 14:55:36 -0800 How about "1 open source and 1 internal revisions behind"? But that probably won't fit :( > Math.max(openSourceRevisionsBehind, internalRevisionsBehind) + " revisions behind" I think that it will be very confusing to see more revisions in the popover than how many we are "behind". 963248 5 220089 ap 2013-12-29 14:57:40 -0800 Comment on attachment 220089 oops, fix both branches This text is not new in this patch, so marking for commit queue as is. I agree that this "+" thing is not great, just not sure how to improve it. Or maybe we could use "/" in both places instead of "+"? 963252 6 220089 commit-queue 2013-12-29 16:10:34 -0800 Comment on attachment 220089 oops, fix both branches Rejecting attachment 220089 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 220089, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 161128 = 131710e6a5d1fe0a50752b8c532937a794cda38a r161129 = c004e36dbbce058bf7afca33af7244dd9d79aee9 r161130 = 6ca890897d48f793d792072f2175f3c6ff0f56bd 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: http://webkit-queues.appspot.com/results/5975425595473920 963254 7 ap 2013-12-29 16:24:26 -0800 Committed <http://trac.webkit.org/r161131>. 220088 2013-12-29 13:34:31 -0800 2013-12-29 13:36:50 -0800 proposed fix NoDisplayInlineBlock.txt text/plain 5053 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTEyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTEyLTI5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFBlbmRpbmcgcmV2aXNpb24gcG9wb3ZlciBpcyBzbGlnaHRseSBtaXNwbGFj ZWQgYXQgYnVpbGQud2Via2l0Lm9yZy9kYXNoYm9hcmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjI3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZp ZXcuanM6CisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRp bmdSZXZpc2lvbkNvdW50KTogQ3JlYXRlIGEgc3BhbiBmb3IgdGhlIHRleHQsCisgICAgICAgIGFz IFN0YXR1c0xpbmVWaWV3IG1lc3NhZ2UgZWxlbWVudCBoYXMgZXh0cmEgcGFkZGluZywgYW5kIGRv ZXNuJ3QgZml0IHRoZSB0ZXh0IHNudWdseS4KKyAgICAgICAgKEJ1aWxkYm90UXVldWVWaWV3LnBy b3RvdHlwZS5fcmV2aXNpb25Qb3BvdmVyQ29udGVudEZvckl0ZXJhdGlvbik6IEFkZGVkIGJ1ZyBu dW1iZXIgdG8gYSBGSVhNRS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1N0YXR1c0xpbmVW aWV3LmpzOgorICAgICAgICAoU3RhdHVzTGluZVZpZXcucHJvdG90eXBlLnNldCBtZXNzYWdlRWxl bWVudCk6IFJlbW92ZWQgdGhlIGdldHRlciwgYXMgd2Ugbm8gbG9uZ2VyIG5lZWQgaXQuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzczoKKyAgICAgICAgUmVtb3Zl ZCBkaXNwbGF5OmlubGluZS1ibG9jayBoYWNrIGZvciBtZXNzYWdlRWxlbWVudCBkaXYsIGFzIHdl IG5vIGxvbmdlciB1c2UgaXQgZm9yIG1lYXN1cmluZyB0ZXh0IGJvdW5kcy4KKwogMjAxMy0xMi0y OSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBQbGVhc2Ug ZGlzcGxheSAoYW5kIGxpbmsgdG8pIHJldmlzaW9uIHJhbmdlcyBhdCBidWlsZC53ZWJraXQub3Jn L2Rhc2hib2FyZApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcu anMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcu anMJKHJldmlzaW9uIDE2MTEyNCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVl dWVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC05OSwxMyArOTksMTUgQEAgQnVpbGRib3RRdWV1 ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZChzdGF0dXMuZWxlbWVudCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAo b3BlblNvdXJjZVJldmlzaW9uc0JlaGluZCkgewotICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBv cGVuU291cmNlUmV2aXNpb25zQmVoaW5kICsgIiAiICsgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhp bmQgPT09IDEgPyAicmV2aXNpb24gYmVoaW5kIiA6ICJyZXZpc2lvbnMgYmVoaW5kIik7Ci0gICAg ICAgICAgICB2YXIgc3RhdHVzID0gbmV3IFN0YXR1c0xpbmVWaWV3KG1lc3NhZ2UsIFN0YXR1c0xp bmVWaWV3LlN0YXR1cy5Ob0J1YmJsZSk7CisgICAgICAgICAgICB2YXIgbWVzc2FnZVRleHQgPSBv cGVuU291cmNlUmV2aXNpb25zQmVoaW5kICsgIiAiICsgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhp bmQgPT09IDEgPyAicmV2aXNpb24gYmVoaW5kIiA6ICJyZXZpc2lvbnMgYmVoaW5kIik7CisgICAg ICAgICAgICB2YXIgbWVzc2FnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFu Iik7IC8vIFdlIGNhbid0IGp1c3QgcGFzcyB0ZXh0IHRvIFN0YXR1c0xpbmVWaWV3IGhlcmUsIGJl Y2F1c2Ugd2UgbmVlZCBhbiBlbGVtZW50IHRoYXQgcGVyZmVjdGx5IGZpdHMgdGhlIHRleHQgZm9y IHBvcG92ZXIgcG9zaXRpb25pbmcuCisgICAgICAgICAgICBtZXNzYWdlRWxlbWVudC50ZXh0Q29u dGVudCA9IG1lc3NhZ2VUZXh0OworICAgICAgICAgICAgdmFyIHN0YXR1cyA9IG5ldyBTdGF0dXNM aW5lVmlldyhtZXNzYWdlRWxlbWVudCwgU3RhdHVzTGluZVZpZXcuU3RhdHVzLk5vQnViYmxlKTsK ICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChzdGF0dXMuZWxlbWVudCk7CiAg ICAgICAgIH0KIAogICAgICAgICBpZiAoc3RhdHVzKQotICAgICAgICAgICAgbmV3IFBvcG92ZXJU cmFja2VyKHN0YXR1cy5tZXNzYWdlRWxlbWVudCwgdGhpcy5fcHJlc2VudFBvcG92ZXJGb3JQZW5k aW5nQ29tbWl0cy5iaW5kKHRoaXMpLCBxdWV1ZSk7CisgICAgICAgICAgICBuZXcgUG9wb3ZlclRy YWNrZXIobWVzc2FnZUVsZW1lbnQsIHRoaXMuX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1p dHMuYmluZCh0aGlzKSwgcXVldWUpOwogICAgIH0sCiAKICAgICBfcG9wb3ZlckxpbmVzRm9yQ29t bWl0UmFuZ2U6IGZ1bmN0aW9uKHRyYWMsIGZpcnN0UmV2aXNpb25OdW1iZXIsIGxhc3RSZXZpc2lv bk51bWJlcikKQEAgLTIyNiw3ICsyMjgsNyBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIGNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gInIiICsgKGludGVybmFs ID8gaXRlcmF0aW9uLmludGVybmFsUmV2aXNpb24gOiBpdGVyYXRpb24ub3BlblNvdXJjZVJldmlz aW9uKTsKICAgICAgICAgY29udGVudEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmV2aXNpb24tbnVt YmVyIik7CiAKLSAgICAgICAgLy8gRklYTUU6IEl0IHdvdWxkIGJlIGJldHRlciB0byBkaXNwbGF5 IGNoYW5nZXMgZnJvbSB0aGUgcHJldmlvdXMgZmluaXNoZWQgcnVuLCBpZ25vcmluZyB0aG9zZSB0 aGF0IHdlcmUgaW50ZXJydXB0ZWQgYW5kIGRvbid0IGhhdmUgcmVzdWx0cy4KKyAgICAgICAgLy8g RklYTUUgKDEyNjI3OSk6IEl0IHdvdWxkIGJlIGJldHRlciB0byBkaXNwbGF5IGNoYW5nZXMgZnJv bSB0aGUgcHJldmlvdXMgZmluaXNoZWQgcnVuLCBpZ25vcmluZyB0aG9zZSB0aGF0IHdlcmUgaW50 ZXJydXB0ZWQgYW5kIGRvbid0IGhhdmUgcmVzdWx0cy4KICAgICAgICAgdmFyIHByZXZpb3VzSXRl cmF0aW9uID0gaXRlcmF0aW9uLnByZXZpb3VzOwogICAgICAgICBpZiAocHJldmlvdXNJdGVyYXRp b24pIHsKICAgICAgICAgICAgIHZhciBjb250ZXh0ID0gewpJbmRleDogVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvU3RhdHVzTGluZVZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvU3RhdHVzTGluZVZpZXcuanMJKHJldmlzaW9uIDE2MTEyMCkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL1N0YXR1c0xpbmVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNjAsMTAgKzE2MCw1 IEBAIFN0YXR1c0xpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgIHRoaXMuX21lc3NhZ2VFbGVtZW50LnRleHRDb250ZW50ID0geDsKICAgICAgICAgfQot ICAgIH0sCi0KLSAgICBnZXQgbWVzc2FnZUVsZW1lbnQoKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHRoaXMuX21lc3NhZ2VFbGVtZW50OwogICAgIH0KIH07CkluZGV4OiBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5 bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVz L1N0YXR1c0xpbmVWaWV3LmNzcwkocmV2aXNpb24gMTYxMTI0KQorKysgVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0 eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTExMywxMCArMTEzLDYg QEAKICAgICBsaW5lLWhlaWdodDogMTNweDsKIH0KIAotLnN0YXR1cy1saW5lLm5vLWJ1YmJsZSAu bWVzc2FnZSB7Ci0gICAgZGlzcGxheTogaW5saW5lLWJsb2NrOyAvKiBGaXQgYmxvY2sgdG8gY29u dGVudCwgc28gdGhhdCBwb3BvdmVycyBhcmUgcG9zaXRpb25lZCBjb3JyZWN0bHkuICovCi19Ci0K IC5zdGF0dXMtbGluZS5uZXV0cmFsIC5sYWJlbCwKIC5zdGF0dXMtbGluZS5uZXV0cmFsIC5tZXNz YWdlLAogLnN0YXR1cy1saW5lLm5vLWJ1YmJsZSAubGFiZWwsCg== 220089 2013-12-29 13:36:50 -0800 2013-12-29 16:10:33 -0800 oops, fix both branches NoDisplayInlineBlock.txt text/plain 5910 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTEyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTEyLTI5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFBlbmRpbmcgcmV2aXNpb24gcG9wb3ZlciBpcyBzbGlnaHRseSBtaXNwbGFj ZWQgYXQgYnVpbGQud2Via2l0Lm9yZy9kYXNoYm9hcmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjI3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZp ZXcuanM6CisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRp bmdSZXZpc2lvbkNvdW50KTogQ3JlYXRlIGEgc3BhbiBmb3IgdGhlIHRleHQsCisgICAgICAgIGFz IFN0YXR1c0xpbmVWaWV3IG1lc3NhZ2UgZWxlbWVudCBoYXMgZXh0cmEgcGFkZGluZywgYW5kIGRv ZXNuJ3QgZml0IHRoZSB0ZXh0IHNudWdseS4KKyAgICAgICAgKEJ1aWxkYm90UXVldWVWaWV3LnBy b3RvdHlwZS5fcmV2aXNpb25Qb3BvdmVyQ29udGVudEZvckl0ZXJhdGlvbik6IEFkZGVkIGJ1ZyBu dW1iZXIgdG8gYSBGSVhNRS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1N0YXR1c0xpbmVW aWV3LmpzOgorICAgICAgICAoU3RhdHVzTGluZVZpZXcucHJvdG90eXBlLnNldCBtZXNzYWdlRWxl bWVudCk6IFJlbW92ZWQgdGhlIGdldHRlciwgYXMgd2Ugbm8gbG9uZ2VyIG5lZWQgaXQuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzczoKKyAgICAgICAgUmVtb3Zl ZCBkaXNwbGF5OmlubGluZS1ibG9jayBoYWNrIGZvciBtZXNzYWdlRWxlbWVudCBkaXYsIGFzIHdl IG5vIGxvbmdlciB1c2UgaXQgZm9yIG1lYXN1cmluZyB0ZXh0IGJvdW5kcy4KKwogMjAxMy0xMi0y OSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBQbGVhc2Ug ZGlzcGxheSAoYW5kIGxpbmsgdG8pIHJldmlzaW9uIHJhbmdlcyBhdCBidWlsZC53ZWJraXQub3Jn L2Rhc2hib2FyZApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcu anMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcu anMJKHJldmlzaW9uIDE2MTEyNCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVl dWVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC05NCwxOCArOTQsMjIgQEAgQnVpbGRib3RRdWV1 ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKGludGVybmFsUmV2aXNpb25zQmVo aW5kIDwgMCkKICAgICAgICAgICAgICAgICBpbnRlcm5hbFJldmlzaW9uc0JlaGluZCA9IDA7CiAg ICAgICAgICAgICBpZiAob3BlblNvdXJjZVJldmlzaW9uc0JlaGluZCB8fCBpbnRlcm5hbFJldmlz aW9uc0JlaGluZCkgewotICAgICAgICAgICAgICAgIHZhciBtZXNzYWdlID0gb3BlblNvdXJjZVJl dmlzaW9uc0JlaGluZCArICIgXHVmZjBiICIgKyBpbnRlcm5hbFJldmlzaW9uc0JlaGluZCArICIg cmV2aXNpb25zIGJlaGluZCI7Ci0gICAgICAgICAgICAgICAgdmFyIHN0YXR1cyA9IG5ldyBTdGF0 dXNMaW5lVmlldyhtZXNzYWdlLCBTdGF0dXNMaW5lVmlldy5TdGF0dXMuTm9CdWJibGUpOworICAg ICAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dCA9IG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQg KyAiIFx1ZmYwYiAiICsgaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgKyAiIHJldmlzaW9ucyBiZWhp bmQiOworICAgICAgICAgICAgICAgIHZhciBtZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsgLy8gV2UgY2FuJ3QganVzdCBwYXNzIHRleHQgdG8gU3RhdHVzTGlu ZVZpZXcgaGVyZSwgYmVjYXVzZSB3ZSBuZWVkIGFuIGVsZW1lbnQgdGhhdCBwZXJmZWN0bHkgZml0 cyB0aGUgdGV4dCBmb3IgcG9wb3ZlciBwb3NpdGlvbmluZy4KKyAgICAgICAgICAgICAgICBtZXNz YWdlRWxlbWVudC50ZXh0Q29udGVudCA9IG1lc3NhZ2VUZXh0OworICAgICAgICAgICAgICAgIHZh ciBzdGF0dXMgPSBuZXcgU3RhdHVzTGluZVZpZXcobWVzc2FnZUVsZW1lbnQsIFN0YXR1c0xpbmVW aWV3LlN0YXR1cy5Ob0J1YmJsZSk7CiAgICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHN0YXR1cy5lbGVtZW50KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlm IChvcGVuU291cmNlUmV2aXNpb25zQmVoaW5kKSB7Ci0gICAgICAgICAgICB2YXIgbWVzc2FnZSA9 IG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgKyAiICIgKyAob3BlblNvdXJjZVJldmlzaW9uc0Jl aGluZCA9PT0gMSA/ICJyZXZpc2lvbiBiZWhpbmQiIDogInJldmlzaW9ucyBiZWhpbmQiKTsKLSAg ICAgICAgICAgIHZhciBzdGF0dXMgPSBuZXcgU3RhdHVzTGluZVZpZXcobWVzc2FnZSwgU3RhdHVz TGluZVZpZXcuU3RhdHVzLk5vQnViYmxlKTsKKyAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dCA9 IG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgKyAiICIgKyAob3BlblNvdXJjZVJldmlzaW9uc0Jl aGluZCA9PT0gMSA/ICJyZXZpc2lvbiBiZWhpbmQiIDogInJldmlzaW9ucyBiZWhpbmQiKTsKKyAg ICAgICAgICAgIHZhciBtZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsgLy8gV2UgY2FuJ3QganVzdCBwYXNzIHRleHQgdG8gU3RhdHVzTGluZVZpZXcgaGVyZSwg YmVjYXVzZSB3ZSBuZWVkIGFuIGVsZW1lbnQgdGhhdCBwZXJmZWN0bHkgZml0cyB0aGUgdGV4dCBm b3IgcG9wb3ZlciBwb3NpdGlvbmluZy4KKyAgICAgICAgICAgIG1lc3NhZ2VFbGVtZW50LnRleHRD b250ZW50ID0gbWVzc2FnZVRleHQ7CisgICAgICAgICAgICB2YXIgc3RhdHVzID0gbmV3IFN0YXR1 c0xpbmVWaWV3KG1lc3NhZ2VFbGVtZW50LCBTdGF0dXNMaW5lVmlldy5TdGF0dXMuTm9CdWJibGUp OwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHN0YXR1cy5lbGVtZW50KTsK ICAgICAgICAgfQogCiAgICAgICAgIGlmIChzdGF0dXMpCi0gICAgICAgICAgICBuZXcgUG9wb3Zl clRyYWNrZXIoc3RhdHVzLm1lc3NhZ2VFbGVtZW50LCB0aGlzLl9wcmVzZW50UG9wb3ZlckZvclBl bmRpbmdDb21taXRzLmJpbmQodGhpcyksIHF1ZXVlKTsKKyAgICAgICAgICAgIG5ldyBQb3BvdmVy VHJhY2tlcihtZXNzYWdlRWxlbWVudCwgdGhpcy5fcHJlc2VudFBvcG92ZXJGb3JQZW5kaW5nQ29t bWl0cy5iaW5kKHRoaXMpLCBxdWV1ZSk7CiAgICAgfSwKIAogICAgIF9wb3BvdmVyTGluZXNGb3JD b21taXRSYW5nZTogZnVuY3Rpb24odHJhYywgZmlyc3RSZXZpc2lvbk51bWJlciwgbGFzdFJldmlz aW9uTnVtYmVyKQpAQCAtMjI2LDcgKzIzMCw3IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgY29udGVudEVsZW1lbnQudGV4dENvbnRlbnQgPSAiciIgKyAoaW50ZXJu YWwgPyBpdGVyYXRpb24uaW50ZXJuYWxSZXZpc2lvbiA6IGl0ZXJhdGlvbi5vcGVuU291cmNlUmV2 aXNpb24pOwogICAgICAgICBjb250ZW50RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJyZXZpc2lvbi1u dW1iZXIiKTsKIAotICAgICAgICAvLyBGSVhNRTogSXQgd291bGQgYmUgYmV0dGVyIHRvIGRpc3Bs YXkgY2hhbmdlcyBmcm9tIHRoZSBwcmV2aW91cyBmaW5pc2hlZCBydW4sIGlnbm9yaW5nIHRob3Nl IHRoYXQgd2VyZSBpbnRlcnJ1cHRlZCBhbmQgZG9uJ3QgaGF2ZSByZXN1bHRzLgorICAgICAgICAv LyBGSVhNRSAoMTI2Mjc5KTogSXQgd291bGQgYmUgYmV0dGVyIHRvIGRpc3BsYXkgY2hhbmdlcyBm cm9tIHRoZSBwcmV2aW91cyBmaW5pc2hlZCBydW4sIGlnbm9yaW5nIHRob3NlIHRoYXQgd2VyZSBp bnRlcnJ1cHRlZCBhbmQgZG9uJ3QgaGF2ZSByZXN1bHRzLgogICAgICAgICB2YXIgcHJldmlvdXNJ dGVyYXRpb24gPSBpdGVyYXRpb24ucHJldmlvdXM7CiAgICAgICAgIGlmIChwcmV2aW91c0l0ZXJh dGlvbikgewogICAgICAgICAgICAgdmFyIGNvbnRleHQgPSB7CkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9TdGF0dXNMaW5lVmlldy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9TdGF0dXNMaW5lVmlldy5qcwkocmV2aXNpb24gMTYxMTIwKQorKysgVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvU3RhdHVzTGluZVZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTE2MCwxMCArMTYw LDUgQEAgU3RhdHVzTGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgdGhpcy5fbWVzc2FnZUVsZW1lbnQudGV4dENvbnRlbnQgPSB4OwogICAgICAgICB9 Ci0gICAgfSwKLQotICAgIGdldCBtZXNzYWdlRWxlbWVudCgpCi0gICAgewotICAgICAgICByZXR1 cm4gdGhpcy5fbWVzc2FnZUVsZW1lbnQ7CiAgICAgfQogfTsKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T dHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHls ZXMvU3RhdHVzTGluZVZpZXcuY3NzCShyZXZpc2lvbiAxNjExMjQpCisrKyBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwkod29ya2luZyBjb3B5KQpAQCAtMTEzLDEwICsxMTMs NiBAQAogICAgIGxpbmUtaGVpZ2h0OiAxM3B4OwogfQogCi0uc3RhdHVzLWxpbmUubm8tYnViYmxl IC5tZXNzYWdlIHsKLSAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IC8qIEZpdCBibG9jayB0byBj b250ZW50LCBzbyB0aGF0IHBvcG92ZXJzIGFyZSBwb3NpdGlvbmVkIGNvcnJlY3RseS4gKi8KLX0K LQogLnN0YXR1cy1saW5lLm5ldXRyYWwgLmxhYmVsLAogLnN0YXR1cy1saW5lLm5ldXRyYWwgLm1l c3NhZ2UsCiAuc3RhdHVzLWxpbmUubm8tYnViYmxlIC5sYWJlbCwK